hotfix: set fps to 25 for AudioGenerator

Clement Champetier · Clement Champetier · commit 8a224d040ae3 · 2015-02-04T17:18:18.000+01:00
diff --git a/src/AvTranscoder/codec/AudioCodec.cpp b/src/AvTranscoder/codec/AudioCodec.cpp
@@ -25,9 +25,6 @@ AudioFrameDesc AudioCodec::getAudioFrameDesc() const
 {
 	assert( _avCodecContext != NULL );
 	AudioFrameDesc audioFrameDesc( _avCodecContext->sample_rate, _avCodecContext->channels, _avCodecContext->sample_fmt );
-	double fps = 1.0 * _avCodecContext->time_base.den / ( _avCodecContext->time_base.num * _avCodecContext->ticks_per_frame );
-	if( ! std::isinf( fps ) )
-		audioFrameDesc.setFps( fps );
 	return audioFrameDesc;
 }
 
@@ -36,9 +33,6 @@ void AudioCodec::setAudioParameters( const AudioFrameDesc& audioFrameDesc )
 	_avCodecContext->sample_rate = audioFrameDesc.getSampleRate();
 	_avCodecContext->channels = audioFrameDesc.getChannels();
 	_avCodecContext->sample_fmt = audioFrameDesc.getSampleFormat();
-	_avCodecContext->time_base.num = 1;
-	_avCodecContext->time_base.den = audioFrameDesc.getFps();
-	_avCodecContext->ticks_per_frame = 1;
 }
 
 }
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -20,6 +20,7 @@ AudioGenerator::~AudioGenerator()
 void AudioGenerator::setAudioFrameDesc( const AudioFrameDesc& frameDesc )
 {
 	_frameDesc = frameDesc;
+	_frameDesc.setFps( 25. );
 }
 
 void AudioGenerator::setFrame( Frame& inputFrame )
diff --git a/src/AvTranscoder/frame/AudioFrame.hpp b/src/AvTranscoder/frame/AudioFrame.hpp
@@ -17,23 +17,18 @@ namespace avtranscoder
 class AvExport AudioFrameDesc
 {
 public:
-	/**
-	 * @warning FPS value is set to 25 by default
-	 */
 	AudioFrameDesc( const size_t sampleRate = 0, const size_t channels = 0, const AVSampleFormat sampleFormat = AV_SAMPLE_FMT_NONE )
 		: _sampleRate( sampleRate )
 		, _channels( channels )
 		, _sampleFormat( sampleFormat )
-		, _fps( 25. )
+		, _fps( 1. )
 	{}
-	/**
-	 * @warning FPS value is set to 25 by default
-	 */
+
 	AudioFrameDesc( const size_t sampleRate, const size_t channels, const std::string& sampleFormat )
 		: _sampleRate( sampleRate )
 		, _channels( channels )
 		, _sampleFormat( av_get_sample_fmt( sampleFormat.c_str() ) )
-		, _fps( 25. )
+		, _fps( 1. )
 	{}
 
 	size_t getSampleRate() const { return _sampleRate; }
@@ -51,7 +46,7 @@ class AvExport AudioFrameDesc
 		if( _sampleFormat == AV_SAMPLE_FMT_NONE )
 			throw std::runtime_error( "incorrect sample format" );
 
-		size_t size = _sampleRate * _channels * av_get_bytes_per_sample( _sampleFormat );
+		size_t size = ( _sampleRate / _fps ) * _channels * av_get_bytes_per_sample( _sampleFormat );
 		if( size == 0 )
 			throw std::runtime_error( "unable to determine audio buffer size" );
 

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,6 @@ AudioFrameDesc AudioCodec::getAudioFrameDesc() const`
`25`	`25`	`{`
`26`	`26`	`assert( _avCodecContext != NULL );`
`27`	`27`	`AudioFrameDesc audioFrameDesc( _avCodecContext->sample_rate, _avCodecContext->channels, _avCodecContext->sample_fmt );`
`28`		`- double fps = 1.0 * _avCodecContext->time_base.den / ( _avCodecContext->time_base.num * _avCodecContext->ticks_per_frame );`
`29`		`- if( ! std::isinf( fps ) )`
`30`		`- audioFrameDesc.setFps( fps );`
`31`	`28`	`return audioFrameDesc;`
`32`	`29`	`}`
`33`	`30`
`@@ -36,9 +33,6 @@ void AudioCodec::setAudioParameters( const AudioFrameDesc& audioFrameDesc )`
`36`	`33`	`_avCodecContext->sample_rate = audioFrameDesc.getSampleRate();`
`37`	`34`	`_avCodecContext->channels = audioFrameDesc.getChannels();`
`38`	`35`	`_avCodecContext->sample_fmt = audioFrameDesc.getSampleFormat();`
`39`		`- _avCodecContext->time_base.num = 1;`
`40`		`- _avCodecContext->time_base.den = audioFrameDesc.getFps();`
`41`		`- _avCodecContext->ticks_per_frame = 1;`
`42`	`36`	`}`
`43`	`37`
`44`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ AudioGenerator::~AudioGenerator()`
`20`	`20`	`void AudioGenerator::setAudioFrameDesc( const AudioFrameDesc& frameDesc )`
`21`	`21`	`{`
`22`	`22`	`_frameDesc = frameDesc;`
	`23`	`+ _frameDesc.setFps( 25. );`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`void AudioGenerator::setFrame( Frame& inputFrame )`