Video/AudioProperties: fix getFps

Clement Champetier · Clement Champetier · commit 8452145e22e5 · 2015-01-19T19:43:05.000+01:00
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -185,7 +185,7 @@ Rational AudioProperties::getTimeBase() const
 double AudioProperties::getFps() const
 {
 	Rational timeBase = getTimeBase();
-	double fps = 1.0 * timeBase.den / ( timeBase.num * getTicksPerFrame() );
+	double fps = timeBase.den / (double) timeBase.num;
 	if( isinf( fps ) )
 		fps = 0.0;
 	return fps;
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -471,7 +471,7 @@ int VideoProperties::getLevel() const
 double VideoProperties::getFps() const
 {
 	Rational timeBase = getTimeBase();
-	double fps = 1.0 * timeBase.den / ( timeBase.num * getTicksPerFrame() );
+	double fps = timeBase.den / (double) timeBase.num;
 	if( isinf( fps ) )
 		fps = 0.0;
 	return fps;

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ Rational AudioProperties::getTimeBase() const`
`185`	`185`	`double AudioProperties::getFps() const`
`186`	`186`	`{`
`187`	`187`	`Rational timeBase = getTimeBase();`
`188`		`- double fps = 1.0 * timeBase.den / ( timeBase.num * getTicksPerFrame() );`
	`188`	`+ double fps = timeBase.den / (double) timeBase.num;`
`189`	`189`	`if( isinf( fps ) )`
`190`	`190`	`fps = 0.0;`
`191`	`191`	`return fps;`
Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ int VideoProperties::getLevel() const`
`471`	`471`	`double VideoProperties::getFps() const`
`472`	`472`	`{`
`473`	`473`	`Rational timeBase = getTimeBase();`
`474`		`- double fps = 1.0 * timeBase.den / ( timeBase.num * getTicksPerFrame() );`
	`474`	`+ double fps = timeBase.den / (double) timeBase.num;`
`475`	`475`	`if( isinf( fps ) )`
`476`	`476`	`fps = 0.0;`
`477`	`477`	`return fps;`