VideoGenerator: removed VideoFrameDesc parameter in constructor

Clement Champetier · Clement Champetier · commit 935ed64dc526 · 2016-07-20T10:43:33.000+02:00
The VideoFrameDesc could be found from the given frame when decoding.
diff --git a/src/AvTranscoder/decoder/VideoGenerator.cpp b/src/AvTranscoder/decoder/VideoGenerator.cpp
@@ -1,17 +1,17 @@
 #include "VideoGenerator.hpp"
 
 #include <AvTranscoder/util.hpp>
-#include <AvTranscoder/transform/VideoTransform.hpp>
 
 #include <sstream>
+#include <stdexcept>
 
 namespace avtranscoder
 {
 
-VideoGenerator::VideoGenerator(const VideoFrameDesc& frameDesc)
+VideoGenerator::VideoGenerator()
     : _inputFrame(NULL)
     , _blackImage(NULL)
-    , _frameDesc(frameDesc)
+    , _videoTransform()
 {
 }
 
@@ -23,12 +23,8 @@ VideoGenerator::~VideoGenerator()
 bool VideoGenerator::decodeNextFrame(Frame& frameBuffer)
 {
     // check the given frame
-    if(!frameBuffer.isVideoFrame())
-    {
-        LOG_WARN("The given frame is not a valid video frame: allocate a new AVPicture to put generated data into it.");
-        frameBuffer.clear();
-        static_cast<VideoFrame&>(frameBuffer).allocateAVPicture(_frameDesc);
-    }
+    if(! frameBuffer.isVideoFrame())
+        throw std::runtime_error("The given frame is not a valid video frame: allocate a new AVPicture to put generated data into it.");
 
     // Generate black image
     if(!_inputFrame)
@@ -38,30 +34,19 @@ bool VideoGenerator::decodeNextFrame(Frame& frameBuffer)
         {
             std::stringstream msg;
             msg << "Generate a black image with the following features:" << std::endl;
-            msg << "width = " << _frameDesc._width << std::endl;
-            msg << "height = " << _frameDesc._height << std::endl;
+            msg << "width = " << frameBuffer.getAVFrame().width << std::endl;
+            msg << "height = " << frameBuffer.getAVFrame().height << std::endl;
             msg << "pixel format = rgb24" << std::endl;
             LOG_INFO(msg.str())
 
-            VideoFrame& imageBuffer = static_cast<VideoFrame&>(frameBuffer);
-
-            // Input of convert
-            // @todo support PAL (0 to 255) and NTFS (16 to 235)
-            VideoFrameDesc desc(_frameDesc);
-            desc._pixelFormat = getAVPixelFormat("rgb24");
-            VideoFrame intermediateBuffer(desc);
+            // Create the black RGB image
+            _blackImage = new VideoFrame(VideoFrameDesc(frameBuffer.getAVFrame().width, frameBuffer.getAVFrame().height, "rgb24"));
             const unsigned char fillChar = 0;
-            intermediateBuffer.assign(fillChar);
-
-            // Output of convert
-            _blackImage = new VideoFrame(imageBuffer.desc());
-
-            // Convert and store the black image
-            VideoTransform videoTransform;
-            videoTransform.convert(intermediateBuffer, *_blackImage);
+            _blackImage->assign(fillChar);
         }
         LOG_DEBUG("Copy data of the black image when decode next frame")
-        frameBuffer.copyData(*_blackImage);
+        // Convert the black image to the configuration of the given frame
+        _videoTransform.convert(*_blackImage, frameBuffer);
     }
     // Take image from _inputFrame
     else
diff --git a/src/AvTranscoder/decoder/VideoGenerator.hpp b/src/AvTranscoder/decoder/VideoGenerator.hpp
@@ -3,6 +3,7 @@
 
 #include "IDecoder.hpp"
 #include <AvTranscoder/codec/VideoCodec.hpp>
+#include <AvTranscoder/transform/VideoTransform.hpp>
 
 namespace avtranscoder
 {
@@ -14,19 +15,22 @@ class AvExport VideoGenerator : public IDecoder
     VideoGenerator& operator=(const VideoGenerator& videoGenerator);
 
 public:
-    VideoGenerator(const VideoFrameDesc& frameDesc);
-
+    VideoGenerator();
     ~VideoGenerator();
 
     bool decodeNextFrame(Frame& frameBuffer);
     bool decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray);
 
+    /**
+     * @brief Force to return this frame when calling the decoding methods.
+     * @param inputFrame: should have the same properties as the given frames when decoding.
+     */
     void setNextFrame(Frame& inputFrame) { _inputFrame = &inputFrame; }
 
 private:
     Frame* _inputFrame;              ///< A frame given from outside (has link, no ownership)
-    VideoFrame* _blackImage;         ///< The generated black image (has ownership)
-    const VideoFrameDesc _frameDesc; ///< The description of the black image (width, height...)
+    VideoFrame* _blackImage;         ///< The generated RGB black image (has ownership)
+    VideoTransform _videoTransform;  ///< To transform data of the back image to the given Frame when decoding.
 };
 }
 
diff --git a/src/AvTranscoder/reader/VideoReader.cpp b/src/AvTranscoder/reader/VideoReader.cpp
@@ -44,7 +44,7 @@ void VideoReader::init()
     _currentDecoder = _decoder;
 
     // generator
-    _generator = new VideoGenerator(_inputFile->getStream(_streamIndex).getVideoCodec().getVideoFrameDesc());
+    _generator = new VideoGenerator();
 
     // create transform
     _transform = new VideoTransform();
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -53,7 +53,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
                 VideoFrameDesc inputFrameDesc(inputStream.getVideoCodec().getVideoFrameDesc());
 
                 // generator decoder
-                _generators.push_back(new VideoGenerator(inputFrameDesc));
+                _generators.push_back(new VideoGenerator());
 
                 // buffers to process
                 _decodedData.push_back(VideoFrame(inputFrameDesc));
@@ -179,7 +179,7 @@ StreamTranscoder::StreamTranscoder(const InputStreamDesc& inputStreamDesc, IInpu
             _transform = new VideoTransform();
 
             // generator decoder
-            _generators.push_back(new VideoGenerator(outputVideo->getVideoCodec().getVideoFrameDesc()));
+            _generators.push_back(new VideoGenerator());
 
             break;
         }
@@ -257,7 +257,7 @@ StreamTranscoder::StreamTranscoder(IOutputFile& outputFile, const ProfileLoader:
         inputVideoCodec.setImageParameters(inputFrameDesc);
 
         // generator decoder
-        VideoGenerator* generator = new VideoGenerator(inputVideoCodec.getVideoFrameDesc());
+        VideoGenerator* generator = new VideoGenerator();
         _generators.push_back(generator);
         _currentDecoder = generator;
 
