From fb3fc5322c0cfb109047e4dbbbfb250f2e61019a Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 12 Sep 2022 13:09:40 +0000 Subject: [PATCH] videoio(ffmpeg): update tests with new Windows wrapper --- modules/videoio/test/test_ffmpeg.cpp | 10 ---------- modules/videoio/test/test_video_io.cpp | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/modules/videoio/test/test_ffmpeg.cpp b/modules/videoio/test/test_ffmpeg.cpp index 6f0f2f28b4..d2c8e4c432 100644 --- a/modules/videoio/test/test_ffmpeg.cpp +++ b/modules/videoio/test/test_ffmpeg.cpp @@ -413,10 +413,6 @@ TEST_P(ffmpeg_get_fourcc, check_short_codecs) if (!cap.isOpened()) throw SkipTestException("Video stream is not supported"); const double fourcc = cap.get(CAP_PROP_FOURCC); -#ifdef _WIN32 // handle old FFmpeg backend - if(!fourcc && fileName == "../cv/tracking/faceocc2/data/faceocc2.webm") - throw SkipTestException("Feature not yet supported by Windows FFmpeg shared library!"); -#endif ASSERT_EQ(fourcc_string, fourccToString((int)fourcc)); } @@ -443,10 +439,8 @@ TEST(videoio, mp4_orientation_meta_auto) EXPECT_NO_THROW(cap.open(video_file, CAP_FFMPEG)); ASSERT_TRUE(cap.isOpened()) << "Can't open the video: " << video_file << " with backend " << CAP_FFMPEG << std::endl; -#ifndef _WIN32 // TODO: FFmpeg wrapper update // related issue: https://github.com/opencv/opencv/issues/22088 EXPECT_EQ(90, cap.get(CAP_PROP_ORIENTATION_META)); -#endif cap.set(CAP_PROP_ORIENTATION_AUTO, true); if (cap.get(CAP_PROP_ORIENTATION_AUTO) == 0) @@ -521,10 +515,6 @@ TEST(videoio_ffmpeg, ffmpeg_check_extra_data) EXPECT_NO_THROW(cap.open(video_file, CAP_FFMPEG)); ASSERT_TRUE(cap.isOpened()) << "Can't open the video"; const int codecExtradataIdx = (int)cap.get(CAP_PROP_CODEC_EXTRADATA_INDEX); -#ifdef _WIN32 // handle old FFmpeg backend - if (codecExtradataIdx <= 0) - throw SkipTestException("Codec extra data is not supported by backend or video stream"); -#endif Mat data; ASSERT_TRUE(cap.retrieve(data, codecExtradataIdx)); EXPECT_EQ(CV_8UC1, data.type()) << "CV_8UC1 != " << typeToString(data.type()); diff --git a/modules/videoio/test/test_video_io.cpp b/modules/videoio/test/test_video_io.cpp index 6661b13c5a..7e64a29aff 100644 --- a/modules/videoio/test/test_video_io.cpp +++ b/modules/videoio/test/test_video_io.cpp @@ -771,8 +771,8 @@ static const VideoCaptureAccelerationInput hw_filename[] = { { "sample_322x242_15frames.yuv420p.libxvid.mp4", 28.0 }, { "sample_322x242_15frames.yuv420p.mjpeg.mp4", 20.0 }, { "sample_322x242_15frames.yuv420p.mpeg2video.mp4", 24.0 }, // GSTREAMER on Ubuntu 18.04 - { "sample_322x242_15frames.yuv420p.libx264.mp4", 24.0 }, // GSTREAMER on Ubuntu 18.04 - { "sample_322x242_15frames.yuv420p.libx265.mp4", 30.0 }, + { "sample_322x242_15frames.yuv420p.libx264.mp4", 23.0 }, // D3D11 on GHA/Windows, GSTREAMER on Ubuntu 18.04 + { "sample_322x242_15frames.yuv420p.libx265.mp4", 23.0 }, // D3D11 on GHA/Windows { "sample_322x242_15frames.yuv420p.libvpx-vp9.mp4", 30.0 }, { "sample_322x242_15frames.yuv420p.libaom-av1.mp4", 30.0 } };