@@ -814,19 +814,12 @@ INSTANTIATE_TEST_CASE_P(CUDA_Codec, Scaling, testing::Combine(
814
814
815
815
INSTANTIATE_TEST_CASE_P (CUDA_Codec, DisplayResolution, ALL_DEVICES);
816
816
817
- #ifdef _WIN32 // handle old FFmpeg backend - remove when windows shared library is updated
818
- #define VIDEO_SRC_R testing::Values (" highgui/video/big_buck_bunny.mp4" , " cv/video/768x576.avi" , " cv/video/1920x1080.avi" , " highgui/video/big_buck_bunny.avi" , \
819
- " highgui/video/big_buck_bunny.h264" , " highgui/video/big_buck_bunny.h265" , " highgui/video/big_buck_bunny.mpg" , \
820
- " highgui/video/sample_322x242_15frames.yuv420p.libvpx-vp9.mp4" )
821
- // , "highgui/video/sample_322x242_15frames.yuv420p.libaom-av1.mp4", \
822
- "cv/tracking/faceocc2/data/faceocc2.webm")
823
- #else
824
817
#define VIDEO_SRC_R testing::Values (" highgui/video/big_buck_bunny.mp4" , " cv/video/768x576.avi" , " cv/video/1920x1080.avi" , " highgui/video/big_buck_bunny.avi" , \
825
818
" highgui/video/big_buck_bunny.h264" , " highgui/video/big_buck_bunny.h265" , " highgui/video/big_buck_bunny.mpg" , \
826
819
" highgui/video/sample_322x242_15frames.yuv420p.libvpx-vp9.mp4" )
827
820
// , "highgui/video/sample_322x242_15frames.yuv420p.libaom-av1.mp4", \
828
821
"cv/tracking/faceocc2/data/faceocc2.webm", "highgui/video/sample_322x242_15frames.yuv420p.mpeg2video.mp4", "highgui/video/sample_322x242_15frames.yuv420p.mjpeg.mp4")
829
- #endif
822
+
830
823
INSTANTIATE_TEST_CASE_P(CUDA_Codec, Video, testing::Combine(ALL_DEVICES,VIDEO_SRC_R));
831
824
832
825
const color_conversion_params_t color_conversion_params[] =
0 commit comments