AudioFrameDesc: add fps attribute

Clement Champetier · Clement Champetier · commit 8c2c666722c3 · 2015-01-14T17:54:07.000+01:00
* AudioFrameDesc is the description of a number of samples, which
corresponds to one video frame.
* By default at 25 fps.
diff --git a/src/AvTranscoder/codec/AudioCodec.cpp b/src/AvTranscoder/codec/AudioCodec.cpp
@@ -24,7 +24,9 @@ AudioFrameDesc AudioCodec::getAudioFrameDesc() const
 {
 	assert( _avCodecContext != NULL );
 	AudioFrameDesc audioFrameDesc( _avCodecContext->sample_rate, _avCodecContext->channels, _avCodecContext->sample_fmt );
-	// audioFrameDesc.setFps( 25 );
+	double fps = 1.0 * _avCodecContext->time_base.den / ( _avCodecContext->time_base.num * _avCodecContext->ticks_per_frame );
+	if( ! isinf( fps ) )
+		audioFrameDesc.setFps( fps );
 	return audioFrameDesc;
 }
 
@@ -33,6 +35,9 @@ 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
@@ -24,7 +24,7 @@ bool AudioGenerator::decodeNextFrame( Frame& frameBuffer )
 	if( ! _inputFrame )
 	{
 		AudioFrame& audioFrameBuffer = static_cast<AudioFrame&>( frameBuffer );
-		audioFrameBuffer.setNbSamples( 1.0 * _frameDesc.getSampleRate() / 25. );
+		audioFrameBuffer.setNbSamples( 1.0 * _frameDesc.getSampleRate() / _frameDesc.getFps() );
 
 		//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
@@ -13,18 +13,21 @@ extern "C" {
 namespace avtranscoder
 {
 
+/// @brief Description of a number of samples, which corresponds to one video frame
 class AvExport AudioFrameDesc
 {
 public:
 	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. )
 	{}
 	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. )
 	{}
 
 	size_t getSampleRate() const { return _sampleRate; }
@@ -35,6 +38,7 @@ class AvExport AudioFrameDesc
 		const char* formatName = av_get_sample_fmt_name( _sampleFormat );
 		return formatName ? std::string( formatName ) : "unknown sample format";
 	}
+	double getFps() const { return _fps; }
 
 	size_t getDataSize() const
 	{
@@ -52,6 +56,7 @@ class AvExport AudioFrameDesc
 	void setChannels( const size_t channels ) { _channels = channels; }
 	void setSampleFormat( const std::string& sampleFormatName ) { _sampleFormat = av_get_sample_fmt( sampleFormatName.c_str() ); }
 	void setSampleFormat( const AVSampleFormat sampleFormat ) { _sampleFormat = sampleFormat; }
+	void setFps( const double fps ) { _fps = fps; }
 	
 	void setParameters( const ProfileLoader::Profile& profile )
 	{
@@ -63,6 +68,7 @@ class AvExport AudioFrameDesc
 	size_t _sampleRate;
 	size_t _channels;
 	AVSampleFormat _sampleFormat;
+	double _fps;
 };
 
 class AvExport AudioFrame : public Frame

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,9 @@ AudioFrameDesc AudioCodec::getAudioFrameDesc() const`
`24`	`24`	`{`
`25`	`25`	`assert( _avCodecContext != NULL );`
`26`	`26`	`AudioFrameDesc audioFrameDesc( _avCodecContext->sample_rate, _avCodecContext->channels, _avCodecContext->sample_fmt );`
`27`		`- // audioFrameDesc.setFps( 25 );`
	`27`	`+ double fps = 1.0 * _avCodecContext->time_base.den / ( _avCodecContext->time_base.num * _avCodecContext->ticks_per_frame );`
	`28`	`+ if( ! isinf( fps ) )`
	`29`	`+ audioFrameDesc.setFps( fps );`
`28`	`30`	`return audioFrameDesc;`
`29`	`31`	`}`
`30`	`32`
`@@ -33,6 +35,9 @@ void AudioCodec::setAudioParameters( const AudioFrameDesc& audioFrameDesc )`
`33`	`35`	`_avCodecContext->sample_rate = audioFrameDesc.getSampleRate();`
`34`	`36`	`_avCodecContext->channels = audioFrameDesc.getChannels();`
`35`	`37`	`_avCodecContext->sample_fmt = audioFrameDesc.getSampleFormat();`
	`38`	`+ _avCodecContext->time_base.num = 1;`
	`39`	`+ _avCodecContext->time_base.den = audioFrameDesc.getFps();`
	`40`	`+ _avCodecContext->ticks_per_frame = 1;`
`36`	`41`	`}`
`37`	`42`
`38`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ bool AudioGenerator::decodeNextFrame( Frame& frameBuffer )`
`24`	`24`	`if( ! _inputFrame )`
`25`	`25`	`{`
`26`	`26`	`AudioFrame& audioFrameBuffer = static_cast<AudioFrame&>( frameBuffer );`
`27`		`- audioFrameBuffer.setNbSamples( 1.0 * _frameDesc.getSampleRate() / 25. );`
	`27`	`+ audioFrameBuffer.setNbSamples( 1.0 * _frameDesc.getSampleRate() / _frameDesc.getFps() );`
`28`	`28`
`29`	`29`	`//av_samples_set_silence( data.getPtr(), offset, nb_samples, nb_channels, sample_fmt );`
`30`	`30`	`int fill_char = (`