VideoGenerator: fixed copy of data from a specified frame

Clement Champetier · Clement Champetier · commit c2aad6220882 · 2016-08-22T17:36:28.000+02:00
The specified frame could have other properties than the given frame
when decoding (will be converted).
diff --git a/src/AvTranscoder/decoder/VideoGenerator.cpp b/src/AvTranscoder/decoder/VideoGenerator.cpp
@@ -11,7 +11,6 @@ VideoGenerator::VideoGenerator(const VideoFrameDesc& frameDesc)
     : _inputFrame(NULL)
     , _blackImage(NULL)
     , _frameDesc(frameDesc)
-    , _videoTransform()
 {
 }
 
@@ -57,8 +56,8 @@ bool VideoGenerator::decodeNextFrame(Frame& frameBuffer)
     // Take image from _inputFrame
     else
     {
-        LOG_DEBUG("Copy data of the image specified when decode next frame")
-        frameBuffer.copyData(*_inputFrame);
+        LOG_DEBUG("Convert data of the image specified when decode next frame")
+        _videoTransform.convert(*_inputFrame, frameBuffer);
     }
     return true;
 }
diff --git a/src/AvTranscoder/decoder/VideoGenerator.hpp b/src/AvTranscoder/decoder/VideoGenerator.hpp
@@ -23,7 +23,8 @@ class AvExport VideoGenerator : public IDecoder
 
     /**
      * @brief Force to return this frame when calling the decoding methods.
-     * @param inputFrame: should have the same properties as the given frames when decoding.
+     * @param inputFrame: could have other properties than the given frame when decoding (will be converted).
+     * @see decodeNextFrame
      */
     void setNextFrame(Frame& inputFrame) { _inputFrame = &inputFrame; }
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ VideoGenerator::VideoGenerator(const VideoFrameDesc& frameDesc)`
`11`	`11`	`: _inputFrame(NULL)`
`12`	`12`	`, _blackImage(NULL)`
`13`	`13`	`, _frameDesc(frameDesc)`
`14`		`- , _videoTransform()`
`15`	`14`	`{`
`16`	`15`	`}`
`17`	`16`
`@@ -57,8 +56,8 @@ bool VideoGenerator::decodeNextFrame(Frame& frameBuffer)`
`57`	`56`	`// Take image from _inputFrame`
`58`	`57`	`else`
`59`	`58`	`{`
`60`		`- LOG_DEBUG("Copy data of the image specified when decode next frame")`
`61`		`- frameBuffer.copyData(*_inputFrame);`
	`59`	`+ LOG_DEBUG("Convert data of the image specified when decode next frame")`
	`60`	`+ _videoTransform.convert(*_inputFrame, frameBuffer);`
`62`	`61`	`}`
`63`	`62`	`return true;`
`64`	`63`	`}`