potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Alekhin
2021-06-13 10:14:17 +00:00
parent 4dc811946d 438e2dc228
commit 7a5f554bc4
102 changed files with 5432 additions and 3206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/test/test_video_io.cpp
+6
View File
@@ -752,6 +752,9 @@ TEST_P(videocapture_acceleration, read)
{
if (filename == "sample_322x242_15frames.yuv420p.libvpx-vp9.mp4")
throw SkipTestException("Unable to read the first frame with VP9 codec (media stack misconfiguration / bug)");
// FFMPEG: [av1 @ 0000027ac07d1340] Your platform doesn't suppport hardware accelerated AV1 decoding.
if (filename == "sample_322x242_15frames.yuv420p.libaom-av1.mp4")
throw SkipTestException("Unable to read the first frame with AV1 codec (missing support)");
}
EXPECT_TRUE(read_umat_result);
ASSERT_FALSE(umat.empty());
@@ -764,6 +767,9 @@ TEST_P(videocapture_acceleration, read)
{
if (filename == "sample_322x242_15frames.yuv420p.libvpx-vp9.mp4")
throw SkipTestException("Unable to read the first frame with VP9 codec (media stack misconfiguration / bug)");
// FFMPEG: [av1 @ 0000027ac07d1340] Your platform doesn't suppport hardware accelerated AV1 decoding.
if (filename == "sample_322x242_15frames.yuv420p.libaom-av1.mp4")
throw SkipTestException("Unable to read the first frame with AV1 codec (missing support)");
}
EXPECT_TRUE(read_result);
}