VideoProperties: fix getFps

Clement Champetier · Clement Champetier · commit 46158b48c476 · 2015-10-07T11:03:13.000+02:00
* Use average framerate that has come from the AVStream.
* Clean doc.
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -516,17 +516,7 @@ int VideoProperties::getLevel() const
 
 float VideoProperties::getFps() const
 {
-	const Rational timeBase = getTimeBase();
-	const float fps = timeBase.den / (double) timeBase.num;
-	if( std::isinf( fps ) )
-	{
-		std::ostringstream os;
-		os << "unable to retrieve a correct fps (found value: ";
-		os << fps;
-		os << ")";
-		throw std::runtime_error( os.str() );
-	}
-	return fps;
+	return av_q2d( _formatContext->streams[_streamIndex]->avg_frame_rate );
 }
 
 bool VideoProperties::hasBFrames() const
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.hpp b/src/AvTranscoder/mediaProperty/VideoProperties.hpp
@@ -56,11 +56,11 @@ class AvExport VideoProperties : public StreamProperties
 	int getLevel() const;
 
 	/**
-	 * @brief Corresponds to the compute of the 'tbn' by ffmpeg.
-	 * tbn = the time base in AVStream that has come from the container
+	 * @brief Corresponds to the 'fps' returned by ffprobe.
+	 * fps = the average framerate that has come from the AVStream
+	 * tbn = the time base in AVStream that has come from the AVStream
 	 * tbc = the time base in AVCodecContext for the codec used for a particular stream
 	 * tbr = tbr is guessed from the video stream and is the value users want to see when they look for the video frame rate
-	 * @return 
 	 */
 	float getFps() const;
 
