Skip to content

Commit 1f4fe3b

Browse files
asmorkalovasmorkalov
committed
GStreamer 1.0 backport from master branch.
1 parent 45a1063 commit 1f4fe3b

File tree

5 files changed

+1477
-399
lines changed

5 files changed

+1477
-399
lines changed

‎CMakeLists.txt‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ OCV_OPTION(WITH_EIGEN "Include Eigen2/Eigen3 support" ON)
136136
OCV_OPTION(WITH_VFW "Include Video for Windows support" ON IF WIN32 )
137137
OCV_OPTION(WITH_FFMPEG "Include FFMPEG support" ON IF (NOT ANDROID AND NOT IOS))
138138
OCV_OPTION(WITH_GSTREAMER "Include Gstreamer support" ON IF (UNIX AND NOT APPLE AND NOT ANDROID) )
139+
OCV_OPTION(WITH_GSTREAMER_0_10 "Enable Gstreamer 0.10 support (instead of 1.x)" OFF )
139140
OCV_OPTION(WITH_GTK "Include GTK support" ON IF (UNIX AND NOT APPLE AND NOT ANDROID) )
140141
OCV_OPTION(WITH_IMAGEIO "ImageIO support for OS X" OFF IF APPLE )
141142
OCV_OPTION(WITH_IPP "Include Intel IPP support" OFF IF (MSVC OR X86 OR X86_64) )
@@ -871,10 +872,12 @@ endif(DEFINED WITH_FFMPEG)
871872
if(DEFINED WITH_GSTREAMER)
872873
status(" GStreamer:" HAVE_GSTREAMER THEN "" ELSE NO)
873874
if(HAVE_GSTREAMER)
874-
status(" base:" "YES (ver ${ALIASOF_gstreamer-base-0.10_VERSION})")
875-
status(" app:" "YES (ver ${ALIASOF_gstreamer-app-0.10_VERSION})")
876-
status(" video:" "YES (ver ${ALIASOF_gstreamer-video-0.10_VERSION})")
877-
endif()
875+
status(" base:" "YES (ver ${GSTREAMER_BASE_VERSION})")
876+
status(" video:" "YES (ver ${GSTREAMER_VIDEO_VERSION})")
877+
status(" app:" "YES (ver ${GSTREAMER_APP_VERSION})")
878+
status(" riff:" "YES (ver ${GSTREAMER_RIFF_VERSION})")
879+
status(" pbutils:" "YES (ver ${GSTREAMER_PBUTILS_VERSION})")
880+
endif(HAVE_GSTREAMER)
878881
endif(DEFINED WITH_GSTREAMER)
879882

880883
if(DEFINED WITH_OPENNI)

‎cmake/OpenCVFindLibsVideo.cmake‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,42 @@ endif(WITH_VFW)
1212

1313
# --- GStreamer ---
1414
ocv_clear_vars(HAVE_GSTREAMER)
15-
if(WITH_GSTREAMER)
16-
CHECK_MODULE(gstreamer-base-0.10 HAVE_GSTREAMER)
17-
if(HAVE_GSTREAMER)
18-
CHECK_MODULE(gstreamer-app-0.10 HAVE_GSTREAMER)
15+
# try to find gstreamer 1.x first
16+
if(WITH_GSTREAMER AND NOT WITH_GSTREAMER_0_10)
17+
CHECK_MODULE(gstreamer-base-1.0 HAVE_GSTREAMER_BASE)
18+
CHECK_MODULE(gstreamer-video-1.0 HAVE_GSTREAMER_VIDEO)
19+
CHECK_MODULE(gstreamer-app-1.0 HAVE_GSTREAMER_APP)
20+
CHECK_MODULE(gstreamer-riff-1.0 HAVE_GSTREAMER_RIFF)
21+
CHECK_MODULE(gstreamer-pbutils-1.0 HAVE_GSTREAMER_PBUTILS)
22+
23+
if(HAVE_GSTREAMER_BASE AND HAVE_GSTREAMER_VIDEO AND HAVE_GSTREAMER_APP AND HAVE_GSTREAMER_RIFF AND HAVE_GSTREAMER_PBUTILS)
24+
set(HAVE_GSTREAMER TRUE)
25+
set(GSTREAMER_BASE_VERSION ${ALIASOF_gstreamer-base-1.0_VERSION})
26+
set(GSTREAMER_VIDEO_VERSION ${ALIASOF_gstreamer-video-1.0_VERSION})
27+
set(GSTREAMER_APP_VERSION ${ALIASOF_gstreamer-app-1.0_VERSION})
28+
set(GSTREAMER_RIFF_VERSION ${ALIASOF_gstreamer-riff-1.0_VERSION})
29+
set(GSTREAMER_PBUTILS_VERSION ${ALIASOF_gstreamer-pbutils-1.0_VERSION})
1930
endif()
20-
if(HAVE_GSTREAMER)
21-
CHECK_MODULE(gstreamer-video-0.10 HAVE_GSTREAMER)
31+
32+
endif(WITH_GSTREAMER AND NOT WITH_GSTREAMER_0_10)
33+
34+
# if gstreamer 1.x was not found, or we specified we wanted 0.10, try to find it
35+
if(WITH_GSTREAMER_0_10 OR NOT HAVE_GSTREAMER)
36+
CHECK_MODULE(gstreamer-base-0.10 HAVE_GSTREAMER_BASE)
37+
CHECK_MODULE(gstreamer-video-0.10 HAVE_GSTREAMER_VIDEO)
38+
CHECK_MODULE(gstreamer-app-0.10 HAVE_GSTREAMER_APP)
39+
CHECK_MODULE(gstreamer-riff-0.10 HAVE_GSTREAMER_RIFF)
40+
CHECK_MODULE(gstreamer-pbutils-0.10 HAVE_GSTREAMER_PBUTILS)
41+
42+
if(HAVE_GSTREAMER_BASE AND HAVE_GSTREAMER_VIDEO AND HAVE_GSTREAMER_APP AND HAVE_GSTREAMER_RIFF AND HAVE_GSTREAMER_PBUTILS)
43+
set(HAVE_GSTREAMER TRUE)
44+
set(GSTREAMER_BASE_VERSION ${ALIASOF_gstreamer-base-0.10_VERSION})
45+
set(GSTREAMER_VIDEO_VERSION ${ALIASOF_gstreamer-video-0.10_VERSION})
46+
set(GSTREAMER_APP_VERSION ${ALIASOF_gstreamer-app-0.10_VERSION})
47+
set(GSTREAMER_RIFF_VERSION ${ALIASOF_gstreamer-riff-0.10_VERSION})
48+
set(GSTREAMER_PBUTILS_VERSION ${ALIASOF_gstreamer-pbutils-0.10_VERSION})
2249
endif()
23-
endif(WITH_GSTREAMER)
50+
endif(WITH_GSTREAMER_0_10 OR NOT HAVE_GSTREAMER)
2451

2552
# --- unicap ---
2653
ocv_clear_vars(HAVE_UNICAP)

0 commit comments

Comments
 (0)