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 pull request #19666 from alalek:update_ffmpeg_4.x

Browse Source
This commit is contained in:
Alexander Alekhin
2021-03-03 13:06:44 +00:00
parent 2dc157246b b6670f3ac3
commit be24659c03
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/test/test_video_io.cpp
-8
View File
@@ -721,10 +721,6 @@ TEST_P(videocapture_acceleration, read)
VideoAccelerationType actual_va = static_cast<VideoAccelerationType>(static_cast<int>(hw_reader.get(CAP_PROP_HW_ACCELERATION)));
if (va_type != VIDEO_ACCELERATION_ANY && va_type != VIDEO_ACCELERATION_NONE)
{
#ifdef _WIN32 // FIXIT FFmpeg wrapper upgrade is required
if (actual_va == static_cast<VideoAccelerationType>(0))
throw SkipTestException(backend_name + " VideoCapture on " + filename + " not supported with HW acceleration (legacy FFmpeg wrapper), skipping");
#endif
ASSERT_EQ((int)actual_va, (int)va_type) << "actual_va=" << actual_va << ", va_type=" << va_type;
}
std::cout << "VideoCapture " << backend_name << ":" << actual_va << std::endl << std::flush;
@@ -880,10 +876,6 @@ TEST_P(videowriter_acceleration, write)
actual_va = static_cast<VideoAccelerationType>(static_cast<int>(hw_writer.get(VIDEOWRITER_PROP_HW_ACCELERATION)));
if (va_type != VIDEO_ACCELERATION_ANY && va_type != VIDEO_ACCELERATION_NONE)
{
#ifdef _WIN32 // FIXIT FFmpeg wrapper upgrade is required
if (actual_va == static_cast<VideoAccelerationType>(-1))
throw SkipTestException(backend_name + " VideoWriter on " + filename + " not supported with HW acceleration (legacy FFmpeg wrapper), skipping");
#endif
ASSERT_EQ((int)actual_va, (int)va_type) << "actual_va=" << actual_va << ", va_type=" << va_type;
}
std::cout << "VideoWriter " << backend_name << ":" << actual_va << std::endl << std::flush;