StreamTranscoder: reset frame that has not been decoded

Valentin NOEL · Valentin NOEL · commit cbd47000f273 · 2017-09-06T17:56:28.000+02:00
Avoid filling the filter graph buffers with wrong data frames.
Improve documentation into FilterGraph::FrameBuffer class.
diff --git a/src/AvTranscoder/filter/FilterGraph.cpp b/src/AvTranscoder/filter/FilterGraph.cpp
@@ -38,7 +38,7 @@ FrameBuffer::~FrameBuffer()
 
 void FrameBuffer::addFrame(IFrame* frame)
 {
-    LOG_DEBUG("Add a new frame to frame buffer. New buffer size: " << _frameQueue.size() + 1);
+    LOG_DEBUG("Add a new " << frame->getDataSize() << " bytes frame to frame buffer. New buffer size: " << _frameQueue.size() + 1);
     // Copy the input frame to store it into the queue
     AudioFrame* newAudioFrame = new AudioFrame(_audioFrameDesc, false);
     const size_t expectedNbSamples = frame->getDataSize() / (newAudioFrame->getNbChannels() * newAudioFrame->getBytesPerSample());
diff --git a/src/AvTranscoder/filter/FilterGraph.hpp b/src/AvTranscoder/filter/FilterGraph.hpp
@@ -32,7 +32,7 @@ class FrameBuffer
      */
     bool isEmpty() const { return _frameQueue.empty() && _totalDataSize == 0; }
     /**
-     * @brief Return the total amount of data contained in the frames of the buffer.
+     * @brief Return the total amount of available data contained in the frames of the buffer.
      */
     size_t getDataSize() const { return _totalDataSize; }
     /**
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -582,6 +582,11 @@ bool StreamTranscoder::processTranscode()
                 continue;
             }
             LOG_DEBUG("Some frames remain into filter graph buffer " << index);
+
+            // Reset the non-decoded data as an empty frame
+            _decodedData.at(index)->freeData();
+            _decodedData.at(index)->getAVFrame().format = -1;
+            _decodedData.at(index)->getAVFrame().nb_samples = 0;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ FrameBuffer::~FrameBuffer()`
`38`	`38`
`39`	`39`	`void FrameBuffer::addFrame(IFrame* frame)`
`40`	`40`	`{`
`41`		`- LOG_DEBUG("Add a new frame to frame buffer. New buffer size: " << _frameQueue.size() + 1);`
	`41`	`+ LOG_DEBUG("Add a new " << frame->getDataSize() << " bytes frame to frame buffer. New buffer size: " << _frameQueue.size() + 1);`
`42`	`42`	`// Copy the input frame to store it into the queue`
`43`	`43`	`AudioFrame* newAudioFrame = new AudioFrame(_audioFrameDesc, false);`
`44`	`44`	`const size_t expectedNbSamples = frame->getDataSize() / (newAudioFrame->getNbChannels() * newAudioFrame->getBytesPerSample());`
Original file line number	Diff line number	Diff line change
`@@ -582,6 +582,11 @@ bool StreamTranscoder::processTranscode()`
`582`	`582`	`continue;`
`583`	`583`	`}`
`584`	`584`	`LOG_DEBUG("Some frames remain into filter graph buffer " << index);`
	`585`	`+`
	`586`	`+ // Reset the non-decoded data as an empty frame`
	`587`	`+ _decodedData.at(index)->freeData();`
	`588`	`+ _decodedData.at(index)->getAVFrame().format = -1;`
	`589`	`+ _decodedData.at(index)->getAVFrame().nb_samples = 0;`
`585`	`590`	`}`
`586`	`591`	`}`
`587`	`592`