AudioCodec: remove setAudioParameters from sampleRate, channels, and sampleFormat

Clement Champetier · Clement Champetier · commit dc660b61afb6 · 2015-01-13T18:28:58.000+01:00
Only one way so set the video codec: from an audioFrameDesc.
diff --git a/src/AvTranscoder/codec/AudioCodec.cpp b/src/AvTranscoder/codec/AudioCodec.cpp
@@ -30,14 +30,9 @@ AudioFrameDesc AudioCodec::getAudioFrameDesc() const
 
 void AudioCodec::setAudioParameters( const AudioFrameDesc& audioFrameDesc )
 {
-	setAudioParameters( audioFrameDesc.getSampleRate(), audioFrameDesc.getChannels(), audioFrameDesc.getSampleFormat() );
-}
-
-void AudioCodec::setAudioParameters( const size_t sampleRate, const size_t channels, const AVSampleFormat sampleFormat )
-{
-	_avCodecContext->sample_rate = sampleRate;
-	_avCodecContext->channels = channels;
-	_avCodecContext->sample_fmt = sampleFormat;
+	_avCodecContext->sample_rate = audioFrameDesc.getSampleRate();
+	_avCodecContext->channels = audioFrameDesc.getChannels();
+	_avCodecContext->sample_fmt = audioFrameDesc.getSampleFormat();
 }
 
 }
diff --git a/src/AvTranscoder/codec/AudioCodec.hpp b/src/AvTranscoder/codec/AudioCodec.hpp
@@ -17,7 +17,6 @@ class AvExport AudioCodec : public ICodec
 	AudioFrameDesc getAudioFrameDesc() const;
 
 	void setAudioParameters( const AudioFrameDesc& audioFrameDesc );
-	void setAudioParameters( const size_t sampleRate, const size_t channels, const AVSampleFormat sampleFormat );
 };
 
 }

Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,9 @@ AudioFrameDesc AudioCodec::getAudioFrameDesc() const`
`30`	`30`
`31`	`31`	`void AudioCodec::setAudioParameters( const AudioFrameDesc& audioFrameDesc )`
`32`	`32`	`{`
`33`		`- setAudioParameters( audioFrameDesc.getSampleRate(), audioFrameDesc.getChannels(), audioFrameDesc.getSampleFormat() );`
`34`		`-}`
`35`		`-`
`36`		`-void AudioCodec::setAudioParameters( const size_t sampleRate, const size_t channels, const AVSampleFormat sampleFormat )`
`37`		`-{`
`38`		`- _avCodecContext->sample_rate = sampleRate;`
`39`		`- _avCodecContext->channels = channels;`
`40`		`- _avCodecContext->sample_fmt = sampleFormat;`
	`33`	`+ _avCodecContext->sample_rate = audioFrameDesc.getSampleRate();`
	`34`	`+ _avCodecContext->channels = audioFrameDesc.getChannels();`
	`35`	`+ _avCodecContext->sample_fmt = audioFrameDesc.getSampleFormat();`
`41`	`36`	`}`
`42`	`37`
`43`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ class AvExport AudioCodec : public ICodec`
`17`	`17`	`AudioFrameDesc getAudioFrameDesc() const;`
`18`	`18`
`19`	`19`	`void setAudioParameters( const AudioFrameDesc& audioFrameDesc );`
`20`		`- void setAudioParameters( const size_t sampleRate, const size_t channels, const AVSampleFormat sampleFormat );`
`21`	`20`	`};`
`22`	`21`
`23`	`22`	`}`