AudioGenerator: updated constructor to give a FrameDesc

Clement Champetier · Clement Champetier · commit a0e18d624182 · 2016-04-08T15:47:00.000+02:00
Since all our generators are allocated, and their FrameDesc are set just
    after.
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -7,24 +7,25 @@
 namespace avtranscoder
 {
 
-AudioGenerator::AudioGenerator()
+AudioGenerator::AudioGenerator(const AudioFrameDesc& frameDesc)
     : _inputFrame(NULL)
     , _silent(NULL)
+    , _frameDesc(frameDesc)
 {
 }
 
 AudioGenerator::AudioGenerator(const AudioGenerator& audioGenerator)
     : _inputFrame(NULL)
     , _silent(NULL)
-    , _frameDesc(audioGenerator.getAudioFrameDesc())
+    , _frameDesc(audioGenerator._frameDesc)
 {
 }
 
 AudioGenerator& AudioGenerator::operator=(const AudioGenerator& audioGenerator)
 {
     _inputFrame = NULL;
     _silent = NULL;
-    _frameDesc = audioGenerator.getAudioFrameDesc();
+    _frameDesc = audioGenerator._frameDesc;
     return *this;
 }
 
diff --git a/src/AvTranscoder/decoder/AudioGenerator.hpp b/src/AvTranscoder/decoder/AudioGenerator.hpp
@@ -10,7 +10,7 @@ namespace avtranscoder
 class AvExport AudioGenerator : public IDecoder
 {
 public:
-    AudioGenerator();
+    AudioGenerator(const AudioFrameDesc& frameDesc);
     AudioGenerator(const AudioGenerator& audioGenerator);
     AudioGenerator& operator=(const AudioGenerator& audioGenerator);
 
@@ -19,9 +19,6 @@ class AvExport AudioGenerator : public IDecoder
     bool decodeNextFrame(Frame& frameBuffer);
     bool decodeNextFrame(Frame& frameBuffer, const size_t subStreamIndex);
 
-    const AudioFrameDesc& getAudioFrameDesc() const { return _frameDesc; }
-    void setAudioFrameDesc(const AudioFrameDesc& frameDesc) { _frameDesc = frameDesc; }
-
     void setNextFrame(Frame& inputFrame) { _inputFrame = &inputFrame; }
 
 private:
diff --git a/src/AvTranscoder/reader/AudioReader.cpp b/src/AvTranscoder/reader/AudioReader.cpp
@@ -44,9 +44,7 @@ void AudioReader::init()
     _decoder->setupDecoder();
 
     // generator
-    AudioGenerator* generator = new AudioGenerator();
-    generator->setAudioFrameDesc(_inputFile->getStream(_streamIndex).getAudioCodec().getAudioFrameDesc());
-    _generator = generator;
+    _generator = new AudioGenerator(_inputFile->getStream(_streamIndex).getAudioCodec().getAudioFrameDesc());
 
     // create transform
     _transform = new AudioTransform();
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -86,9 +86,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
                 AudioFrameDesc inputFrameDesc(_inputStream->getAudioCodec().getAudioFrameDesc());
 
                 // generator decoder
-                AudioGenerator* generatorAudio = new AudioGenerator();
-                generatorAudio->setAudioFrameDesc(inputFrameDesc);
-                _generator = generatorAudio;
+                _generator = new AudioGenerator(inputFrameDesc);
 
                 // buffers to process
                 _sourceBuffer = new AudioFrame(inputFrameDesc);
@@ -215,9 +213,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
             _transform = new AudioTransform();
 
             // generator decoder
-            AudioGenerator* generatorAudio = new AudioGenerator();
-            generatorAudio->setAudioFrameDesc(outputFrameDesc);
-            _generator = generatorAudio;
+            _generator = new AudioGenerator(outputFrameDesc);
 
             break;
         }
@@ -275,11 +271,9 @@ StreamTranscoder::StreamTranscoder(const ICodec& inputCodec, IOutputFile& output
     }
     else if(profile.find(constants::avProfileType)->second == constants::avProfileTypeAudio)
     {
-        // generator decoder
-        AudioGenerator* generatorAudio = new AudioGenerator();
         const AudioCodec& inputAudioCodec = static_cast<const AudioCodec&>(inputCodec);
-        generatorAudio->setAudioFrameDesc(inputAudioCodec.getAudioFrameDesc());
-        _generator = generatorAudio;
+        // generator decoder
+        _generator = new AudioGenerator(inputAudioCodec.getAudioFrameDesc());
         _currentDecoder = _generator;
 
         // filter

Original file line number	Diff line number	Diff line change
`@@ -7,24 +7,25 @@`
`7`	`7`	`namespace avtranscoder`
`8`	`8`	`{`
`9`	`9`
`10`		`-AudioGenerator::AudioGenerator()`
	`10`	`+AudioGenerator::AudioGenerator(const AudioFrameDesc& frameDesc)`
`11`	`11`	`: _inputFrame(NULL)`
`12`	`12`	`, _silent(NULL)`
	`13`	`+ , _frameDesc(frameDesc)`
`13`	`14`	`{`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`AudioGenerator::AudioGenerator(const AudioGenerator& audioGenerator)`
`17`	`18`	`: _inputFrame(NULL)`
`18`	`19`	`, _silent(NULL)`
`19`		`- , _frameDesc(audioGenerator.getAudioFrameDesc())`
	`20`	`+ , _frameDesc(audioGenerator._frameDesc)`
`20`	`21`	`{`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`AudioGenerator& AudioGenerator::operator=(const AudioGenerator& audioGenerator)`
`24`	`25`	`{`
`25`	`26`	`_inputFrame = NULL;`
`26`	`27`	`_silent = NULL;`
`27`		`- _frameDesc = audioGenerator.getAudioFrameDesc();`
	`28`	`+ _frameDesc = audioGenerator._frameDesc;`
`28`	`29`	`return *this;`
`29`	`30`	`}`
`30`	`31`