Merge pull request #76 from cchampet/fix_Properties_getFps

valnoel · valnoel · commit aaa66efe6702 · 2015-02-05T13:36:31.000+01:00
Fix getFps of properties
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -189,15 +189,6 @@ Rational AudioProperties::getTimeBase() const
 	return timeBase;
 }
 
-double AudioProperties::getFps() const
-{
-	Rational timeBase = getTimeBase();
-	double fps = timeBase.den / (double) timeBase.num;
-	if( isinf( fps ) )
-		fps = 0.0;
-	return fps;
-}
-
 double AudioProperties::getDuration() const
 {
 	Rational timeBase = getTimeBase();
@@ -224,7 +215,6 @@ PropertiesMap AudioProperties::getPropertiesAsMap() const
 	detail::add( dataMap, "channelDescription", getChannelDescription() );
 	detail::add( dataMap, "ticksPerFrame", getTicksPerFrame() );
 	detail::add( dataMap, "timeBase", getTimeBase() );
-	detail::add( dataMap, "fps", getFps() );
 	detail::add( dataMap, "duration", getDuration() );
 
 	for( size_t metadataIndex = 0; metadataIndex < _metadatas.size(); ++metadataIndex )
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp
@@ -35,7 +35,6 @@ class AvExport AudioProperties
 
 	size_t getTicksPerFrame() const;
 	Rational getTimeBase() const;
-	double getFps() const;  ///< Corresponds to the number of audio samples for one video frame
 	double getDuration() const;
 
 	PropertiesMap& getMetadatas() { return _metadatas; }
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -478,11 +478,7 @@ int VideoProperties::getLevel() const
 
 double VideoProperties::getFps() const
 {
-	Rational timeBase = getTimeBase();
-	double fps = timeBase.den / (double) timeBase.num;
-	if( isinf( fps ) )
-		fps = 0.0;
-	return fps;
+	return getNbFrames() / getDuration();
 }
 
 double VideoProperties::getDuration() const

Original file line number	Diff line number	Diff line change
`@@ -478,11 +478,7 @@ int VideoProperties::getLevel() const`
`478`	`478`
`479`	`479`	`double VideoProperties::getFps() const`
`480`	`480`	`{`
`481`		`- Rational timeBase = getTimeBase();`
`482`		`- double fps = timeBase.den / (double) timeBase.num;`
`483`		`- if( isinf( fps ) )`
`484`		`- fps = 0.0;`
`485`		`- return fps;`
	`481`	`+ return getNbFrames() / getDuration();`
`486`	`482`	`}`
`487`	`483`
`488`	`484`	`double VideoProperties::getDuration() const`