Video/AudioReader: added instantiation of a generator

Clement Champetier · Clement Champetier · commit f675ab083f81 · 2016-03-31T18:00:20.000+02:00
To be able to generate data (ie silence or black) when there is no more
data to decode.
diff --git a/src/AvTranscoder/reader/AudioReader.cpp b/src/AvTranscoder/reader/AudioReader.cpp
@@ -2,6 +2,7 @@
 
 #include <AvTranscoder/util.hpp>
 #include <AvTranscoder/decoder/AudioDecoder.hpp>
+#include <AvTranscoder/decoder/AudioGenerator.hpp>
 #include <AvTranscoder/data/decoded/AudioFrame.hpp>
 #include <AvTranscoder/transform/AudioTransform.hpp>
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
@@ -42,6 +43,9 @@ void AudioReader::init()
     _decoder = new AudioDecoder(_inputFile->getStream(_streamIndex));
     _decoder->setupDecoder();
 
+    // generator
+    _generator = new AudioGenerator();
+
     // create transform
     _transform = new AudioTransform();
 
@@ -57,6 +61,7 @@ void AudioReader::init()
 AudioReader::~AudioReader()
 {
     delete _decoder;
+    delete _generator;
     delete _srcFrame;
     delete _dstFrame;
     delete _transform;
diff --git a/src/AvTranscoder/reader/VideoReader.cpp b/src/AvTranscoder/reader/VideoReader.cpp
@@ -1,6 +1,7 @@
 #include "VideoReader.hpp"
 
 #include <AvTranscoder/decoder/VideoDecoder.hpp>
+#include <AvTranscoder/decoder/VideoGenerator.hpp>
 #include <AvTranscoder/data/decoded/VideoFrame.hpp>
 #include <AvTranscoder/transform/VideoTransform.hpp>
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
@@ -41,6 +42,11 @@ void VideoReader::init()
     _decoder = new VideoDecoder(_inputFile->getStream(_streamIndex));
     _decoder->setupDecoder();
 
+    // generator
+    VideoGenerator* generator = new VideoGenerator();
+    generator->setVideoFrameDesc(_inputFile->getStream(_streamIndex).getVideoCodec().getVideoFrameDesc());
+    _generator = generator;
+
     // create transform
     _transform = new VideoTransform();
 
@@ -56,6 +62,7 @@ void VideoReader::init()
 VideoReader::~VideoReader()
 {
     delete _decoder;
+    delete _generator;
     delete _srcFrame;
     delete _dstFrame;
     delete _transform;
