VideoGenerator: updated constructor to give a FrameDesc

Clement Champetier · Clement Champetier · commit 5962a2eff363 · 2016-04-08T15:46:36.000+02:00
Since all our generators are allocated, and their FrameDesc are set just
after.
diff --git a/src/AvTranscoder/decoder/VideoGenerator.cpp b/src/AvTranscoder/decoder/VideoGenerator.cpp
@@ -8,25 +8,25 @@
 namespace avtranscoder
 {
 
-VideoGenerator::VideoGenerator()
+VideoGenerator::VideoGenerator(const VideoFrameDesc& frameDesc)
     : _inputFrame(NULL)
     , _blackImage(NULL)
-    , _frameDesc()
+    , _frameDesc(frameDesc)
 {
 }
 
 VideoGenerator::VideoGenerator(const VideoGenerator& videoGenerator)
     : _inputFrame(NULL)
     , _blackImage(NULL)
-    , _frameDesc(videoGenerator.getVideoFrameDesc())
+    , _frameDesc(videoGenerator._frameDesc)
 {
 }
 
 VideoGenerator& VideoGenerator::operator=(const VideoGenerator& videoGenerator)
 {
     _inputFrame = NULL;
     _blackImage = NULL;
-    _frameDesc = videoGenerator.getVideoFrameDesc();
+    _frameDesc = videoGenerator._frameDesc;
     return *this;
 }
 
diff --git a/src/AvTranscoder/decoder/VideoGenerator.hpp b/src/AvTranscoder/decoder/VideoGenerator.hpp
@@ -10,7 +10,7 @@ namespace avtranscoder
 class AvExport VideoGenerator : public IDecoder
 {
 public:
-    VideoGenerator();
+    VideoGenerator(const VideoFrameDesc& frameDesc);
     VideoGenerator(const VideoGenerator& videoGenerator);
     VideoGenerator& operator=(const VideoGenerator& videoGenerator);
 
@@ -19,9 +19,6 @@ class AvExport VideoGenerator : public IDecoder
     bool decodeNextFrame(Frame& frameBuffer);
     bool decodeNextFrame(Frame& frameBuffer, const size_t channelIndex);
 
-    const VideoFrameDesc& getVideoFrameDesc() const { return _frameDesc; }
-    void setVideoFrameDesc(const VideoFrameDesc& frameDesc) { _frameDesc = frameDesc; }
-
     void setNextFrame(Frame& inputFrame) { _inputFrame = &inputFrame; }
 
 private:
diff --git a/src/AvTranscoder/reader/VideoReader.cpp b/src/AvTranscoder/reader/VideoReader.cpp
@@ -43,9 +43,7 @@ void VideoReader::init()
     _decoder->setupDecoder();
 
     // generator
-    VideoGenerator* generator = new VideoGenerator();
-    generator->setVideoFrameDesc(_inputFile->getStream(_streamIndex).getVideoCodec().getVideoFrameDesc());
-    _generator = generator;
+    _generator = new VideoGenerator(_inputFile->getStream(_streamIndex).getVideoCodec().getVideoFrameDesc());
 
     // create transform
     _transform = new VideoTransform();
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -51,9 +51,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
                 VideoFrameDesc inputFrameDesc(_inputStream->getVideoCodec().getVideoFrameDesc());
 
                 // generator decoder
-                VideoGenerator* generatorVideo = new VideoGenerator();
-                generatorVideo->setVideoFrameDesc(inputFrameDesc);
-                _generator = generatorVideo;
+                _generator = new VideoGenerator(inputFrameDesc);
 
                 // buffers to process
                 _sourceBuffer = new VideoFrame(inputFrameDesc);
@@ -174,9 +172,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
             _transform = new VideoTransform();
 
             // generator decoder
-            VideoGenerator* generatorVideo = new VideoGenerator();
-            generatorVideo->setVideoFrameDesc(outputVideo->getVideoCodec().getVideoFrameDesc());
-            _generator = generatorVideo;
+            _generator = new VideoGenerator(outputVideo->getVideoCodec().getVideoFrameDesc());
 
             break;
         }
@@ -251,11 +247,9 @@ StreamTranscoder::StreamTranscoder(const ICodec& inputCodec, IOutputFile& output
 {
     if(profile.find(constants::avProfileType)->second == constants::avProfileTypeVideo)
     {
-        // generator decoder
-        VideoGenerator* generatorVideo = new VideoGenerator();
         const VideoCodec& inputVideoCodec = static_cast<const VideoCodec&>(inputCodec);
-        generatorVideo->setVideoFrameDesc(inputVideoCodec.getVideoFrameDesc());
-        _generator = generatorVideo;
+        // generator decoder
+        _generator = new VideoGenerator(inputVideoCodec.getVideoFrameDesc());
         _currentDecoder = _generator;
 
         // filter

Original file line number	Diff line number	Diff line change
`@@ -8,25 +8,25 @@`
`8`	`8`	`namespace avtranscoder`
`9`	`9`	`{`
`10`	`10`
`11`		`-VideoGenerator::VideoGenerator()`
	`11`	`+VideoGenerator::VideoGenerator(const VideoFrameDesc& frameDesc)`
`12`	`12`	`: _inputFrame(NULL)`
`13`	`13`	`, _blackImage(NULL)`
`14`		`- , _frameDesc()`
	`14`	`+ , _frameDesc(frameDesc)`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`VideoGenerator::VideoGenerator(const VideoGenerator& videoGenerator)`
`19`	`19`	`: _inputFrame(NULL)`
`20`	`20`	`, _blackImage(NULL)`
`21`		`- , _frameDesc(videoGenerator.getVideoFrameDesc())`
	`21`	`+ , _frameDesc(videoGenerator._frameDesc)`
`22`	`22`	`{`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`VideoGenerator& VideoGenerator::operator=(const VideoGenerator& videoGenerator)`
`26`	`26`	`{`
`27`	`27`	`_inputFrame = NULL;`
`28`	`28`	`_blackImage = NULL;`
`29`		`- _frameDesc = videoGenerator.getVideoFrameDesc();`
	`29`	`+ _frameDesc = videoGenerator._frameDesc;`
`30`	`30`	`return *this;`
`31`	`31`	`}`
`32`	`32`