VideoProperties: return fps as a float type

Clement Champetier · Clement Champetier · commit c6198568016e · 2015-06-22T16:43:11.000+02:00
Double type is not constructed the same way in C++ and Java, and does
not exist in python. Our bindings of 'C++ double' could create issues,
and since a fps with a simple precision is enough, we decided to return
fps as float.
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -518,9 +518,9 @@ int VideoProperties::getLevel() const
 	return _codecContext->level;
 }
 
-double VideoProperties::getFps() const
+float VideoProperties::getFps() const
 {
-	size_t nbFrames = getNbFrames();
+	const size_t nbFrames = getNbFrames();
 	if( nbFrames )
 	{
 		double duration = getDuration();
@@ -531,7 +531,7 @@ double VideoProperties::getFps() const
 
 	// if nbFrames of stream is unknwon
 	Rational timeBase = getTimeBase();
-	double fps = timeBase.den / (double) timeBase.num;
+	float fps = timeBase.den / (double) timeBase.num;
 	if( std::isinf( fps ) )
 	{
 		std::ostringstream os;
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -56,7 +56,7 @@ class AvExport VideoProperties : public StreamProperties
 	int getProfile() const;
 	int getLevel() const;
 
-	double getFps() const;
+	float getFps() const;
 
 	bool hasBFrames() const;
 	//bool isClosedGop() const;

Original file line number	Diff line number	Diff line change
`@@ -518,9 +518,9 @@ int VideoProperties::getLevel() const`
`518`	`518`	`return _codecContext->level;`
`519`	`519`	`}`
`520`	`520`
`521`		`-double VideoProperties::getFps() const`
	`521`	`+float VideoProperties::getFps() const`
`522`	`522`	`{`
`523`		`- size_t nbFrames = getNbFrames();`
	`523`	`+ const size_t nbFrames = getNbFrames();`
`524`	`524`	`if( nbFrames )`
`525`	`525`	`{`
`526`	`526`	`double duration = getDuration();`
`@@ -531,7 +531,7 @@ double VideoProperties::getFps() const`
`531`	`531`
`532`	`532`	`// if nbFrames of stream is unknwon`
`533`	`533`	`Rational timeBase = getTimeBase();`
`534`		`- double fps = timeBase.den / (double) timeBase.num;`
	`534`	`+ float fps = timeBase.den / (double) timeBase.num;`
`535`	`535`	`if( std::isinf( fps ) )`
`536`	`536`	`{`
`537`	`537`	`std::ostringstream os;`