From 160f00bca87e954515145a25889e7ba89bfb97a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Colin=20G=C3=BCnther?= <coling@gmx.de>
Date: Mon, 4 Aug 2014 00:28:52 +0200
Subject: [PATCH] FFMPEG Plugin: Implement video frame rate calculation for
 decoder.

- The frame rate calculation is purely based on AVCodecContext fields. This way
  the frame rate can be calculated by the FFMPEG decoder based on the actual
  video data. This is useful for automatically detection of the correct
  decoding parameters (not implemented yet but scheduled for a later commit).
- Not used anywhere yet (scheduled for a later commit).
- Also some minor documentation updates.
---
 src/add-ons/media/plugins/ffmpeg/Utilities.h | 37 +++++++++++++++++---
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/add-ons/media/plugins/ffmpeg/Utilities.h b/src/add-ons/media/plugins/ffmpeg/Utilities.h
index e02f076e42..f51f6b2bfe 100644
--- a/src/add-ons/media/plugins/ffmpeg/Utilities.h
+++ b/src/add-ons/media/plugins/ffmpeg/Utilities.h
@@ -24,10 +24,6 @@ extern "C" {
 /*! \brief Converts FFmpeg notation of video aspect ratio into the Media Kits
 		notation.
 
-	\param pixelWidthAspectOut On return contains the Media Kits notation of
-		the video aspect ratio width. E.g. 16:9 -> 16 is returned here
-	\param pixelHeightAspectOut On return contains the Media Kits notation of
-		the video aspect ratio height. E.g. 16:9 -> 9 is returned here
 	\param contextIn An AVCodeContext structure of FFmpeg containing the values
 		needed to calculate the Media Kit video aspect ratio.
 		The following fields are used for the calculation:
@@ -35,6 +31,10 @@ extern "C" {
 			- AVCodecContext.sample_aspect_ratio.den (optional)
 			- AVCodecContext.width (must)
 			- AVCodecContext.height (must)
+	\param pixelWidthAspectOut On return contains Media Kits notation of the
+		video aspect ratio width. E.g. 16:9 -> 16 is returned here
+	\param pixelHeightAspectOut On return contains Media Kits notation of the
+		video aspect ratio height. E.g. 16:9 -> 9 is returned here
 */
 inline void
 ConvertAVCodecContextToVideoAspectWidthAndHeight(AVCodecContext& contextIn,
@@ -105,4 +105,33 @@ CalculateBytesPerRowWithColorSpaceAndVideoWidth(color_space colorSpace, int vide
 }
 
 
+/*! \brief Converts FFmpeg notation of video frame rate into the Media Kits
+		notation.
+
+	\param contextIn An AVCodeContext structure of FFmpeg containing the values
+		needed to calculate the Media Kit video frame rate.
+		The following fields are used for the calculation:
+			- AVCodecContext.time_base.num (must)
+			- AVCodecContext.time_base.den (must)
+			- AVCodecContext.ticks_per_frame (must)
+	\param frameRateOut On return contains Media Kits notation of the video
+		frame rate.
+*/
+inline void
+ConvertAVCodecContextToVideoFrameRate(AVCodecContext& contextIn, float& frameRateOut)
+{
+	// assert that av_q2d(contextIn.time_base) > 0 and computable
+	assert(contextIn.time_base.num > 0);
+	assert(contextIn.time_base.den > 0);
+
+	// The following code is based on private get_fps() function of FFmpeg's
+	// ratecontrol.c:
+	// https://lists.ffmpeg.org/pipermail/ffmpeg-cvslog/2012-April/049280.html
+	double possiblyInterlacedFrameRate = 1.0 / av_q2d(contextIn.time_base);
+	double numberOfInterlacedFramesPerFullFrame = FFMAX(contextIn.ticks_per_frame, 1);
+
+	frameRateOut
+		= possiblyInterlacedFrameRate / numberOfInterlacedFramesPerFullFrame;
+}
+
 #endif // UTILITIES_H