diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp index 9cd20fbf77..489dbe565d 100644 --- a/modules/videoio/src/cap_ffmpeg_impl.hpp +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp @@ -2080,6 +2080,7 @@ void CvCapture_FFMPEG::seek(int64_t _frame_number) else { frame_number = 0; + picture_pts = AV_NOPTS_VALUE_; break; } } @@ -2097,27 +2098,14 @@ bool CvCapture_FFMPEG::setProperty( int property_id, double value ) switch( property_id ) { case CAP_PROP_POS_MSEC: + seek(value/1000.0); + return true; case CAP_PROP_POS_FRAMES: + seek((int64_t)value); + return true; case CAP_PROP_POS_AVI_RATIO: - { - switch( property_id ) - { - case CAP_PROP_POS_FRAMES: - seek((int64_t)value); - break; - - case CAP_PROP_POS_MSEC: - seek(value/1000.0); - break; - - case CAP_PROP_POS_AVI_RATIO: - seek((int64_t)(value*ic->duration)); - break; - } - - picture_pts=(int64_t)value; - } - break; + seek((int64_t)(value*ic->duration)); + return true; case CAP_PROP_FORMAT: if (value == -1) return setRaw(); diff --git a/modules/videoio/test/test_ffmpeg.cpp b/modules/videoio/test/test_ffmpeg.cpp index eeb0835078..3021bdfa4e 100644 --- a/modules/videoio/test/test_ffmpeg.cpp +++ b/modules/videoio/test/test_ffmpeg.cpp @@ -1030,4 +1030,31 @@ inline static std::string videoio_ffmpeg_mismatch_name_printer(const testing::Te INSTANTIATE_TEST_CASE_P(/**/, videoio_ffmpeg_channel_mismatch, testing::ValuesIn(mismatch_cases), videoio_ffmpeg_mismatch_name_printer); +// PR: https://github.com/opencv/opencv/pull/27523 +// TODO: Enable the tests back on Windows after FFmpeg plugin rebuild +#ifndef _WIN32 + +// related issue: https://github.com/opencv/opencv/issues/23088 +TEST(ffmpeg_cap_properties, set_pos_get_msec) +{ + if (!videoio_registry::hasBackend(CAP_FFMPEG)) + throw SkipTestException("FFmpeg backend was not found"); + + string video_file = findDataFile("video/big_buck_bunny.mp4"); + VideoCapture cap; + EXPECT_NO_THROW(cap.open(video_file, CAP_FFMPEG)); + ASSERT_TRUE(cap.isOpened()) << "Can't open the video"; + + cap.set(CAP_PROP_POS_FRAMES, 25); + EXPECT_EQ(cap.get(CAP_PROP_POS_MSEC), 1000.0); + + cap.set(CAP_PROP_POS_MSEC, 525); + EXPECT_EQ(cap.get(CAP_PROP_POS_MSEC), 500.0); + + cap.set(CAP_PROP_POS_AVI_RATIO, 0); + EXPECT_EQ(cap.get(CAP_PROP_POS_MSEC), 0.0); +} + +#endif // WIN32 + }} // namespace