Skip to content

O
opencv
Commit 95f948a9 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #11685 from alalek:videoio_fix_backend_modes

parents 03d3966d d041b0a5
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
modules/videoio/src/videoio_registry.cpp
View file @ 95f948a9
...@@ -70,7 +70,7 @@ static const struct VideoBackendInfo builtin_backends[] = ...@@ -70,7 +70,7 @@ static const struct VideoBackendInfo builtin_backends[] =
// Windows // Windows
#ifdef WINRT_VIDEO #ifdef WINRT_VIDEO
DECLARE_BACKEND(CAP_WINRT, "WINRT", MODE_CAPTURE_BY_FILENAME), DECLARE_BACKEND(CAP_WINRT, "WINRT", MODE_CAPTURE_BY_INDEX),
#endif #endif
#ifdef HAVE_MSMF #ifdef HAVE_MSMF
DECLARE_BACKEND(CAP_MSMF, "MSMF", MODE_CAPTURE_ALL | MODE_WRITER), DECLARE_BACKEND(CAP_MSMF, "MSMF", MODE_CAPTURE_ALL | MODE_WRITER),
...@@ -79,7 +79,7 @@ static const struct VideoBackendInfo builtin_backends[] = ...@@ -79,7 +79,7 @@ static const struct VideoBackendInfo builtin_backends[] =
DECLARE_BACKEND(CAP_VFW, "VFW", MODE_CAPTURE_ALL | MODE_WRITER), DECLARE_BACKEND(CAP_VFW, "VFW", MODE_CAPTURE_ALL | MODE_WRITER),
#endif #endif
#ifdef HAVE_DSHOW #ifdef HAVE_DSHOW
DECLARE_BACKEND(CAP_DSHOW, "DSHOW", MODE_CAPTURE_ALL), DECLARE_BACKEND(CAP_DSHOW, "DSHOW", MODE_CAPTURE_BY_INDEX),
#endif #endif
// Linux, some Unix // Linux, some Unix
...@@ -98,7 +98,7 @@ static const struct VideoBackendInfo builtin_backends[] = ...@@ -98,7 +98,7 @@ static const struct VideoBackendInfo builtin_backends[] =
DECLARE_BACKEND(CAP_OPENNI2, "OPENNI2", MODE_CAPTURE_ALL), DECLARE_BACKEND(CAP_OPENNI2, "OPENNI2", MODE_CAPTURE_ALL),
#endif #endif
#ifdef HAVE_INTELPERC #ifdef HAVE_INTELPERC
DECLARE_BACKEND(CAP_INTELPERC, "INTEL_PERC", MODE_CAPTURE_ALL), DECLARE_BACKEND(CAP_INTELPERC, "INTEL_PERC", MODE_CAPTURE_BY_INDEX),
#endif #endif
// OpenCV file-based only // OpenCV file-based only
...@@ -107,23 +107,23 @@ static const struct VideoBackendInfo builtin_backends[] = ...@@ -107,23 +107,23 @@ static const struct VideoBackendInfo builtin_backends[] =
// special interfaces / stereo cameras / other SDKs // special interfaces / stereo cameras / other SDKs
#if defined(HAVE_DC1394_2) || defined(HAVE_DC1394) || defined(HAVE_CMU1394) #if defined(HAVE_DC1394_2) || defined(HAVE_DC1394) || defined(HAVE_CMU1394)
DECLARE_BACKEND(CAP_FIREWIRE, "FIREWIRE", MODE_CAPTURE_ALL), DECLARE_BACKEND(CAP_FIREWIRE, "FIREWIRE", MODE_CAPTURE_BY_INDEX),
#endif #endif
// GigE // GigE
#ifdef HAVE_PVAPI #ifdef HAVE_PVAPI
DECLARE_BACKEND(CAP_PVAPI, "PVAPI", MODE_CAPTURE_ALL), DECLARE_BACKEND(CAP_PVAPI, "PVAPI", MODE_CAPTURE_BY_INDEX),
#endif #endif
#ifdef HAVE_XIMEA #ifdef HAVE_XIMEA
DECLARE_BACKEND(CAP_XIAPI, "XIMEA", MODE_CAPTURE_ALL), DECLARE_BACKEND(CAP_XIAPI, "XIMEA", MODE_CAPTURE_ALL),
#endif #endif
#ifdef HAVE_GIGE_API #ifdef HAVE_GIGE_API
DECLARE_BACKEND(CAP_GIGANETIX, "GIGANETIX", MODE_CAPTURE_ALL), DECLARE_BACKEND(CAP_GIGANETIX, "GIGANETIX", MODE_CAPTURE_BY_INDEX),
#endif #endif
#ifdef HAVE_ARAVIS_API #ifdef HAVE_ARAVIS_API
DECLARE_BACKEND(CAP_ARAVIS, "ARAVIS", MODE_CAPTURE_ALL), DECLARE_BACKEND(CAP_ARAVIS, "ARAVIS", MODE_CAPTURE_BY_INDEX),
#endif #endif
#ifdef HAVE_UNICAP #ifdef HAVE_UNICAP
DECLARE_BACKEND(CAP_UNICAP, "UNICAP", MODE_CAPTURE_BY_FILENAME), DECLARE_BACKEND(CAP_UNICAP, "UNICAP", MODE_CAPTURE_BY_INDEX),
#endif #endif
#ifdef HAVE_GPHOTO2 #ifdef HAVE_GPHOTO2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment