From 99b0845cd5945a86485ae3b6b51ea3020c6d60f5 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Wed, 13 Jul 2016 19:29:58 +0300 Subject: [PATCH 1/2] ffmpeg windows wrapper 2.7.1=>3.1.1, openh264 1.4.0=>1.5.0, vpx 1.5.0 --- 3rdparty/ffmpeg/ffmpeg.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/3rdparty/ffmpeg/ffmpeg.cmake b/3rdparty/ffmpeg/ffmpeg.cmake index 448ad2bb2..000b713b0 100644 --- a/3rdparty/ffmpeg/ffmpeg.cmake +++ b/3rdparty/ffmpeg/ffmpeg.cmake @@ -1,9 +1,9 @@ -# Binary branch name: ffmpeg/master_20150703 -# Binaries were created for OpenCV: e379ea6ed60b0caad4d4e3eea096e9d850cb8c86 -set(FFMPEG_BINARIES_COMMIT "8aeefc4efe3215de89d8c7e114ae6f7a6091b8eb") -set(FFMPEG_FILE_HASH_BIN32 "89c783eee1c47bfc733f08334ec2e31c") -set(FFMPEG_FILE_HASH_BIN64 "35fe6ccdda6d7a04e9056b0d73b98e76") -set(FFMPEG_FILE_HASH_CMAKE "8606f947a780071f8fcce8cbf39ceef5") +# Binary branch name: ffmpeg/master_20160715 +# Binaries were created for OpenCV: 0e6aa189cb9a9642b0ae7983d301693516faad5d +set(FFMPEG_BINARIES_COMMIT "7eef9080d3271c7547d303fa839a62e1124ff1e6") +set(FFMPEG_FILE_HASH_BIN32 "3bb2a8388af90adf6c762210e696400d") +set(FFMPEG_FILE_HASH_BIN64 "ebcfc963f0a94f7e83d58d60eaf23849") +set(FFMPEG_FILE_HASH_CMAKE "f99941d10c1e87bf16b9055e8fc91ab2") set(FFMPEG_DOWNLOAD_URL ${OPENCV_FFMPEG_URL};$ENV{OPENCV_FFMPEG_URL};https://raw.githubusercontent.com/Itseez/opencv_3rdparty/${FFMPEG_BINARIES_COMMIT}/ffmpeg/) From daf1879a2e5ea9a21c2e1c5209bc5c6526aa112e Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 15 Jul 2016 17:00:02 +0300 Subject: [PATCH 2/2] test: ffmpeg: change resolution for H264 test --- modules/videoio/test/test_ffmpeg.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/videoio/test/test_ffmpeg.cpp b/modules/videoio/test/test_ffmpeg.cpp index 423817715..fce8cf467 100644 --- a/modules/videoio/test/test_ffmpeg.cpp +++ b/modules/videoio/test/test_ffmpeg.cpp @@ -118,6 +118,9 @@ public: frame_s = Size(352, 288); else if( tag == VideoWriter::fourcc('H', '2', '6', '3') ) frame_s = Size(704, 576); + else if( tag == VideoWriter::fourcc('H', '2', '6', '4') ) + // OpenH264 1.5.0 has resolution limitations, so lets use DCI 4K resolution + frame_s = Size(4096, 2160); /*else if( tag == CV_FOURCC('M', 'J', 'P', 'G') || tag == CV_FOURCC('j', 'p', 'e', 'g') ) frame_s = Size(1920, 1080);*/