diff --git a/modules/videoio/test/test_audio.cpp b/modules/videoio/test/test_audio.cpp index b1eb0ed4b7..e077b5bff9 100644 --- a/modules/videoio/test/test_audio.cpp +++ b/modules/videoio/test/test_audio.cpp @@ -39,6 +39,10 @@ protected: ASSERT_EQ(expectedNumAudioCh, (int)audioData.size()); for (unsigned int nCh = 0; nCh < audioData.size(); nCh++) { +#ifdef _WIN32 + if (audioData[nCh].size() == 132924 && numberOfSamples == 131819 && fileName == "test_audio.mp4") + throw SkipTestException("Detected failure observed on legacy Windows versions. SKIP"); +#endif ASSERT_EQ(numberOfSamples, audioData[nCh].size()) << "nCh=" << nCh; for (unsigned int i = 0; i < numberOfSamples; i++) { diff --git a/modules/videoio/test/test_video_io.cpp b/modules/videoio/test/test_video_io.cpp index f1ead09c23..6661b13c5a 100644 --- a/modules/videoio/test/test_video_io.cpp +++ b/modules/videoio/test/test_video_io.cpp @@ -713,6 +713,13 @@ TEST_P(videocapture_acceleration, read) if (filename == "sample_322x242_15frames.yuv420p.libaom-av1.mp4") throw SkipTestException("Unable to read the first frame with AV1 codec (missing support)"); } +#ifdef _WIN32 + if (!read_umat_result && i == 1) + { + if (filename == "sample_322x242_15frames.yuv420p.libvpx-vp9.mp4") + throw SkipTestException("Unable to read the second frame with VP9 codec (media stack misconfiguration / outdated MSMF version)"); + } +#endif EXPECT_TRUE(read_umat_result); ASSERT_FALSE(umat.empty()); umat.copyTo(frame); @@ -728,6 +735,13 @@ TEST_P(videocapture_acceleration, read) if (filename == "sample_322x242_15frames.yuv420p.libaom-av1.mp4") throw SkipTestException("Unable to read the first frame with AV1 codec (missing support)"); } +#ifdef _WIN32 + if (!read_result && i == 1) + { + if (filename == "sample_322x242_15frames.yuv420p.libvpx-vp9.mp4") + throw SkipTestException("Unable to read the second frame with VP9 codec (media stack misconfiguration / outdated MSMF version)"); + } +#endif EXPECT_TRUE(read_result); } ASSERT_FALSE(frame.empty());