From 39087fecdc98fce9410da94a8a54a4e423f41349 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Mon, 12 Dec 2022 15:38:14 +0300 Subject: [PATCH] Merge pull request #22942 from alalek:videoio_test_update_hw_checks * videoio(test): update PSNR check for H264/265 * videoio(test): reduce size for ffmpeg tests on 32-bit platforms --- modules/videoio/test/test_ffmpeg.cpp | 4 ++++ modules/videoio/test/test_video_io.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/videoio/test/test_ffmpeg.cpp b/modules/videoio/test/test_ffmpeg.cpp index 5fb50ef4e4..e60b1b69d9 100644 --- a/modules/videoio/test/test_ffmpeg.cpp +++ b/modules/videoio/test/test_ffmpeg.cpp @@ -55,7 +55,11 @@ TEST_P(videoio_ffmpeg, write_big) remove(filename.c_str()); } +#if defined(OPENCV_32BIT_CONFIGURATION) +static const Size bigSize(1920, 1080); +#else static const Size bigSize(4096, 4096); +#endif const FourCC_Ext_Size entries[] = { diff --git a/modules/videoio/test/test_video_io.cpp b/modules/videoio/test/test_video_io.cpp index 3df9d82aad..63f48fbf9b 100644 --- a/modules/videoio/test/test_video_io.cpp +++ b/modules/videoio/test/test_video_io.cpp @@ -793,8 +793,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", 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.libx264.mp4", 20.0 }, // 20 - D3D11 (i7-11800H), 23 - D3D11 on GHA/Windows, GSTREAMER on Ubuntu 18.04 + { "sample_322x242_15frames.yuv420p.libx265.mp4", 20.0 }, // 20 - D3D11 (i7-11800H), 23 - D3D11 on GHA/Windows { "sample_322x242_15frames.yuv420p.libvpx-vp9.mp4", 30.0 }, { "sample_322x242_15frames.yuv420p.libaom-av1.mp4", 30.0 } };