AudioGenerator: fixed decoding if the given frame is not valid

Clement Champetier · Clement Champetier · commit 3723ffcf2213 · 2016-04-08T15:35:13.000+02:00
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.hpp b/src/AvTranscoder/data/decoded/AudioFrame.hpp
@@ -70,6 +70,12 @@ class AvExport AudioFrame : public Frame
      * @brief Allocate the audio buffer of the frame.
      */
     void allocateAVSample(const AudioFrameDesc& ref);
+
+    /**
+     * @note To allocate new audio buffer if needed.
+     * @see allocateAVSample
+     */
+    friend class AudioGenerator;
 };
 }
 
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -16,13 +16,15 @@ AudioGenerator::AudioGenerator()
 AudioGenerator::AudioGenerator(const AudioGenerator& audioGenerator)
     : _inputFrame(NULL)
     , _silent(NULL)
+    , _frameDesc(audioGenerator.getAudioFrameDesc())
 {
 }
 
 AudioGenerator& AudioGenerator::operator=(const AudioGenerator& audioGenerator)
 {
     _inputFrame = NULL;
     _silent = NULL;
+    _frameDesc = audioGenerator.getAudioFrameDesc();
     return *this;
 }
 
@@ -38,6 +40,14 @@ void AudioGenerator::setNextFrame(Frame& inputFrame)
 
 bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)
 {
+    // check the given frame
+    if(!frameBuffer.isAudioFrame())
+    {
+        LOG_WARN("The given frame is not a valid audio frame: allocate a new AVSample to put generated data into it.");
+        frameBuffer.clear();
+        static_cast<AudioFrame&>(frameBuffer).allocateAVSample(_frameDesc);
+    }
+
     // Check channel layout of the given frame to be able to copy audio data to it.
     // @see Frame.copyData method
     if(frameBuffer.getAVFrame().channel_layout == 0)
diff --git a/src/AvTranscoder/decoder/AudioGenerator.hpp b/src/AvTranscoder/decoder/AudioGenerator.hpp
@@ -20,10 +20,13 @@ class AvExport AudioGenerator : public IDecoder
     bool decodeNextFrame(Frame& frameBuffer, const size_t subStreamIndex);
 
     void setNextFrame(Frame& inputFrame);
+    const AudioFrameDesc& getAudioFrameDesc() const { return _frameDesc; }
+    void setAudioFrameDesc(const AudioFrameDesc& frameDesc) { _frameDesc = frameDesc; }
 
 private:
     Frame* _inputFrame;  ///< Has link (no ownership)
     AudioFrame* _silent; ///< The generated silent (has ownership)
+    AudioFrameDesc _frameDesc; ///< The description of the silence (sampleRate, channels...)
 };
 }
 
diff --git a/src/AvTranscoder/reader/AudioReader.cpp b/src/AvTranscoder/reader/AudioReader.cpp
@@ -44,7 +44,9 @@ void AudioReader::init()
     _decoder->setupDecoder();
 
     // generator
-    _generator = new AudioGenerator();
+    AudioGenerator* generator = new AudioGenerator();
+    generator->setAudioFrameDesc(_inputFile->getStream(_streamIndex).getAudioCodec().getAudioFrameDesc());
+    _generator = generator;
 
     // create transform
     _transform = new AudioTransform();
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -89,6 +89,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
 
                 // generator decoder
                 AudioGenerator* generatorAudio = new AudioGenerator();
+                generatorAudio->setAudioFrameDesc(inputFrameDesc);
                 _generator = generatorAudio;
 
                 // buffers to process
@@ -219,6 +220,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
 
             // generator decoder
             AudioGenerator* generatorAudio = new AudioGenerator();
+            generatorAudio->setAudioFrameDesc(outputFrameDesc);
             _generator = generatorAudio;
 
             break;
@@ -282,6 +284,7 @@ StreamTranscoder::StreamTranscoder(const ICodec& inputCodec, IOutputFile& output
         // generator decoder
         AudioGenerator* generatorAudio = new AudioGenerator();
         const AudioCodec& inputAudioCodec = static_cast<const AudioCodec&>(inputCodec);
+        generatorAudio->setAudioFrameDesc(inputAudioCodec.getAudioFrameDesc());
         _generator = generatorAudio;
         _currentDecoder = _generator;
 

Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,15 @@ AudioGenerator::AudioGenerator()`
`16`	`16`	`AudioGenerator::AudioGenerator(const AudioGenerator& audioGenerator)`
`17`	`17`	`: _inputFrame(NULL)`
`18`	`18`	`, _silent(NULL)`
	`19`	`+ , _frameDesc(audioGenerator.getAudioFrameDesc())`
`19`	`20`	`{`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`AudioGenerator& AudioGenerator::operator=(const AudioGenerator& audioGenerator)`
`23`	`24`	`{`
`24`	`25`	`_inputFrame = NULL;`
`25`	`26`	`_silent = NULL;`
	`27`	`+ _frameDesc = audioGenerator.getAudioFrameDesc();`
`26`	`28`	`return *this;`
`27`	`29`	`}`
`28`	`30`
`@@ -38,6 +40,14 @@ void AudioGenerator::setNextFrame(Frame& inputFrame)`
`38`	`40`
`39`	`41`	`bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)`
`40`	`42`	`{`
	`43`	`+ // check the given frame`
	`44`	`+ if(!frameBuffer.isAudioFrame())`
	`45`	`+ {`
	`46`	`+ LOG_WARN("The given frame is not a valid audio frame: allocate a new AVSample to put generated data into it.");`
	`47`	`+ frameBuffer.clear();`
	`48`	`+ static_cast<AudioFrame&>(frameBuffer).allocateAVSample(_frameDesc);`
	`49`	`+ }`
	`50`	`+`
`41`	`51`	`// Check channel layout of the given frame to be able to copy audio data to it.`
`42`	`52`	`// @see Frame.copyData method`
`43`	`53`	`if(frameBuffer.getAVFrame().channel_layout == 0)`