GeneratorAudio: rename _audioDesc to _codec

Clement Champetier · Clement Champetier · commit 33c4d9265510 · 2014-10-16T18:50:32.000+02:00
* According to the class name "AudioCodec".
* "getAudioCodec" returns a reference instead of make a copy.
* Rename "setAudioDesc" to "setAudioCodec".
diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.cpp b/src/AvTranscoder/essenceStream/GeneratorAudio.cpp
@@ -6,7 +6,7 @@ namespace avtranscoder
 GeneratorAudio::GeneratorAudio( )
 	: IInputEssence( )
 	, _inputFrame( NULL )
-	, _audioDesc( eCodecTypeEncoder )
+	, _codec( eCodecTypeEncoder )
 	, _frameDesc()
 {
 }
@@ -15,19 +15,19 @@ GeneratorAudio::~GeneratorAudio( )
 {
 }
 
-void GeneratorAudio::setAudioDesc( const AudioCodec& audioDesc )
+void GeneratorAudio::setAudioCodec( const AudioCodec& codec )
 {
-	_audioDesc = audioDesc;
-	
-	_frameDesc.setSampleRate  ( _audioDesc.getAVCodecContext()->sample_rate );
-	_frameDesc.setChannels    ( _audioDesc.getAVCodecContext()->channels );
 	_frameDesc.setFps         ( 25.0 );
-	_frameDesc.setSampleFormat( _audioDesc.getAVCodecContext()->sample_fmt );
+	_codec = codec;
+
+	_frameDesc.setSampleRate( _codec.getAVCodecContext()->sample_rate );
+	_frameDesc.setChannels( _codec.getAVCodecContext()->channels );
+	_frameDesc.setSampleFormat( _codec.getAVCodecContext()->sample_fmt );
 }
 
-AudioCodec GeneratorAudio::getAudioCodec() const
+AudioCodec& GeneratorAudio::getAudioCodec()
 {
-	return _audioDesc;
+	return _codec;
 }
 
 void GeneratorAudio::setFrame( Frame& inputFrame )
diff --git a/src/AvTranscoder/essenceStream/GeneratorAudio.hpp b/src/AvTranscoder/essenceStream/GeneratorAudio.hpp
@@ -14,10 +14,9 @@ class AvExport GeneratorAudio : public IInputEssence
 
 	~GeneratorAudio( );
 
-	// Stream properties
-	void setAudioDesc( const AudioCodec& audioDesc );
+	void setAudioCodec( const AudioCodec& codec );
 
-	AudioCodec getAudioCodec() const;
+	AudioCodec& getAudioCodec();
 	
 	void setup() {}
 	
@@ -27,7 +26,7 @@ class AvExport GeneratorAudio : public IInputEssence
 	bool readNextFrame( Frame& frameBuffer, const size_t subStreamIndex );
 
 private:
-	AudioCodec      _audioDesc;
+	AudioCodec _codec;
 	AudioFrameDesc _frameDesc;
 	
 	Frame*         _inputFrame;
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -147,7 +147,7 @@ StreamTranscoder::StreamTranscoder(
 			_transform = new AudioTransform();
 
 			GeneratorAudio* generatorAudio = new GeneratorAudio();
-			generatorAudio->setAudioDesc( outputAudio->getAudioCodec() );
+			generatorAudio->setAudioCodec( outputAudio->getAudioCodec() );
 			_generatorEssence = generatorAudio;
 
 			break;
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -405,7 +405,7 @@ void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const ICod
 		if( _verbose )
 			std::cout << "add a generated audio stream" << std::endl;
 		_generatorAudio.push_back( new GeneratorAudio() );
-		_generatorAudio.back()->setAudioDesc( static_cast<AudioCodec>( codec ) );
+		_generatorAudio.back()->setAudioCodec( static_cast<AudioCodec>( codec ) );
 		
 		_streamTranscoders.push_back( new StreamTranscoder( *_generatorAudio.back(), _outputFile, profile ) );
 	}

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace avtranscoder`
`6`	`6`	`GeneratorAudio::GeneratorAudio( )`
`7`	`7`	`: IInputEssence( )`
`8`	`8`	`, _inputFrame( NULL )`
`9`		`- , _audioDesc( eCodecTypeEncoder )`
	`9`	`+ , _codec( eCodecTypeEncoder )`
`10`	`10`	`, _frameDesc()`
`11`	`11`	`{`
`12`	`12`	`}`
`@@ -15,19 +15,19 @@ GeneratorAudio::~GeneratorAudio( )`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`
`18`		`-void GeneratorAudio::setAudioDesc( const AudioCodec& audioDesc )`
	`18`	`+void GeneratorAudio::setAudioCodec( const AudioCodec& codec )`
`19`	`19`	`{`
`20`		`- _audioDesc = audioDesc;`
`21`		`-`
`22`		`- _frameDesc.setSampleRate ( _audioDesc.getAVCodecContext()->sample_rate );`
`23`		`- _frameDesc.setChannels ( _audioDesc.getAVCodecContext()->channels );`
`24`	`20`	`_frameDesc.setFps ( 25.0 );`
`25`		`- _frameDesc.setSampleFormat( _audioDesc.getAVCodecContext()->sample_fmt );`
	`21`	`+ _codec = codec;`
	`22`	`+`
	`23`	`+ _frameDesc.setSampleRate( _codec.getAVCodecContext()->sample_rate );`
	`24`	`+ _frameDesc.setChannels( _codec.getAVCodecContext()->channels );`
	`25`	`+ _frameDesc.setSampleFormat( _codec.getAVCodecContext()->sample_fmt );`
`26`	`26`	`}`
`27`	`27`
`28`		`-AudioCodec GeneratorAudio::getAudioCodec() const`
	`28`	`+AudioCodec& GeneratorAudio::getAudioCodec()`
`29`	`29`	`{`
`30`		`- return _audioDesc;`
	`30`	`+ return _codec;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`void GeneratorAudio::setFrame( Frame& inputFrame )`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ void Transcoder::addDummyStream( const Profile::ProfileDesc& profile, const ICod`
`405`	`405`	`if( _verbose )`
`406`	`406`	`std::cout << "add a generated audio stream" << std::endl;`
`407`	`407`	`_generatorAudio.push_back( new GeneratorAudio() );`
`408`		`- _generatorAudio.back()->setAudioDesc( static_cast<AudioCodec>( codec ) );`
	`408`	`+ _generatorAudio.back()->setAudioCodec( static_cast<AudioCodec>( codec ) );`
`409`	`409`
`410`	`410`	`_streamTranscoders.push_back( new StreamTranscoder( *_generatorAudio.back(), _outputFile, profile ) );`
`411`	`411`	`}`