common: add typedef of AVRational to Rational

cchampet · cchampet · commit 68e08e996a9a · 2014-10-12T14:19:27.000+02:00
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -53,6 +53,8 @@ namespace avtranscoder
 
 #define MAX_SWS_PLANE 4
 
+typedef AVRational Rational;
+
 void AvExport split( std::vector< std::string >& splitedString, const std::string& inputString, const std::string& splitChars = ";" );
 int AvExport getFilesInDir( const std::string& dir, std::vector< std::string >& files );
 
diff --git a/src/AvTranscoder/frame/VideoFrame.hpp b/src/AvTranscoder/frame/VideoFrame.hpp
@@ -42,7 +42,7 @@ class AvExport VideoFrameDesc
 	void setHeight( const size_t height    ) { _height = height; }
 	void setPixel ( const Pixel  pixel     ) { _pixel = pixel; }
 	void setDar( const size_t num, const size_t den ) { _displayAspectRatio.num = num; _displayAspectRatio.den = den; }
-	void setDar( const AVRational ratio ) { _displayAspectRatio = ratio; }
+	void setDar( const Rational ratio ) { _displayAspectRatio = ratio; }
 	
 	void setParameters( const Profile::ProfileDesc& desc )
 	{
@@ -52,7 +52,7 @@ class AvExport VideoFrameDesc
 
 	size_t               getWidth ()    const { return _width;  }
 	size_t               getHeight()    const { return _height; }
-	AVRational getDar() const { return _displayAspectRatio; }
+	Rational getDar() const { return _displayAspectRatio; }
 	int getDarNum() const { return _displayAspectRatio.num; }
 	int getDarDen() const { return _displayAspectRatio.den; }
 	Pixel                getPixelDesc() const { return _pixel; }
@@ -75,7 +75,7 @@ class AvExport VideoFrameDesc
 private:
 	size_t          _width;
 	size_t          _height;
-	AVRational      _displayAspectRatio;
+	Rational      _displayAspectRatio;
 	Pixel           _pixel;
 	// ColorProperties _color;
 
diff --git a/src/AvTranscoder/mediaProperty/mediaProperty.hpp b/src/AvTranscoder/mediaProperty/mediaProperty.hpp
@@ -62,9 +62,9 @@ struct AvExport VideoProperties
 	
 	std::string startTimecode;
 
-	AVRational timeBase;
-	AVRational sar; // sample/pixel aspect ratio
-	AVRational dar; // display aspect ratio
+	Rational timeBase;
+	Rational sar; // sample/pixel aspect ratio
+	Rational dar; // display aspect ratio
 	
 	size_t      streamId;
 	size_t      codecId;
diff --git a/src/AvTranscoder/option/Option.cpp b/src/AvTranscoder/option/Option.cpp
@@ -142,7 +142,7 @@ void Option::setValueInt( const int value )
 
 void Option::setValueRatio( const int num, const int den )
 {
-	AVRational ratio;
+	Rational ratio;
 	ratio.num = num;
 	ratio.den = den;
 	int error = av_opt_set_q( _avContext, getName().c_str(), ratio, AV_OPT_SEARCH_CHILDREN );

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ void Option::setValueInt( const int value )`
`142`	`142`
`143`	`143`	`void Option::setValueRatio( const int num, const int den )`
`144`	`144`	`{`
`145`		`- AVRational ratio;`
	`145`	`+ Rational ratio;`
`146`	`146`	`ratio.num = num;`
`147`	`147`	`ratio.den = den;`
`148`	`148`	`int error = av_opt_set_q( _avContext, getName().c_str(), ratio, AV_OPT_SEARCH_CHILDREN );`