Skip to content

Commit c7f0381

Browse files
committed
Merge pull request opencv#19633 from mshabunin:add-gstreamer-video
2 parents 21b2e33 + 9062349 commit c7f0381

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

modules/videoio/cmake/detect_gstreamer.cmake

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ if(NOT HAVE_GSTREAMER AND WIN32)
4040
NAMES gstriff gstriff-1.0
4141
PATHS ${env_paths}
4242
PATH_SUFFIXES "lib")
43+
find_library(GSTREAMER_video_LIBRARY
44+
NAMES gstvideo gstvideo-1.0
45+
PATHS ${env_paths}
46+
PATH_SUFFIXES "lib")
4347

4448
find_library(GSTREAMER_glib_LIBRARY
4549
NAMES glib-2.0
@@ -58,6 +62,7 @@ if(NOT HAVE_GSTREAMER AND WIN32)
5862
AND GSTREAMER_base_LIBRARY
5963
AND GSTREAMER_pbutils_LIBRARY
6064
AND GSTREAMER_riff_LIBRARY
65+
AND GSTREAMER_video_LIBRARY
6166
AND GSTREAMER_glib_LIBRARY
6267
AND GSTREAMER_gobject_LIBRARY)
6368
file(STRINGS "${GSTREAMER_gst_INCLUDE_DIR}/gst/gstversion.h" ver_strings REGEX "#define +GST_VERSION_(MAJOR|MINOR|MICRO|NANO).*")
@@ -71,6 +76,7 @@ if(NOT HAVE_GSTREAMER AND WIN32)
7176
${GSTREAMER_base_LIBRARY}
7277
${GSTREAMER_app_LIBRARY}
7378
${GSTREAMER_riff_LIBRARY}
79+
${GSTREAMER_video_LIBRARY}
7480
${GSTREAMER_pbutils_LIBRARY}
7581
${GSTREAMER_glib_LIBRARY}
7682
${GSTREAMER_gobject_LIBRARY})
@@ -86,11 +92,12 @@ if(NOT HAVE_GSTREAMER AND PKG_CONFIG_FOUND)
8692
ocv_check_modules(GSTREAMER_app gstreamer-app-1.0)
8793
ocv_check_modules(GSTREAMER_riff gstreamer-riff-1.0)
8894
ocv_check_modules(GSTREAMER_pbutils gstreamer-pbutils-1.0)
89-
if(GSTREAMER_base_FOUND AND GSTREAMER_app_FOUND AND GSTREAMER_riff_FOUND AND GSTREAMER_pbutils_FOUND)
95+
ocv_check_modules(GSTREAMER_video gstreamer-video-1.0)
96+
if(GSTREAMER_base_FOUND AND GSTREAMER_app_FOUND AND GSTREAMER_riff_FOUND AND GSTREAMER_pbutils_FOUND AND GSTREAMER_video_FOUND)
9097
set(HAVE_GSTREAMER TRUE)
9198
set(GSTREAMER_VERSION ${GSTREAMER_base_VERSION} PARENT_SCOPE) # informational
92-
set(GSTREAMER_LIBRARIES ${GSTREAMER_base_LIBRARIES} ${GSTREAMER_app_LIBRARIES} ${GSTREAMER_riff_LIBRARIES} ${GSTREAMER_pbutils_LIBRARIES})
93-
set(GSTREAMER_INCLUDE_DIRS ${GSTREAMER_base_INCLUDE_DIRS} ${GSTREAMER_app_INCLUDE_DIRS} ${GSTREAMER_riff_INCLUDE_DIRS} ${GSTREAMER_pbutils_INCLUDE_DIRS})
99+
set(GSTREAMER_LIBRARIES ${GSTREAMER_base_LIBRARIES} ${GSTREAMER_app_LIBRARIES} ${GSTREAMER_riff_LIBRARIES} ${GSTREAMER_pbutils_LIBRARIES} ${GSTREAMER_video_LIBRARIES})
100+
set(GSTREAMER_INCLUDE_DIRS ${GSTREAMER_base_INCLUDE_DIRS} ${GSTREAMER_app_INCLUDE_DIRS} ${GSTREAMER_riff_INCLUDE_DIRS} ${GSTREAMER_pbutils_INCLUDE_DIRS} ${GSTREAMER_video_INCLUDE_DIRS})
94101
endif()
95102
endif()
96103

0 commit comments

Comments
 (0)