Merge pull request #3275 from asmorkalov:ocv_gstreamer_backport

CMakeLists.txt

@@ -136,6 +136,7 @@ OCV_OPTION(WITH_EIGEN          "Include Eigen2/Eigen3 support"               ON)
 OCV_OPTION(WITH_VFW            "Include Video for Windows support"           ON   IF WIN32 )
 OCV_OPTION(WITH_FFMPEG         "Include FFMPEG support"                      ON   IF (NOT ANDROID AND NOT IOS))
 OCV_OPTION(WITH_GSTREAMER      "Include Gstreamer support"                   ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
+OCV_OPTION(WITH_GSTREAMER_0_10 "Enable Gstreamer 0.10 support (instead of 1.x)"   OFF )
 OCV_OPTION(WITH_GTK            "Include GTK support"                         ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
 OCV_OPTION(WITH_IMAGEIO        "ImageIO support for OS X"                    OFF  IF APPLE )
 OCV_OPTION(WITH_IPP            "Include Intel IPP support"                   OFF  IF (MSVC OR X86 OR X86_64) )
@@ -871,10 +872,12 @@ endif(DEFINED WITH_FFMPEG)
 if(DEFINED WITH_GSTREAMER)
   status("    GStreamer:"      HAVE_GSTREAMER      THEN ""                                         ELSE NO)
   if(HAVE_GSTREAMER)
-    status("      base:"       "YES (ver ${ALIASOF_gstreamer-base-0.10_VERSION})")
+    status("      base:"       "YES (ver ${GSTREAMER_BASE_VERSION})")
-    status("      app:"        "YES (ver ${ALIASOF_gstreamer-app-0.10_VERSION})")
+    status("      video:"      "YES (ver ${GSTREAMER_VIDEO_VERSION})")
-    status("      video:"      "YES (ver ${ALIASOF_gstreamer-video-0.10_VERSION})")
+    status("      app:"        "YES (ver ${GSTREAMER_APP_VERSION})")
-  endif()
+    status("      riff:"       "YES (ver ${GSTREAMER_RIFF_VERSION})")
+    status("      pbutils:"    "YES (ver ${GSTREAMER_PBUTILS_VERSION})")
+  endif(HAVE_GSTREAMER)
 endif(DEFINED WITH_GSTREAMER)
 
 if(DEFINED WITH_OPENNI)

cmake/OpenCVFindLibsVideo.cmake

@@ -12,15 +12,42 @@ endif(WITH_VFW)
 
 # --- GStreamer ---
 ocv_clear_vars(HAVE_GSTREAMER)
-if(WITH_GSTREAMER)
+# try to find gstreamer 1.x first
-  CHECK_MODULE(gstreamer-base-0.10 HAVE_GSTREAMER)
+if(WITH_GSTREAMER AND NOT WITH_GSTREAMER_0_10)
-  if(HAVE_GSTREAMER)
+  CHECK_MODULE(gstreamer-base-1.0 HAVE_GSTREAMER_BASE)
-    CHECK_MODULE(gstreamer-app-0.10 HAVE_GSTREAMER)
+  CHECK_MODULE(gstreamer-video-1.0 HAVE_GSTREAMER_VIDEO)
+  CHECK_MODULE(gstreamer-app-1.0 HAVE_GSTREAMER_APP)
+  CHECK_MODULE(gstreamer-riff-1.0 HAVE_GSTREAMER_RIFF)
+  CHECK_MODULE(gstreamer-pbutils-1.0 HAVE_GSTREAMER_PBUTILS)
+
+  if(HAVE_GSTREAMER_BASE AND HAVE_GSTREAMER_VIDEO AND HAVE_GSTREAMER_APP AND HAVE_GSTREAMER_RIFF AND HAVE_GSTREAMER_PBUTILS)
+      set(HAVE_GSTREAMER TRUE)
+      set(GSTREAMER_BASE_VERSION ${ALIASOF_gstreamer-base-1.0_VERSION})
+      set(GSTREAMER_VIDEO_VERSION ${ALIASOF_gstreamer-video-1.0_VERSION})
+      set(GSTREAMER_APP_VERSION ${ALIASOF_gstreamer-app-1.0_VERSION})
+      set(GSTREAMER_RIFF_VERSION ${ALIASOF_gstreamer-riff-1.0_VERSION})
+      set(GSTREAMER_PBUTILS_VERSION ${ALIASOF_gstreamer-pbutils-1.0_VERSION})
   endif()
-  if(HAVE_GSTREAMER)
+
-    CHECK_MODULE(gstreamer-video-0.10 HAVE_GSTREAMER)
+endif(WITH_GSTREAMER AND NOT WITH_GSTREAMER_0_10)
+
+# if gstreamer 1.x was not found, or we specified we wanted 0.10, try to find it
+if(WITH_GSTREAMER_0_10 OR NOT HAVE_GSTREAMER)
+  CHECK_MODULE(gstreamer-base-0.10 HAVE_GSTREAMER_BASE)
+  CHECK_MODULE(gstreamer-video-0.10 HAVE_GSTREAMER_VIDEO)
+  CHECK_MODULE(gstreamer-app-0.10 HAVE_GSTREAMER_APP)
+  CHECK_MODULE(gstreamer-riff-0.10 HAVE_GSTREAMER_RIFF)
+  CHECK_MODULE(gstreamer-pbutils-0.10 HAVE_GSTREAMER_PBUTILS)
+
+  if(HAVE_GSTREAMER_BASE AND HAVE_GSTREAMER_VIDEO AND HAVE_GSTREAMER_APP AND HAVE_GSTREAMER_RIFF AND HAVE_GSTREAMER_PBUTILS)
+      set(HAVE_GSTREAMER TRUE)
+      set(GSTREAMER_BASE_VERSION ${ALIASOF_gstreamer-base-0.10_VERSION})
+      set(GSTREAMER_VIDEO_VERSION ${ALIASOF_gstreamer-video-0.10_VERSION})
+      set(GSTREAMER_APP_VERSION ${ALIASOF_gstreamer-app-0.10_VERSION})
+      set(GSTREAMER_RIFF_VERSION ${ALIASOF_gstreamer-riff-0.10_VERSION})
+      set(GSTREAMER_PBUTILS_VERSION ${ALIASOF_gstreamer-pbutils-0.10_VERSION})
   endif()
-endif(WITH_GSTREAMER)
+endif(WITH_GSTREAMER_0_10 OR NOT HAVE_GSTREAMER)
 
 # --- unicap ---
 ocv_clear_vars(HAVE_UNICAP)

modules/highgui/test/test_basic_props.cpp

@@ -0,0 +1,157 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#include "test_precomp.hpp"
+#include "opencv2/highgui/highgui.hpp"
+#include "opencv2/ts/ts.hpp"
+#include <stdio.h>
+
+#if BUILD_WITH_VIDEO_INPUT_SUPPORT
+
+using namespace cv;
+using namespace std;
+using namespace cvtest;
+
+#ifdef HAVE_GSTREAMER
+const string ext[] = {"avi"};
+#else
+const string ext[] = {"avi", "mov", "mp4"};
+#endif
+
+TEST(Highgui_Video, prop_resolution)
+{
+    const size_t n = sizeof(ext)/sizeof(ext[0]);
+    const string src_dir = TS::ptr()->get_data_path();
+
+    TS::ptr()->printf(cvtest::TS::LOG, "\n\nSource files directory: %s\n", (src_dir+"video/").c_str());
+
+    for (size_t i = 0; i < n; ++i)
+    {
+        string file_path = src_dir+"video/big_buck_bunny."+ext[i];
+        VideoCapture cap(file_path);
+        if (!cap.isOpened())
+        {
+            TS::ptr()->printf(cvtest::TS::LOG, "\nFile information (video %d): \n\nName: big_buck_bunny.%s\nFAILED\n\n", i+1, ext[i].c_str());
+            TS::ptr()->printf(cvtest::TS::LOG, "Error: cannot read source video file.\n");
+            TS::ptr()->set_failed_test_info(cvtest::TS::FAIL_INVALID_TEST_DATA);
+            return;
+        }
+
+        ASSERT_EQ(672, cap.get(CV_CAP_PROP_FRAME_WIDTH));
+        ASSERT_EQ(384, cap.get(CV_CAP_PROP_FRAME_HEIGHT));
+    }
+}
+
+TEST(Highgui_Video, actual_resolution)
+{
+    const size_t n = sizeof(ext)/sizeof(ext[0]);
+    const string src_dir = TS::ptr()->get_data_path();
+
+    TS::ptr()->printf(cvtest::TS::LOG, "\n\nSource files directory: %s\n", (src_dir+"video/").c_str());
+
+    for (size_t i = 0; i < n; ++i)
+    {
+        string file_path = src_dir+"video/big_buck_bunny."+ext[i];
+        VideoCapture cap(file_path);
+        if (!cap.isOpened())
+        {
+            TS::ptr()->printf(cvtest::TS::LOG, "\nFile information (video %d): \n\nName: big_buck_bunny.%s\nFAILED\n\n", i+1, ext[i].c_str());
+            TS::ptr()->printf(cvtest::TS::LOG, "Error: cannot read source video file.\n");
+            TS::ptr()->set_failed_test_info(cvtest::TS::FAIL_INVALID_TEST_DATA);
+            return;
+        }
+
+        Mat frame;
+        cap >> frame;
+
+        ASSERT_EQ(672, frame.cols);
+        ASSERT_EQ(384, frame.rows);
+    }
+}
+
+TEST(Highgui_Video, DISABLED_prop_fps)
+{
+    const size_t n = sizeof(ext)/sizeof(ext[0]);
+    const string src_dir = TS::ptr()->get_data_path();
+
+    TS::ptr()->printf(cvtest::TS::LOG, "\n\nSource files directory: %s\n", (src_dir+"video/").c_str());
+
+    for (size_t i = 0; i < n; ++i)
+    {
+        string file_path = src_dir+"video/big_buck_bunny."+ext[i];
+        VideoCapture cap(file_path);
+        if (!cap.isOpened())
+        {
+            TS::ptr()->printf(cvtest::TS::LOG, "\nFile information (video %d): \n\nName: big_buck_bunny.%s\nFAILED\n\n", i+1, ext[i].c_str());
+            TS::ptr()->printf(cvtest::TS::LOG, "Error: cannot read source video file.\n");
+            TS::ptr()->set_failed_test_info(cvtest::TS::FAIL_INVALID_TEST_DATA);
+            return;
+        }
+
+        ASSERT_EQ(24, cap.get(CV_CAP_PROP_FPS));
+    }
+}
+
+TEST(Highgui_Video, prop_framecount)
+{
+    const size_t n = sizeof(ext)/sizeof(ext[0]);
+    const string src_dir = TS::ptr()->get_data_path();
+
+    TS::ptr()->printf(cvtest::TS::LOG, "\n\nSource files directory: %s\n", (src_dir+"video/").c_str());
+
+    for (size_t i = 0; i < n; ++i)
+    {
+        string file_path = src_dir+"video/big_buck_bunny."+ext[i];
+        VideoCapture cap(file_path);
+        if (!cap.isOpened())
+        {
+            TS::ptr()->printf(cvtest::TS::LOG, "\nFile information (video %d): \n\nName: big_buck_bunny.%s\nFAILED\n\n", i+1, ext[i].c_str());
+            TS::ptr()->printf(cvtest::TS::LOG, "Error: cannot read source video file.\n");
+            TS::ptr()->set_failed_test_info(cvtest::TS::FAIL_INVALID_TEST_DATA);
+            return;
+        }
+
+        ASSERT_EQ(125, cap.get(CV_CAP_PROP_FRAME_COUNT));
+    }
+}
+
+#endif

modules/highgui/test/test_video_io.cpp

@@ -92,7 +92,9 @@ const VideoFormat g_specific_fmt_list[] =
     VideoFormat("mkv", CV_FOURCC('X', 'V', 'I', 'D')),
     VideoFormat("mkv", CV_FOURCC('M', 'P', 'E', 'G')),
     VideoFormat("mkv", CV_FOURCC('M', 'J', 'P', 'G')),
+#ifndef HAVE_GSTREAMER
     VideoFormat("mov", CV_FOURCC('m', 'p', '4', 'v')),
+#endif
     VideoFormat()
 };
 #endif
@@ -490,7 +492,13 @@ void CV_HighGuiTest::SpecificVideoTest(const string& dir, const cvtest::VideoFor
     if (fourcc == CV_FOURCC('M', 'P', 'E', 'G') && ext == "mkv")
         allowed_extra_frames = 1;
 
-    if (FRAME_COUNT < IMAGE_COUNT || FRAME_COUNT > IMAGE_COUNT + allowed_extra_frames)
+    // Hack! Some GStreamer encoding pipelines drop last frame in the video
+    int allowed_frame_frop = 0;
+#ifdef HAVE_GSTREAMER
+    allowed_frame_frop = 1;
+#endif
+
+    if (FRAME_COUNT < IMAGE_COUNT - allowed_frame_frop || FRAME_COUNT > IMAGE_COUNT + allowed_extra_frames)
     {
         ts->printf(ts->LOG, "\nFrame count checking for video_%s.%s...\n", fourcc_str.c_str(), ext.c_str());
         ts->printf(ts->LOG, "Video codec: %s\n", fourcc_str.c_str());
@@ -505,7 +513,7 @@ void CV_HighGuiTest::SpecificVideoTest(const string& dir, const cvtest::VideoFor
         return;
     }
 
-    for (int i = 0; (size_t)i < IMAGE_COUNT; i++)
+    for (int i = 0; (size_t)i < IMAGE_COUNT-allowed_frame_frop; i++)
     {
         Mat frame; cap >> frame;
         if (frame.empty())