From a6fadfe1c275b9885b59612c8a036f4fb15f32c4 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 24 Oct 2022 18:20:54 +0300 Subject: [PATCH] libav for jetson tk1 does not provide libavutil/display.h. --- modules/videoio/src/cap_ffmpeg_impl.hpp | 4 ++++ modules/videoio/test/test_ffmpeg.cpp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp index c7976ff..00732f5 100644 --- a/modules/videoio/src/cap_ffmpeg_impl.hpp +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp @@ -82,7 +82,11 @@ extern "C" { #include #include +// https://github.com/FFmpeg/FFmpeg/blame/d79c240196f43b93bd204363f1facc270029f113/doc/APIchanges#L1689-L1695 +#if LIBAVUTIL_BUILD >= (LIBAVUTIL_VERSION_MICRO >= 100 \ + ? CALC_FFMPEG_VERSION(52, 85, 100) : CALC_FFMPEG_VERSION(53, 15, 0)) #include +#endif #if LIBAVUTIL_BUILD >= (LIBAVUTIL_VERSION_MICRO >= 100 \ ? CALC_FFMPEG_VERSION(51, 63, 100) : CALC_FFMPEG_VERSION(54, 6, 0)) diff --git a/modules/videoio/test/test_ffmpeg.cpp b/modules/videoio/test/test_ffmpeg.cpp index 1e2a91b..3ae27de 100644 --- a/modules/videoio/test/test_ffmpeg.cpp +++ b/modules/videoio/test/test_ffmpeg.cpp @@ -95,8 +95,6 @@ TEST(videoio_ffmpeg, image) //========================================================================== -#define THREADS testing::ValuesIn({ 0,1,2,2000 }) -#define RAW_READ testing::ValuesIn({true, false}) typedef tuple videoio_read_params_t; typedef testing::TestWithParam< testing::tuple> videoio_read; @@ -139,7 +137,9 @@ const videoio_read_params_t videoio_read_params[] = //videoio_read_params_t("video/big_buck_bunny.wmv", 125, true), }; -INSTANTIATE_TEST_CASE_P(/**/, videoio_read, testing::Combine(testing::ValuesIn(videoio_read_params), THREADS, RAW_READ)); +INSTANTIATE_TEST_CASE_P(/**/, videoio_read, testing::Combine(testing::ValuesIn(videoio_read_params), + testing::Values(0, 1, 2, 2000), + testing::Values(true, false))); //========================================================================== -- 2.7.4