From f609ddba058f93a8a824f4b9f8a43a3f4f3a32ab Mon Sep 17 00:00:00 2001 From: grundman Date: Fri, 30 Oct 2015 17:48:04 -0700 Subject: [PATCH] Fix incorrect FPS value returned by cap.get(CV_CAP_PROP_FPS) Current implementation returns NaN for some configs of FFMPEG, call default get_fps() instead (as also used by PROP_POS_MSEC) --- modules/videoio/src/cap_ffmpeg_impl.hpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp index ee1447e0ff..cf8a1c668d 100644 --- a/modules/videoio/src/cap_ffmpeg_impl.hpp +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp @@ -823,14 +823,7 @@ double CvCapture_FFMPEG::getProperty( int property_id ) const case CV_FFMPEG_CAP_PROP_FRAME_HEIGHT: return (double)frame.height; case CV_FFMPEG_CAP_PROP_FPS: -#if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54, 1, 0) - return av_q2d(video_st->avg_frame_rate); -#elif LIBAVCODEC_BUILD > 4753 - return av_q2d(video_st->r_frame_rate); -#else - return (double)video_st->codec.frame_rate - / (double)video_st->codec.frame_rate_base; -#endif + return get_fps(); case CV_FFMPEG_CAP_PROP_FOURCC: #if LIBAVFORMAT_BUILD > 4628 return (double)video_st->codec->codec_tag;