VideoGenerator: fixed decoding if the given frame is not valid

Clement Champetier · Clement Champetier · commit 64afc627c91b · 2016-04-08T15:33:57.000+02:00
diff --git a/src/AvTranscoder/data/decoded/VideoFrame.hpp b/src/AvTranscoder/data/decoded/VideoFrame.hpp
@@ -70,6 +70,12 @@ class AvExport VideoFrame : public Frame
      * @brief Allocate the image buffer of the frame.
      */
     void allocateAVPicture(const VideoFrameDesc& desc);
+
+    /**
+     * @note To allocate new image buffer if needed.
+     * @see allocateAVPicture
+     */
+    friend class VideoGenerator;
 };
 }
 
diff --git a/src/AvTranscoder/decoder/VideoGenerator.cpp b/src/AvTranscoder/decoder/VideoGenerator.cpp
@@ -37,6 +37,14 @@ 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);
+    }
+
     // Generate black image
     if(!_inputFrame)
     {

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,14 @@ VideoGenerator::~VideoGenerator()`
`37`	`37`
`38`	`38`	`bool VideoGenerator::decodeNextFrame(Frame& frameBuffer)`
`39`	`39`	`{`
	`40`	`+ // check the given frame`
	`41`	`+ if(!frameBuffer.isVideoFrame())`
	`42`	`+ {`
	`43`	`+ LOG_WARN("The given frame is not a valid video frame: allocate a new AVPicture to put generated data into it.");`
	`44`	`+ frameBuffer.clear();`
	`45`	`+ static_cast<VideoFrame&>(frameBuffer).allocateAVPicture(_frameDesc);`
	`46`	`+ }`
	`47`	`+`
`40`	`48`	`// Generate black image`
`41`	`49`	`if(!_inputFrame)`
`42`	`50`	`{`