AudioCodec: refactore getters

Clement Champetier · Clement Champetier · commit 30851a7f13c0 · 2014-10-31T18:40:05.000+01:00
* Do not duplicate getters with AudioFrameDesc (getSampleRate,
getChannels...).
* Keep symmetry with VideoCodec (rename getFrameDesc to
getAudioFrameDesc).
diff --git a/app/presetChecker/presetChecker.cpp b/app/presetChecker/presetChecker.cpp
@@ -34,7 +34,7 @@ int main( int argc, char** argv )
 			if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeAudio )
 			{
 				avtranscoder::AvOutputAudio outputAudio;
-				outputAudio.setProfile( profile, outputAudio.getAudioCodec().getFrameDesc() );
+				outputAudio.setProfile( profile, outputAudio.getAudioCodec().getAudioFrameDesc() );
 			}
 		}
 		catch( ... )
diff --git a/src/AvTranscoder/codec/AudioCodec.cpp b/src/AvTranscoder/codec/AudioCodec.cpp
@@ -20,7 +20,7 @@ AudioCodec::AudioCodec( const ICodec& codec )
 {
 }
 
-AudioFrameDesc AudioCodec::getFrameDesc() const
+AudioFrameDesc AudioCodec::getAudioFrameDesc() const
 {
 	assert( _codecContext != NULL );
 	AudioFrameDesc audioFrameDesc;
@@ -33,24 +33,6 @@ AudioFrameDesc AudioCodec::getFrameDesc() const
 	return audioFrameDesc;
 }
 
-const size_t AudioCodec::getSampleRate() const
-{
-	assert( _codecContext != NULL );
-	return _codecContext->sample_rate;
-}
-
-const size_t AudioCodec::getChannels() const
-{
-	assert( _codecContext != NULL );
-	return _codecContext->channels;
-}
-
-const AVSampleFormat AudioCodec::getAVSampleFormat() const
-{
-	assert( _codecContext != NULL );
-	return _codecContext->sample_fmt;
-}
-
 void AudioCodec::setAudioParameters( const AudioFrameDesc& audioFrameDesc )
 {
 	setAudioParameters( audioFrameDesc.getSampleRate(), audioFrameDesc.getChannels(), audioFrameDesc.getAVSampleFormat() );
diff --git a/src/AvTranscoder/codec/AudioCodec.hpp b/src/AvTranscoder/codec/AudioCodec.hpp
@@ -14,11 +14,8 @@ class AvExport AudioCodec : public ICodec
 	AudioCodec( const ECodecType type, const AVCodecID codecId );
 	AudioCodec( const ICodec& codec );
 
-	AudioFrameDesc getFrameDesc() const;
-	const size_t getSampleRate() const;
-	const size_t getChannels() const;
-	const AVSampleFormat getAVSampleFormat() const;
-	
+	AudioFrameDesc getAudioFrameDesc() const;
+
 	void setAudioParameters( const AudioFrameDesc& audioFrameDesc );
 	void setAudioParameters( const size_t sampleRate, const size_t channels, const AVSampleFormat sampleFormat );
 };
diff --git a/src/AvTranscoder/essenceStream/AvInputAudio.cpp b/src/AvTranscoder/essenceStream/AvInputAudio.cpp
@@ -49,7 +49,7 @@ void AvInputAudio::setup()
 	AVCodecContext* avCodecContext = _codec.getAVCodecContext();
 	AVCodec* avCodec = _codec.getAVCodec();
 
-	avCodecContext->channels = _inputStream->getAudioCodec().getChannels();
+	avCodecContext->channels = _inputStream->getAudioCodec().getAudioFrameDesc().getChannels();
 	
 	int ret = avcodec_open2( avCodecContext, avCodec, NULL );
 
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -126,7 +126,7 @@ StreamTranscoder::StreamTranscoder(
 
 			_outputEssence = outputAudio;
 			
-			AudioFrameDesc outputFrameDesc( _inputStream->getAudioCodec().getFrameDesc() );
+			AudioFrameDesc outputFrameDesc( _inputStream->getAudioCodec().getAudioFrameDesc() );
 			outputFrameDesc.setParameters( profile );
 			if( subStreamIndex > -1 )
 			{
@@ -137,12 +137,12 @@ StreamTranscoder::StreamTranscoder(
 
 			_outputStream = &outputFile.addAudioStream( outputAudio->getAudioCodec() );
 
-			AudioFrameDesc inputFrameDesc( _inputStream->getAudioCodec().getFrameDesc() );
+			AudioFrameDesc inputFrameDesc( _inputStream->getAudioCodec().getAudioFrameDesc() );
 			if( subStreamIndex > -1 )
 				inputFrameDesc.setChannels( 1 );
 			
 			_sourceBuffer = new AudioFrame( inputFrameDesc );
-			_frameBuffer  = new AudioFrame( outputAudio->getAudioCodec().getFrameDesc() );
+			_frameBuffer  = new AudioFrame( outputAudio->getAudioCodec().getAudioFrameDesc() );
 			
 			_transform = new AudioTransform();
 
@@ -223,7 +223,7 @@ StreamTranscoder::StreamTranscoder(
 		_inputEssence = generatorAudio;
 
 		// Create inputFrame, and outputFrame which is based on a given profile
-		AudioFrameDesc inputFrameDesc = inputAudioCodec.getFrameDesc();
+		AudioFrameDesc inputFrameDesc = inputAudioCodec.getAudioFrameDesc();
 		AudioFrameDesc outputFrameDesc = inputFrameDesc;
 		outputFrameDesc.setParameters( profile );
 		_sourceBuffer = new AudioFrame( inputFrameDesc );

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ int main( int argc, char** argv )`
`34`	`34`	`if( profile.find( avtranscoder::constants::avProfileType )->second == avtranscoder::constants::avProfileTypeAudio )`
`35`	`35`	`{`
`36`	`36`	`avtranscoder::AvOutputAudio outputAudio;`
`37`		`- outputAudio.setProfile( profile, outputAudio.getAudioCodec().getFrameDesc() );`
	`37`	`+ outputAudio.setProfile( profile, outputAudio.getAudioCodec().getAudioFrameDesc() );`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`catch( ... )`