Video/Audio generators: fix data generated after a transcoded stream

Clement Champetier · Clement Champetier · commit ebd558de34ce · 2016-10-27T18:34:05.000+02:00
* Solution: keep the original description when the frame was created,
and use it to reallocate it when needed.
* No need to check and reallocate data in the generators.
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.cpp b/src/AvTranscoder/data/decoded/AudioFrame.cpp
@@ -41,6 +41,7 @@ void AudioFrameDesc::setParameters(const ProfileLoader::Profile& profile)
 
 AudioFrame::AudioFrame(const AudioFrameDesc& desc)
     : Frame()
+    , _desc(desc)
 {
     // Set Frame properties
     av_frame_set_sample_rate(_frame, desc._sampleRate);
@@ -89,11 +90,17 @@ void AudioFrame::allocateData()
     if(_dataAllocated)
         return;
 
+    // Set Frame properties
+    av_frame_set_sample_rate(_frame, _desc._sampleRate);
+    av_frame_set_channels(_frame, _desc._nbChannels);
+    av_frame_set_channel_layout(_frame, av_get_default_channel_layout(_desc._nbChannels));
+    _frame->format = _desc._sampleFormat;
+    _frame->nb_samples = _desc._sampleRate / 25.; // cannot be known before calling avcodec_decode_audio4
+
     // Allocate data
     const int align = 0;
-    const AVSampleFormat format = static_cast<AVSampleFormat>(_frame->format);
     const int ret =
-        av_samples_alloc(_frame->data, _frame->linesize, _frame->channels, _frame->nb_samples, format, align);
+        av_samples_alloc(_frame->data, _frame->linesize, _frame->channels, _frame->nb_samples, _desc._sampleFormat, align);
     if(ret < 0)
     {
         std::stringstream os;
@@ -102,7 +109,7 @@ void AudioFrame::allocateData()
         os << "nb channels = " << _frame->channels << ", ";
         os << "channel layout = " << av_get_channel_name(_frame->channels) << ", ";
         os << "nb samples = " << _frame->nb_samples << ", ";
-        os << "sample format = " << getSampleFormatName(format);
+        os << "sample format = " << getSampleFormatName(_desc._sampleFormat);
         throw std::runtime_error(os.str());
     }
     _dataAllocated = true;
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.hpp b/src/AvTranscoder/data/decoded/AudioFrame.hpp
@@ -70,6 +70,14 @@ class AvExport AudioFrame : public Frame
      * @see getSize
      */
     void assign(const unsigned char* ptrValue);
+
+private:
+    /**
+     * @brief Description of the frame to allocate.
+     * @warning This description could be different from the current frame (a decoder could have reseted it).
+     * We need to keep this description to allocate again the frame even if it was reseted.
+     */
+    const AudioFrameDesc _desc;
 };
 }
 
diff --git a/src/AvTranscoder/data/decoded/VideoFrame.cpp b/src/AvTranscoder/data/decoded/VideoFrame.cpp
@@ -47,6 +47,7 @@ void VideoFrameDesc::setParameters(const ProfileLoader::Profile& profile)
 
 VideoFrame::VideoFrame(const VideoFrameDesc& desc)
     : Frame()
+    , _desc(desc)
 {
     _frame->width = desc._width;
     _frame->height = desc._height;
@@ -78,15 +79,20 @@ void VideoFrame::allocateData()
     if(_dataAllocated)
         return;
 
-    const AVPixelFormat format = static_cast<AVPixelFormat>(_frame->format);
-    const int ret = avpicture_alloc(reinterpret_cast<AVPicture*>(_frame), format, _frame->width, _frame->height);
+    // Set Frame properties
+    _frame->width = _desc._width;
+    _frame->height = _desc._height;
+    _frame->format = _desc._pixelFormat;
+
+    // Allocate data
+    const int ret = avpicture_alloc(reinterpret_cast<AVPicture*>(_frame), _desc._pixelFormat, _desc._width, _desc._height);
     if(ret < 0)
     {
         std::stringstream os;
         os << "Unable to allocate an image frame of ";
         os << "width = " << _frame->width << ", ";
         os << "height = " << _frame->height << ", ";
-        os << "pixel format = " << getPixelFormatName(format);
+        os << "pixel format = " << getPixelFormatName(_desc._pixelFormat);
         throw std::runtime_error(os.str());
     }
     _dataAllocated = true;
diff --git a/src/AvTranscoder/data/decoded/VideoFrame.hpp b/src/AvTranscoder/data/decoded/VideoFrame.hpp
@@ -72,6 +72,14 @@ class AvExport VideoFrame : public Frame
      * @see getSize
      */
     void assign(const unsigned char* ptrValue);
+
+private:
+    /**
+     * @brief Description of the frame to allocate.
+     * @warning This description could be different from the current frame (a decoder could have reseted it).
+     * We need to keep this description to allocate again the frame even if it was reseted.
+     */
+    const VideoFrameDesc _desc;
 };
 }
 
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -21,14 +21,6 @@ AudioGenerator::~AudioGenerator()
 
 bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)
 {
-    // check the given frame
-    if(! frameBuffer.isAudioFrame())
-    {
-        LOG_WARN("The given frame to put data is not a valid audio frame: try to reallocate it.")
-        static_cast<AudioFrame&>(frameBuffer).freeAVSample();
-        static_cast<AudioFrame&>(frameBuffer).allocateAVSample(_frameDesc);
-    }
-
     // Generate silent
     if(!_inputFrame)
     {
diff --git a/src/AvTranscoder/decoder/VideoGenerator.cpp b/src/AvTranscoder/decoder/VideoGenerator.cpp
@@ -21,14 +21,6 @@ VideoGenerator::~VideoGenerator()
 
 bool VideoGenerator::decodeNextFrame(Frame& frameBuffer)
 {
-    // check the given frame
-    if(! frameBuffer.isVideoFrame())
-    {
-        LOG_WARN("The given frame to put data is not a valid video frame: try to reallocate it.")
-        static_cast<VideoFrame&>(frameBuffer).freeAVPicture();
-        static_cast<VideoFrame&>(frameBuffer).allocateAVPicture(_frameDesc);
-    }
-
     // Generate black image
     if(!_inputFrame)
     {
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -588,6 +588,9 @@ bool StreamTranscoder::processTranscode()
             if(_needToSwitchToGenerator)
             {
                 switchToGeneratorDecoder();
+                // force reallocation of the buffers since de decoders have cleared them
+                for(std::vector<Frame*>::iterator it = _decodedData.begin(); it != _decodedData.end(); ++it)
+                    (*it)->allocateData();
                 return processTranscode();
             }
             return false;

Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,6 @@ AudioGenerator::~AudioGenerator()`
`21`	`21`
`22`	`22`	`bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)`
`23`	`23`	`{`
`24`		`- // check the given frame`
`25`		`- if(! frameBuffer.isAudioFrame())`
`26`		`- {`
`27`		`- LOG_WARN("The given frame to put data is not a valid audio frame: try to reallocate it.")`
`28`		`- static_cast<AudioFrame&>(frameBuffer).freeAVSample();`
`29`		`- static_cast<AudioFrame&>(frameBuffer).allocateAVSample(_frameDesc);`
`30`		`- }`
`31`		`-`
`32`	`24`	`// Generate silent`
`33`	`25`	`if(!_inputFrame)`
`34`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,6 @@ VideoGenerator::~VideoGenerator()`
`21`	`21`
`22`	`22`	`bool VideoGenerator::decodeNextFrame(Frame& frameBuffer)`
`23`	`23`	`{`
`24`		`- // check the given frame`
`25`		`- if(! frameBuffer.isVideoFrame())`
`26`		`- {`
`27`		`- LOG_WARN("The given frame to put data is not a valid video frame: try to reallocate it.")`
`28`		`- static_cast<VideoFrame&>(frameBuffer).freeAVPicture();`
`29`		`- static_cast<VideoFrame&>(frameBuffer).allocateAVPicture(_frameDesc);`
`30`		`- }`
`31`		`-`
`32`	`24`	`// Generate black image`
`33`	`25`	`if(!_inputFrame)`
`34`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -588,6 +588,9 @@ bool StreamTranscoder::processTranscode()`
`588`	`588`	`if(_needToSwitchToGenerator)`
`589`	`589`	`{`
`590`	`590`	`switchToGeneratorDecoder();`
	`591`	`+ // force reallocation of the buffers since de decoders have cleared them`
	`592`	`+ for(std::vector<Frame*>::iterator it = _decodedData.begin(); it != _decodedData.end(); ++it)`
	`593`	`+ (*it)->allocateData();`
`591`	`594`	`return processTranscode();`
`592`	`595`	`}`
`593`	`596`	`return false;`