AudioFrameDesc: removed _fps attribute

Clement Champetier · Clement Champetier · commit 5e80e129ec27 · 2016-01-19T11:49:35.000+01:00
* Not used.
* AudioGenerator: removed _frameDesc attributes and the methods to
manipulate it.
diff --git a/src/AvTranscoder/codec/AudioCodec.cpp b/src/AvTranscoder/codec/AudioCodec.cpp
@@ -24,8 +24,7 @@ AudioCodec::AudioCodec(const ECodecType type, AVCodecContext& avCodecContext)
 AudioFrameDesc AudioCodec::getAudioFrameDesc() const
 {
     assert(_avCodecContext != NULL);
-    AudioFrameDesc audioFrameDesc(_avCodecContext->sample_rate, _avCodecContext->channels, _avCodecContext->sample_fmt);
-    return audioFrameDesc;
+    return AudioFrameDesc(_avCodecContext->sample_rate, _avCodecContext->channels, _avCodecContext->sample_fmt);
 }
 
 void AudioCodec::setAudioParameters(const AudioFrameDesc& audioFrameDesc)
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.cpp b/src/AvTranscoder/data/decoded/AudioFrame.cpp
@@ -16,15 +16,13 @@ AudioFrameDesc::AudioFrameDesc(const size_t sampleRate, const size_t nbChannels,
     : _sampleRate(sampleRate)
     , _nbChannels(nbChannels)
     , _sampleFormat(sampleFormat)
-    , _fps(25.)
 {
 }
 
 AudioFrameDesc::AudioFrameDesc(const size_t sampleRate, const size_t nbChannels, const std::string& sampleFormatName)
     : _sampleRate(sampleRate)
     , _nbChannels(nbChannels)
     , _sampleFormat(getAVSampleFormat(sampleFormatName))
-    , _fps(25.)
 {
 }
 
@@ -39,9 +37,6 @@ void AudioFrameDesc::setParameters(const ProfileLoader::Profile& profile)
     // sample format
     if(profile.count(constants::avProfileSampleFormat))
         _sampleFormat = getAVSampleFormat(profile.find(constants::avProfileSampleFormat)->second.c_str());
-    // fps
-    if(profile.count(constants::avProfileFrameRate))
-        _fps = atof(profile.find(constants::avProfileFrameRate)->second.c_str());
 }
 
 AudioFrame::AudioFrame(const AudioFrameDesc& ref)
@@ -83,7 +78,7 @@ void AudioFrame::allocateAVSample(const AudioFrameDesc& desc)
     _frame->channels = desc._nbChannels;
     _frame->channel_layout = av_get_default_channel_layout(desc._nbChannels);
     _frame->format = desc._sampleFormat;
-    _frame->nb_samples = desc._sampleRate / desc._fps; // cannot be known before calling avcodec_decode_audio4
+    _frame->nb_samples = desc._sampleRate / 25.; // cannot be known before calling avcodec_decode_audio4
 
     // Allocate data
     const int align = 0;
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.hpp b/src/AvTranscoder/data/decoded/AudioFrame.hpp
@@ -28,7 +28,6 @@ struct AvExport AudioFrameDesc
     size_t _sampleRate;
     size_t _nbChannels;
     AVSampleFormat _sampleFormat;
-    double _fps;
 };
 
 /**
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -6,22 +6,19 @@ namespace avtranscoder
 AudioGenerator::AudioGenerator()
     : _inputFrame(NULL)
     , _silent(NULL)
-    , _frameDesc()
 {
 }
 
 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;
 }
 
@@ -30,13 +27,7 @@ AudioGenerator::~AudioGenerator()
     delete _silent;
 }
 
-void AudioGenerator::setAudioFrameDesc(const AudioFrameDesc& frameDesc)
-{
-    _frameDesc = frameDesc;
-    _frameDesc._fps = 25.;
-}
-
-void AudioGenerator::setFrame(Frame& inputFrame)
+void AudioGenerator::setNextFrame(Frame& inputFrame)
 {
     _inputFrame = &inputFrame;
 }
diff --git a/src/AvTranscoder/decoder/AudioGenerator.hpp b/src/AvTranscoder/decoder/AudioGenerator.hpp
@@ -19,15 +19,11 @@ 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);
-
     void setFrame(Frame& inputFrame);
 
 private:
     Frame* _inputFrame;        ///< Has link (no ownership)
     AudioFrame* _silent;       ///< The generated silent (has ownership)
-    AudioFrameDesc _frameDesc; ///< The description of the silent (sample rate...)
 };
 }
 
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -82,7 +82,6 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
 
                 // generator decoder
                 AudioGenerator* generatorAudio = new AudioGenerator();
-                generatorAudio->setAudioFrameDesc(inputFrameDesc);
                 _generator = generatorAudio;
 
                 // buffers to process
@@ -206,7 +205,6 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
 
             // generator decoder
             AudioGenerator* generatorAudio = new AudioGenerator();
-            generatorAudio->setAudioFrameDesc(outputAudio->getAudioCodec().getAudioFrameDesc());
             _generator = generatorAudio;
 
             break;
@@ -266,7 +264,6 @@ 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
`@@ -24,8 +24,7 @@ AudioCodec::AudioCodec(const ECodecType type, AVCodecContext& avCodecContext)`
`24`	`24`	`AudioFrameDesc AudioCodec::getAudioFrameDesc() const`
`25`	`25`	`{`
`26`	`26`	`assert(_avCodecContext != NULL);`
`27`		`- AudioFrameDesc audioFrameDesc(_avCodecContext->sample_rate, _avCodecContext->channels, _avCodecContext->sample_fmt);`
`28`		`- return audioFrameDesc;`
	`27`	`+ return AudioFrameDesc(_avCodecContext->sample_rate, _avCodecContext->channels, _avCodecContext->sample_fmt);`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`void AudioCodec::setAudioParameters(const AudioFrameDesc& audioFrameDesc)`
Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,13 @@ AudioFrameDesc::AudioFrameDesc(const size_t sampleRate, const size_t nbChannels,`
`16`	`16`	`: _sampleRate(sampleRate)`
`17`	`17`	`, _nbChannels(nbChannels)`
`18`	`18`	`, _sampleFormat(sampleFormat)`
`19`		`- , _fps(25.)`
`20`	`19`	`{`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`AudioFrameDesc::AudioFrameDesc(const size_t sampleRate, const size_t nbChannels, const std::string& sampleFormatName)`
`24`	`23`	`: _sampleRate(sampleRate)`
`25`	`24`	`, _nbChannels(nbChannels)`
`26`	`25`	`, _sampleFormat(getAVSampleFormat(sampleFormatName))`
`27`		`- , _fps(25.)`
`28`	`26`	`{`
`29`	`27`	`}`
`30`	`28`
`@@ -39,9 +37,6 @@ void AudioFrameDesc::setParameters(const ProfileLoader::Profile& profile)`
`39`	`37`	`// sample format`
`40`	`38`	`if(profile.count(constants::avProfileSampleFormat))`
`41`	`39`	`_sampleFormat = getAVSampleFormat(profile.find(constants::avProfileSampleFormat)->second.c_str());`
`42`		`- // fps`
`43`		`- if(profile.count(constants::avProfileFrameRate))`
`44`		`- _fps = atof(profile.find(constants::avProfileFrameRate)->second.c_str());`
`45`	`40`	`}`
`46`	`41`
`47`	`42`	`AudioFrame::AudioFrame(const AudioFrameDesc& ref)`
`@@ -83,7 +78,7 @@ void AudioFrame::allocateAVSample(const AudioFrameDesc& desc)`
`83`	`78`	`_frame->channels = desc._nbChannels;`
`84`	`79`	`_frame->channel_layout = av_get_default_channel_layout(desc._nbChannels);`
`85`	`80`	`_frame->format = desc._sampleFormat;`
`86`		`- _frame->nb_samples = desc._sampleRate / desc._fps; // cannot be known before calling avcodec_decode_audio4`
	`81`	`+ _frame->nb_samples = desc._sampleRate / 25.; // cannot be known before calling avcodec_decode_audio4`
`87`	`82`
`88`	`83`	`// Allocate data`
`89`	`84`	`const int align = 0;`
Original file line number	Diff line number	Diff line change
`@@ -6,22 +6,19 @@ namespace avtranscoder`
`6`	`6`	`AudioGenerator::AudioGenerator()`
`7`	`7`	`: _inputFrame(NULL)`
`8`	`8`	`, _silent(NULL)`
`9`		`- , _frameDesc()`
`10`	`9`	`{`
`11`	`10`	`}`
`12`	`11`
`13`	`12`	`AudioGenerator::AudioGenerator(const AudioGenerator& audioGenerator)`
`14`	`13`	`: _inputFrame(NULL)`
`15`	`14`	`, _silent(NULL)`
`16`		`- , _frameDesc(audioGenerator.getAudioFrameDesc())`
`17`	`15`	`{`
`18`	`16`	`}`
`19`	`17`
`20`	`18`	`AudioGenerator& AudioGenerator::operator=(const AudioGenerator& audioGenerator)`
`21`	`19`	`{`
`22`	`20`	`_inputFrame = NULL;`
`23`	`21`	`_silent = NULL;`
`24`		`- _frameDesc = audioGenerator.getAudioFrameDesc();`
`25`	`22`	`return *this;`
`26`	`23`	`}`
`27`	`24`
`@@ -30,13 +27,7 @@ AudioGenerator::~AudioGenerator()`
`30`	`27`	`delete _silent;`
`31`	`28`	`}`
`32`	`29`
`33`		`-void AudioGenerator::setAudioFrameDesc(const AudioFrameDesc& frameDesc)`
`34`		`-{`
`35`		`- _frameDesc = frameDesc;`
`36`		`- _frameDesc._fps = 25.;`
`37`		`-}`
`38`		`-`
`39`		`-void AudioGenerator::setFrame(Frame& inputFrame)`
	`30`	`+void AudioGenerator::setNextFrame(Frame& inputFrame)`
`40`	`31`	`{`
`41`	`32`	`_inputFrame = &inputFrame;`
`42`	`33`	`}`