AudioFrame: update constructors

Clement Champetier · Clement Champetier · commit e5ee8527f477 · 2016-10-31T12:01:53.000+01:00
* Remove default constructor.
* Add a constructor from a profile.
diff --git a/src/AvTranscoder/codec/AudioCodec.cpp b/src/AvTranscoder/codec/AudioCodec.cpp
@@ -1,5 +1,7 @@
 #include "AudioCodec.hpp"
 
+#include <AvTranscoder/util.hpp>
+
 #include <cmath>
 #include <cassert>
 
@@ -24,7 +26,7 @@ AudioCodec::AudioCodec(const ECodecType type, AVCodecContext& avCodecContext)
 AudioFrameDesc AudioCodec::getAudioFrameDesc() const
 {
     assert(_avCodecContext != NULL);
-    return AudioFrameDesc(_avCodecContext->sample_rate, _avCodecContext->channels, _avCodecContext->sample_fmt);
+    return AudioFrameDesc(_avCodecContext->sample_rate, _avCodecContext->channels, getSampleFormatName(_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
@@ -12,18 +12,19 @@ extern "C" {
 namespace avtranscoder
 {
 
-AudioFrameDesc::AudioFrameDesc(const size_t sampleRate, const size_t nbChannels, const AVSampleFormat sampleFormat)
+AudioFrameDesc::AudioFrameDesc(const size_t sampleRate, const size_t nbChannels, const std::string& sampleFormatName)
     : _sampleRate(sampleRate)
     , _nbChannels(nbChannels)
-    , _sampleFormat(sampleFormat)
+    , _sampleFormat(getAVSampleFormat(sampleFormatName))
 {
 }
 
-AudioFrameDesc::AudioFrameDesc(const size_t sampleRate, const size_t nbChannels, const std::string& sampleFormatName)
-    : _sampleRate(sampleRate)
-    , _nbChannels(nbChannels)
-    , _sampleFormat(getAVSampleFormat(sampleFormatName))
+AudioFrameDesc::AudioFrameDesc(const ProfileLoader::Profile& profile)
+    : _sampleRate(0)
+    , _nbChannels(0)
+    , _sampleFormat(AV_SAMPLE_FMT_NONE)
 {
+    setParameters(profile);
 }
 
 void AudioFrameDesc::setParameters(const ProfileLoader::Profile& profile)
diff --git a/src/AvTranscoder/data/decoded/AudioFrame.hpp b/src/AvTranscoder/data/decoded/AudioFrame.hpp
@@ -14,9 +14,8 @@ namespace avtranscoder
 struct AvExport AudioFrameDesc
 {
 public:
-    AudioFrameDesc(const size_t sampleRate = 0, const size_t channels = 0,
-                   const AVSampleFormat sampleFormat = AV_SAMPLE_FMT_NONE);
     AudioFrameDesc(const size_t sampleRate, const size_t channels, const std::string& sampleFormatName);
+    AudioFrameDesc(const ProfileLoader::Profile& profile);
 
     /**
      * @brief Set the attributes from the given profile.
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -1,5 +1,6 @@
 #include "AudioDecoder.hpp"
 
+#include <AvTranscoder/util.hpp>
 #include <AvTranscoder/codec/ICodec.hpp>
 #include <AvTranscoder/stream/InputStream.hpp>
 #include <AvTranscoder/data/decoded/AudioFrame.hpp>
@@ -133,7 +134,7 @@ bool AudioDecoder::decodeNextFrame(IFrame& frameBuffer, const std::vector<size_t
 
     // else decode all data in an intermediate buffer
     AudioFrame& audioBuffer = static_cast<AudioFrame&>(frameBuffer);
-    AudioFrame allDataOfNextFrame(AudioFrameDesc(audioBuffer.getSampleRate(), srcNbChannels, audioBuffer.getSampleFormat()), false);
+    AudioFrame allDataOfNextFrame(AudioFrameDesc(audioBuffer.getSampleRate(), srcNbChannels, getSampleFormatName(audioBuffer.getSampleFormat())), false);
     if(!decodeNextFrame(allDataOfNextFrame))
         return false;
 
diff --git a/src/AvTranscoder/reader/AudioReader.cpp b/src/AvTranscoder/reader/AudioReader.cpp
@@ -54,7 +54,7 @@ void AudioReader::init()
     // create dst frame
     _outputSampleRate = srcFrame->getSampleRate();
     _outputNbChannels = (_channelIndex == -1) ? srcFrame->getNbChannels() : 1;
-    _dstFrame = new AudioFrame(AudioFrameDesc(_outputSampleRate, _outputNbChannels, _outputSampleFormat));
+    _dstFrame = new AudioFrame(AudioFrameDesc(_outputSampleRate, _outputNbChannels, getSampleFormatName(_outputSampleFormat)));
 
     // generator
     _generator = new AudioGenerator(srcFrameDesc);
@@ -79,6 +79,6 @@ void AudioReader::updateOutput(const size_t sampleRate, const size_t nbChannels,
     _outputSampleFormat = getAVSampleFormat(sampleFormat);
     // update dst frame
     delete _dstFrame;
-    _dstFrame = new AudioFrame(AudioFrameDesc(_outputSampleRate, _outputNbChannels, _outputSampleFormat));
+    _dstFrame = new AudioFrame(AudioFrameDesc(_outputSampleRate, _outputNbChannels, getSampleFormatName(_outputSampleFormat)));
 }
 }
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -333,8 +333,7 @@ StreamTranscoder::StreamTranscoder(IOutputFile& outputFile, const ProfileLoader:
     else if(profile.find(constants::avProfileType)->second == constants::avProfileTypeAudio)
     {
         AudioCodec inputAudioCodec(eCodecTypeEncoder, profile.find(constants::avProfileCodec)->second);
-        AudioFrameDesc inputFrameDesc;
-        inputFrameDesc.setParameters(profile);
+        AudioFrameDesc inputFrameDesc(profile);
         inputAudioCodec.setAudioParameters(inputFrameDesc);
 
         // generator decoder

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`#include "AudioCodec.hpp"`
`2`	`2`
	`3`	`+#include <AvTranscoder/util.hpp>`
	`4`	`+`
`3`	`5`	`#include <cmath>`
`4`	`6`	`#include <cassert>`
`5`	`7`
`@@ -24,7 +26,7 @@ AudioCodec::AudioCodec(const ECodecType type, AVCodecContext& avCodecContext)`
`24`	`26`	`AudioFrameDesc AudioCodec::getAudioFrameDesc() const`
`25`	`27`	`{`
`26`	`28`	`assert(_avCodecContext != NULL);`
`27`		`- return AudioFrameDesc(_avCodecContext->sample_rate, _avCodecContext->channels, _avCodecContext->sample_fmt);`
	`29`	`+ return AudioFrameDesc(_avCodecContext->sample_rate, _avCodecContext->channels, getSampleFormatName(_avCodecContext->sample_fmt));`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`void AudioCodec::setAudioParameters(const AudioFrameDesc& audioFrameDesc)`
Original file line number	Diff line number	Diff line change
`@@ -12,18 +12,19 @@ extern "C" {`
`12`	`12`	`namespace avtranscoder`
`13`	`13`	`{`
`14`	`14`
`15`		`-AudioFrameDesc::AudioFrameDesc(const size_t sampleRate, const size_t nbChannels, const AVSampleFormat sampleFormat)`
	`15`	`+AudioFrameDesc::AudioFrameDesc(const size_t sampleRate, const size_t nbChannels, const std::string& sampleFormatName)`
`16`	`16`	`: _sampleRate(sampleRate)`
`17`	`17`	`, _nbChannels(nbChannels)`
`18`		`- , _sampleFormat(sampleFormat)`
	`18`	`+ , _sampleFormat(getAVSampleFormat(sampleFormatName))`
`19`	`19`	`{`
`20`	`20`	`}`
`21`	`21`
`22`		`-AudioFrameDesc::AudioFrameDesc(const size_t sampleRate, const size_t nbChannels, const std::string& sampleFormatName)`
`23`		`- : _sampleRate(sampleRate)`
`24`		`- , _nbChannels(nbChannels)`
`25`		`- , _sampleFormat(getAVSampleFormat(sampleFormatName))`
	`22`	`+AudioFrameDesc::AudioFrameDesc(const ProfileLoader::Profile& profile)`
	`23`	`+ : _sampleRate(0)`
	`24`	`+ , _nbChannels(0)`
	`25`	`+ , _sampleFormat(AV_SAMPLE_FMT_NONE)`
`26`	`26`	`{`
	`27`	`+ setParameters(profile);`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`void AudioFrameDesc::setParameters(const ProfileLoader::Profile& profile)`
Original file line number	Diff line number	Diff line change
`@@ -333,8 +333,7 @@ StreamTranscoder::StreamTranscoder(IOutputFile& outputFile, const ProfileLoader:`
`333`	`333`	`else if(profile.find(constants::avProfileType)->second == constants::avProfileTypeAudio)`
`334`	`334`	`{`
`335`	`335`	`AudioCodec inputAudioCodec(eCodecTypeEncoder, profile.find(constants::avProfileCodec)->second);`
`336`		`- AudioFrameDesc inputFrameDesc;`
`337`		`- inputFrameDesc.setParameters(profile);`
	`336`	`+ AudioFrameDesc inputFrameDesc(profile);`
`338`	`337`	`inputAudioCodec.setAudioParameters(inputFrameDesc);`
`339`	`338`
`340`	`339`	`// generator decoder`