Video profiles do not need inevitably the frame rate

Clement Champetier · Clement Champetier · commit b962588f19b8 · 2015-01-13T18:54:41.000+01:00
* Keep the frame rate of the input.
* Add fps attribute in VideoFrameDesc.
diff --git a/src/AvTranscoder/ProfileLoader.cpp b/src/AvTranscoder/ProfileLoader.cpp
@@ -187,8 +187,7 @@ bool ProfileLoader::checkVideoProfile( const Profile& profileToCheck )
 	if( ! profileToCheck.count( constants::avProfileIdentificator ) ||
 		! profileToCheck.count( constants::avProfileIdentificatorHuman ) ||
 		! profileToCheck.count( constants::avProfileType ) ||
-		! profileToCheck.count( constants::avProfileCodec ) ||
-		! profileToCheck.count( constants::avProfileFrameRate ) )
+		! profileToCheck.count( constants::avProfileCodec ) )
 	{
 		isValid = false;
 	}
diff --git a/src/AvTranscoder/codec/VideoCodec.cpp b/src/AvTranscoder/codec/VideoCodec.cpp
@@ -24,30 +24,20 @@ VideoFrameDesc VideoCodec::getVideoFrameDesc() const
 {
 	assert( _avCodecContext != NULL );
 	VideoFrameDesc videoFrameDesc( _avCodecContext->width, _avCodecContext->height, _avCodecContext->pix_fmt );
+	double fps = 1.0 * _avCodecContext->time_base.den / ( _avCodecContext->time_base.num * _avCodecContext->ticks_per_frame );
+	if( ! isinf( fps ) )
+		videoFrameDesc.setFps( fps );
 	return videoFrameDesc;
 }
 
-std::pair< size_t, size_t > VideoCodec::getTimeBase() const
-{
-	assert( _avCodecContext != NULL );
-	std::pair< size_t, size_t > timeBase;
-	timeBase.first = _avCodecContext->time_base.num;
-	timeBase.second = _avCodecContext->time_base.den;
-	return timeBase;
-}
-
 void VideoCodec::setImageParameters( const VideoFrameDesc& videoFrameDesc )
 {
 	_avCodecContext->width = videoFrameDesc.getWidth();
 	_avCodecContext->height = videoFrameDesc.getHeight();
 	_avCodecContext->pix_fmt = videoFrameDesc.getPixelFormat();
-}
-
-void VideoCodec::setTimeBase( const size_t num, const size_t den, const size_t ticksPerFrame )
-{
-	_avCodecContext->time_base.num = num;
-	_avCodecContext->time_base.den = den;
-	_avCodecContext->ticks_per_frame = ticksPerFrame;
+	_avCodecContext->time_base.num = 1;
+	_avCodecContext->time_base.den = videoFrameDesc.getFps();
+	_avCodecContext->ticks_per_frame = 1;
 }
 
 }
diff --git a/src/AvTranscoder/codec/VideoCodec.hpp b/src/AvTranscoder/codec/VideoCodec.hpp
@@ -4,8 +4,6 @@
 #include "ICodec.hpp"
 #include <AvTranscoder/frame/VideoFrame.hpp>
 
-#include <utility>
-
 namespace avtranscoder
 {
 
@@ -15,13 +13,10 @@ class AvExport VideoCodec : public ICodec
 	VideoCodec( const ECodecType type, const std::string& codecName = "" );
 	VideoCodec( const ECodecType type, const AVCodecID codecId );
 	VideoCodec( const ECodecType type, AVCodecContext& avCodecContext );
-	
+
 	VideoFrameDesc getVideoFrameDesc() const;
-	std::pair< size_t, size_t > getTimeBase() const;
-	
-	void setImageParameters( const VideoFrameDesc& videoFrameDesc );
 
-	void setTimeBase( const size_t num, const size_t den, const size_t ticksPerFrame = 1 );
+	void setImageParameters( const VideoFrameDesc& videoFrameDesc );
 };
 
 }
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -130,11 +130,10 @@ bool VideoEncoder::encodeFrame( Frame& codedFrame )
 
 void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtranscoder::VideoFrameDesc& frameDesc )
 {
-	const size_t frameRate = std::strtoul( profile.find( constants::avProfileFrameRate )->second.c_str(), NULL, 0 );
-	_codec.setTimeBase( 1, frameRate );
-
+	// set width, height, pixel format, fps
 	_codec.setImageParameters( frameDesc );
-	
+
+	// set encoder options
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
 	{
 		if( (*it).first == constants::avProfileIdentificator ||
diff --git a/src/AvTranscoder/frame/VideoFrame.hpp b/src/AvTranscoder/frame/VideoFrame.hpp
@@ -5,12 +5,12 @@
 #include <AvTranscoder/ProfileLoader.hpp>
 
 extern "C" {
-#include <libavutil/rational.h>
 #include <libavutil/pixfmt.h>
 #include <libavutil/pixdesc.h>
 }
 
 #include <stdexcept>
+#include <stdlib.h>
 
 namespace avtranscoder
 {
@@ -22,12 +22,14 @@ class AvExport VideoFrameDesc
 		: _width( width )
 		, _height( height )
 		, _pixelFormat( pixelFormat )
+		, _fps( 1.0 )
 	{
 	}
 	VideoFrameDesc( const size_t width, const size_t height, const std::string& pixelFormat )
 		: _width( width )
 		, _height( height )
 		, _pixelFormat( av_get_pix_fmt( pixelFormat.c_str() ) )
+		, _fps( 1.0 )
 	{
 	}
 
@@ -39,6 +41,7 @@ class AvExport VideoFrameDesc
 	    const char* formatName = av_get_pix_fmt_name( _pixelFormat );
 	    return formatName ? std::string( formatName ) : "unknown pixel format";
 	}
+	double getFps() const { return _fps; }
 
 	size_t getDataSize() const
 	{
@@ -56,17 +59,23 @@ class AvExport VideoFrameDesc
 	void setHeight( const size_t height ) { _height = height; }
 	void setPixelFormat( const std::string& pixelFormat ) { _pixelFormat = av_get_pix_fmt( pixelFormat.c_str() ); }
 	void setPixelFormat( const AVPixelFormat pixelFormat ) { _pixelFormat = pixelFormat; }
+	void setFps( const double fps ) { _fps = fps; }
 
 	void setParameters( const ProfileLoader::Profile& profile )
 	{
-		if( profile.find( constants::avProfilePixelFormat ) != profile.end() )
+		// pixel format	
+		if( profile.count( constants::avProfilePixelFormat ) )
 			setPixelFormat( profile.find( constants::avProfilePixelFormat )->second );
+		// fps
+		if( profile.count( constants::avProfileFrameRate ) )
+			setFps( atof( profile.find( constants::avProfileFrameRate )->second.c_str() ) );
 	}
 
 private:
 	size_t _width;
 	size_t _height;
 	AVPixelFormat _pixelFormat;
+	double _fps;
 };
 
 //template< template<typename> Alloc >

Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,7 @@ bool ProfileLoader::checkVideoProfile( const Profile& profileToCheck )`
`187`	`187`	`if( ! profileToCheck.count( constants::avProfileIdentificator ) \|\|`
`188`	`188`	`! profileToCheck.count( constants::avProfileIdentificatorHuman ) \|\|`
`189`	`189`	`! profileToCheck.count( constants::avProfileType ) \|\|`
`190`		`- ! profileToCheck.count( constants::avProfileCodec ) \|\|`
`191`		`- ! profileToCheck.count( constants::avProfileFrameRate ) )`
	`190`	`+ ! profileToCheck.count( constants::avProfileCodec ) )`
`192`	`191`	`{`
`193`	`192`	`isValid = false;`
`194`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,11 +130,10 @@ bool VideoEncoder::encodeFrame( Frame& codedFrame )`
`130`	`130`
`131`	`131`	`void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtranscoder::VideoFrameDesc& frameDesc )`
`132`	`132`	`{`
`133`		`- const size_t frameRate = std::strtoul( profile.find( constants::avProfileFrameRate )->second.c_str(), NULL, 0 );`
`134`		`- _codec.setTimeBase( 1, frameRate );`
`135`		`-`
	`133`	`+ // set width, height, pixel format, fps`
`136`	`134`	`_codec.setImageParameters( frameDesc );`
`137`		`-`
	`135`	`+`
	`136`	`+ // set encoder options`
`138`	`137`	`for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )`
`139`	`138`	`{`
`140`	`139`	`if( (*it).first == constants::avProfileIdentificator \|\|`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@`
`5`	`5`	`#include <AvTranscoder/ProfileLoader.hpp>`
`6`	`6`
`7`	`7`	`extern "C" {`
`8`		`-#include <libavutil/rational.h>`
`9`	`8`	`#include <libavutil/pixfmt.h>`
`10`	`9`	`#include <libavutil/pixdesc.h>`
`11`	`10`	`}`
`12`	`11`
`13`	`12`	`#include <stdexcept>`
	`13`	`+#include <stdlib.h>`
`14`	`14`
`15`	`15`	`namespace avtranscoder`
`16`	`16`	`{`
`@@ -22,12 +22,14 @@ class AvExport VideoFrameDesc`
`22`	`22`	`: _width( width )`
`23`	`23`	`, _height( height )`
`24`	`24`	`, _pixelFormat( pixelFormat )`
	`25`	`+ , _fps( 1.0 )`
`25`	`26`	`{`
`26`	`27`	`}`
`27`	`28`	`VideoFrameDesc( const size_t width, const size_t height, const std::string& pixelFormat )`
`28`	`29`	`: _width( width )`
`29`	`30`	`, _height( height )`
`30`	`31`	`, _pixelFormat( av_get_pix_fmt( pixelFormat.c_str() ) )`
	`32`	`+ , _fps( 1.0 )`
`31`	`33`	`{`
`32`	`34`	`}`
`33`	`35`
`@@ -39,6 +41,7 @@ class AvExport VideoFrameDesc`
`39`	`41`	`const char* formatName = av_get_pix_fmt_name( _pixelFormat );`
`40`	`42`	`return formatName ? std::string( formatName ) : "unknown pixel format";`
`41`	`43`	`}`
	`44`	`+ double getFps() const { return _fps; }`
`42`	`45`
`43`	`46`	`size_t getDataSize() const`
`44`	`47`	`{`
`@@ -56,17 +59,23 @@ class AvExport VideoFrameDesc`
`56`	`59`	`void setHeight( const size_t height ) { _height = height; }`
`57`	`60`	`void setPixelFormat( const std::string& pixelFormat ) { _pixelFormat = av_get_pix_fmt( pixelFormat.c_str() ); }`
`58`	`61`	`void setPixelFormat( const AVPixelFormat pixelFormat ) { _pixelFormat = pixelFormat; }`
	`62`	`+ void setFps( const double fps ) { _fps = fps; }`
`59`	`63`
`60`	`64`	`void setParameters( const ProfileLoader::Profile& profile )`
`61`	`65`	`{`
`62`		`- if( profile.find( constants::avProfilePixelFormat ) != profile.end() )`
	`66`	`+ // pixel format`
	`67`	`+ if( profile.count( constants::avProfilePixelFormat ) )`
`63`	`68`	`setPixelFormat( profile.find( constants::avProfilePixelFormat )->second );`
	`69`	`+ // fps`
	`70`	`+ if( profile.count( constants::avProfileFrameRate ) )`
	`71`	`+ setFps( atof( profile.find( constants::avProfileFrameRate )->second.c_str() ) );`
`64`	`72`	`}`
`65`	`73`
`66`	`74`	`private:`
`67`	`75`	`size_t _width;`
`68`	`76`	`size_t _height;`
`69`	`77`	`AVPixelFormat _pixelFormat;`
	`78`	`+ double _fps;`
`70`	`79`	`};`
`71`	`80`
`72`	`81`	`//template< template<typename> Alloc >`