AudioFrameDesc: remove fps attribute

Clement Champetier · Clement Champetier · commit 6f87bdfe5242 · 2015-01-13T19:00:17.000+01:00
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -12,7 +12,6 @@ AudioGenerator::AudioGenerator()
 void AudioGenerator::setAudioFrameDesc( const AudioFrameDesc& frameDesc )
 {
 	_frameDesc = frameDesc;
-	_frameDesc.setFps( 25. );
 }
 
 void AudioGenerator::setFrame( Frame& inputFrame )
@@ -25,7 +24,7 @@ bool AudioGenerator::decodeNextFrame( Frame& frameBuffer )
 	if( ! _inputFrame )
 	{
 		AudioFrame& audioFrameBuffer = static_cast<AudioFrame&>( frameBuffer );
-		audioFrameBuffer.setNbSamples( 1.0 * _frameDesc.getSampleRate() / _frameDesc.getFps() );
+		audioFrameBuffer.setNbSamples( 1.0 * _frameDesc.getSampleRate() / 25. );
 
 		//av_samples_set_silence( data.getPtr(), offset, nb_samples, nb_channels, sample_fmt );
 		int fill_char = (
diff --git a/src/AvTranscoder/frame/AudioFrame.hpp b/src/AvTranscoder/frame/AudioFrame.hpp
@@ -19,19 +19,16 @@ class AvExport AudioFrameDesc
 	AudioFrameDesc( const size_t sampleRate = 0, const size_t channels = 0, const AVSampleFormat sampleFormat = AV_SAMPLE_FMT_NONE )
 		: _sampleRate( sampleRate )
 		, _channels( channels )
-		, _fps( 1.0 )
 		, _sampleFormat( sampleFormat )
 	{}
 	AudioFrameDesc( const size_t sampleRate, const size_t channels, const std::string& sampleFormat )
 		: _sampleRate( sampleRate )
 		, _channels( channels )
-		, _fps( 1.0 )
 		, _sampleFormat( av_get_sample_fmt( sampleFormat.c_str() ) )
 	{}
 
 	size_t getSampleRate() const { return _sampleRate; }
 	size_t getChannels() const { return _channels; }
-	double getFps() const { return _fps; }
 	AVSampleFormat getSampleFormat() const { return _sampleFormat; }
 	std::string getSampleFormatName() const
 	{
@@ -44,7 +41,7 @@ class AvExport AudioFrameDesc
 		if( _sampleFormat == AV_SAMPLE_FMT_NONE )
 			throw std::runtime_error( "incorrect sample format" );
 
-		size_t size = ( _sampleRate / _fps ) * _channels * av_get_bytes_per_sample( _sampleFormat );
+		size_t size = _sampleRate * _channels * av_get_bytes_per_sample( _sampleFormat );
 		if( size == 0 )
 			throw std::runtime_error( "unable to determine audio buffer size" );
 
@@ -53,7 +50,6 @@ class AvExport AudioFrameDesc
 	
 	void setSampleRate( const size_t sampleRate ) { _sampleRate = sampleRate; }
 	void setChannels( const size_t channels ) { _channels = channels; }
-	void setFps( const double fps ) { _fps = fps; }
 	void setSampleFormat( const std::string& sampleFormatName ) { _sampleFormat = av_get_sample_fmt( sampleFormatName.c_str() ); }
 	void setSampleFormat( const AVSampleFormat sampleFormat ) { _sampleFormat = sampleFormat; }
 	
@@ -66,8 +62,6 @@ class AvExport AudioFrameDesc
 private:
 	size_t _sampleRate;
 	size_t _channels;
-	double _fps;
-
 	AVSampleFormat _sampleFormat;
 };
 
diff --git a/test/pyTest/testTranscoderDummy.py b/test/pyTest/testTranscoderDummy.py
@@ -80,10 +80,8 @@ def testTranscodeDummyAudio():
 	transcoder = av.Transcoder( ouputFile )
 
 	# add a dummy video stream
-	audioDesc = av.AudioFrameDesc( 48000, 1, "s16" )
-	audioDesc.setFps( 25 )
-
 	audioCodec = av.AudioCodec( av.eCodecTypeEncoder, "pcm_s16le" )
+	audioDesc = av.AudioFrameDesc( 48000, 1, "s16" )
 	audioCodec.setAudioParameters( audioDesc )
 	transcoder.add( "", 0, "wave24b48kmono", audioCodec )
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ AudioGenerator::AudioGenerator()`
`12`	`12`	`void AudioGenerator::setAudioFrameDesc( const AudioFrameDesc& frameDesc )`
`13`	`13`	`{`
`14`	`14`	`_frameDesc = frameDesc;`
`15`		`- _frameDesc.setFps( 25. );`
`16`	`15`	`}`
`17`	`16`
`18`	`17`	`void AudioGenerator::setFrame( Frame& inputFrame )`
`@@ -25,7 +24,7 @@ bool AudioGenerator::decodeNextFrame( Frame& frameBuffer )`
`25`	`24`	`if( ! _inputFrame )`
`26`	`25`	`{`
`27`	`26`	`AudioFrame& audioFrameBuffer = static_cast<AudioFrame&>( frameBuffer );`
`28`		`- audioFrameBuffer.setNbSamples( 1.0 * _frameDesc.getSampleRate() / _frameDesc.getFps() );`
	`27`	`+ audioFrameBuffer.setNbSamples( 1.0 * _frameDesc.getSampleRate() / 25. );`
`29`	`28`
`30`	`29`	`//av_samples_set_silence( data.getPtr(), offset, nb_samples, nb_channels, sample_fmt );`
`31`	`30`	`int fill_char = (`