StreamTranscoder: check the next data buffers in case of audio frames

Clement Champetier · Clement Champetier · commit da013d4f47d5 · 2016-11-02T09:51:34.000+01:00
* If the buffer of filtered data is too small: reallocate it.
* If the buffer of transformed data is too small: reallocate it.
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.cpp b/src/AvTranscoder/data/decoded/AudioFrame.cpp
@@ -103,7 +103,8 @@ void AudioFrame::allocateData()
     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 = getDefaultNbSamples();
+    if(_frame->nb_samples == 0)
+        _frame->nb_samples = getDefaultNbSamples();
 
     // Allocate data
     const int align = 0;
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -547,6 +547,26 @@ bool StreamTranscoder::processTranscode()
             decodingStatus = decodingStatus && _currentDecoder->decodeNextFrame(*_decodedData.at(index));
     }
 
+    // check the next data buffers in case of audio frames
+    if(_decodedData.at(0)->isAudioFrame())
+    {
+        const int nbInputSamplesPerChannel = _decodedData.at(0)->getAVFrame().nb_samples;
+        if(nbInputSamplesPerChannel > _filteredData->getAVFrame().nb_samples)
+        {
+            LOG_WARN("The buffer of filtered data is too small: reallocate it.")
+            _filteredData->freeData();
+            _filteredData->getAVFrame().nb_samples = nbInputSamplesPerChannel;
+            _filteredData->allocateData();
+        }
+        if(nbInputSamplesPerChannel > _transformedData->getAVFrame().nb_samples)
+        {
+            LOG_WARN("The buffer of transformed data is too small: reallocate it.")
+            _transformedData->freeData();
+            _transformedData->getAVFrame().nb_samples = nbInputSamplesPerChannel;
+            _transformedData->allocateData();
+        }
+    }
+
     // Transform
     CodedData data;
     if(decodingStatus)
