AudioGenerator: removed AudioFrameDesc parameter in constructor

Clement Champetier · Clement Champetier · commit 924bf5be5462 · 2016-07-20T10:51:55.000+02:00
The AudioFrameDesc could be found from the given frame when decoding.
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -3,14 +3,14 @@
 #include <AvTranscoder/util.hpp>
 
 #include <sstream>
+#include <stdexcept>
 
 namespace avtranscoder
 {
 
-AudioGenerator::AudioGenerator(const AudioFrameDesc& frameDesc)
+AudioGenerator::AudioGenerator()
     : _inputFrame(NULL)
     , _silent(NULL)
-    , _frameDesc(frameDesc)
 {
 }
 
@@ -22,12 +22,8 @@ AudioGenerator::~AudioGenerator()
 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);
-    }
+    if(! frameBuffer.isAudioFrame())
+        throw std::runtime_error("The given frame is not a valid audio frame: allocate a new AVSample to put generated data into it.");
 
     // Check channel layout of the given frame to be able to copy audio data to it.
     // @see Frame.copyData method
diff --git a/src/AvTranscoder/decoder/AudioGenerator.hpp b/src/AvTranscoder/decoder/AudioGenerator.hpp
@@ -14,7 +14,7 @@ class AvExport AudioGenerator : public IDecoder
     AudioGenerator(const AudioGenerator& audioGenerator);
 
 public:
-    AudioGenerator(const AudioFrameDesc& frameDesc);
+    AudioGenerator();
 
     ~AudioGenerator();
 
@@ -26,7 +26,6 @@ class AvExport AudioGenerator : public IDecoder
 private:
     Frame* _inputFrame;              ///< Has link (no ownership)
     AudioFrame* _silent;             ///< The generated silent (has ownership)
-    const AudioFrameDesc _frameDesc; ///< The description of the silence (sampleRate, channels...)
 };
 }
 
diff --git a/src/AvTranscoder/reader/AudioReader.cpp b/src/AvTranscoder/reader/AudioReader.cpp
@@ -45,7 +45,7 @@ void AudioReader::init()
     _currentDecoder = _decoder;
 
     // generator
-    _generator = new AudioGenerator(_inputFile->getStream(_streamIndex).getAudioCodec().getAudioFrameDesc());
+    _generator = new AudioGenerator();
 
     // create transform
     _transform = new AudioTransform();
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -89,7 +89,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
                 AudioFrameDesc inputFrameDesc(inputStream.getAudioCodec().getAudioFrameDesc());
 
                 // generator decoder
-                _generators.push_back(new AudioGenerator(inputFrameDesc));
+                _generators.push_back(new AudioGenerator());
 
                 // buffers to process
                 _decodedData.push_back(AudioFrame(inputFrameDesc));
@@ -220,7 +220,7 @@ StreamTranscoder::StreamTranscoder(const InputStreamDesc& inputStreamDesc, IInpu
             _transform = new AudioTransform();
 
             // generator decoder
-            _generators.push_back(new AudioGenerator(outputFrameDesc));
+            _generators.push_back(new AudioGenerator());
 
             break;
         }
@@ -290,7 +290,7 @@ StreamTranscoder::StreamTranscoder(IOutputFile& outputFile, const ProfileLoader:
         inputAudioCodec.setAudioParameters(inputFrameDesc);
 
         // generator decoder
-        AudioGenerator* generator = new AudioGenerator(inputAudioCodec.getAudioFrameDesc());
+        AudioGenerator* generator = new AudioGenerator();
         _generators.push_back(generator);
         _currentDecoder = generator;
 
