mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-18 11:28:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24492 from asmorkalov:as/reprioritize_fps_source_ffmpeg

Browse Source 
Use video stream fps first in FFmpeg backend for VideoCapture
This commit is contained in:
Alexander Smorkalov 2023-11-11 08:53:41 +03:00 committed by GitHub
commit ceebfa1bee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/videoio/src/cap_ffmpeg_impl.hpp
View File

@ -1877,15 +1877,16 @@ int64_t CvCapture_FFMPEG::get_bitrate() const
double CvCapture_FFMPEG::get_fps() const double CvCapture_FFMPEG::get_fps() const
{ {
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(55, 1, 100) && LIBAVFORMAT_VERSION_MICRO >= 100 #if LIBAVCODEC_BUILD >= CALC_FFMPEG_VERSION(54, 1, 0) || LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0)
double fps = r2d(av_guess_frame_rate(ic, ic->streams[video_stream], NULL));
#else
double fps = r2d(ic->streams[video_stream]->avg_frame_rate); double fps = r2d(ic->streams[video_stream]->avg_frame_rate);
#else
double fps = r2d(ic->streams[video_stream]->r_frame_rate);
#endif
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0) #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(55, 1, 100) && LIBAVFORMAT_VERSION_MICRO >= 100
if (fps < eps_zero) if (fps < eps_zero)
{ {
fps = r2d(ic->streams[video_stream]->avg_frame_rate); fps = r2d(av_guess_frame_rate(ic, ic->streams[video_stream], NULL));
} }
#endif #endif
@ -1893,7 +1894,7 @@ double CvCapture_FFMPEG::get_fps() const
{ {
fps = 1.0 / r2d(ic->streams[video_stream]->time_base); fps = 1.0 / r2d(ic->streams[video_stream]->time_base);
} }
#endif
return fps; return fps;
} }

2
modules/videoio/test/test_ffmpeg.cpp
View File

@ -296,7 +296,7 @@ TEST_P(videoio_encapsulate, write)
ASSERT_TRUE(capActualRaw.isOpened()); ASSERT_TRUE(capActualRaw.isOpened());
const double fpsReference = capReference.get(CAP_PROP_FPS); const double fpsReference = capReference.get(CAP_PROP_FPS);
const double fpsActual = capActual.get(CAP_PROP_FPS); const double fpsActual = capActual.get(CAP_PROP_FPS);
ASSERT_EQ(fpsReference, fpsActual); ASSERT_NEAR(fpsReference, fpsActual, 1e-2);
const int nFramesActual = static_cast<int>(capActual.get(CAP_PROP_FRAME_COUNT)); const int nFramesActual = static_cast<int>(capActual.get(CAP_PROP_FRAME_COUNT));
ASSERT_EQ(nFrames, nFramesActual); ASSERT_EQ(nFrames, nFramesActual);