generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

deny any other interfaces if someone is specified as preference

Browse Source 
it provides more expectable results to end-users.
based on feedback by Alexander Alekhin
This commit is contained in:
Pavel Rojtberg 2015-06-26 12:04:56 +02:00
parent 41d8c4d879
commit 2909e07cb2
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/videoio/src/cap.cpp
View File

@ -365,45 +365,64 @@ CV_IMPL CvCapture * cvCreateFileCaptureWithPreference (const char * filename, in
switch(apiPreference) { switch(apiPreference) {
default: default:
case CV_CAP_FFMPEG: // user specified an API we do not know
// bail out to let the user know that it is not available
if (apiPreference) break;
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
case CV_CAP_FFMPEG:
if (! result) if (! result)
result = cvCreateFileCapture_FFMPEG_proxy (filename); result = cvCreateFileCapture_FFMPEG_proxy (filename);
if (apiPreference) break;
#endif #endif
case CV_CAP_VFW:
#ifdef HAVE_VFW #ifdef HAVE_VFW
case CV_CAP_VFW:
if (! result) if (! result)
result = cvCreateFileCapture_VFW (filename); result = cvCreateFileCapture_VFW (filename);
if (apiPreference) break;
#endif #endif
case CV_CAP_MSMF: case CV_CAP_MSMF:
#ifdef HAVE_MSMF #ifdef HAVE_MSMF
if (! result) if (! result)
result = cvCreateFileCapture_MSMF (filename); result = cvCreateFileCapture_MSMF (filename);
#endif #endif
#ifdef HAVE_XINE #ifdef HAVE_XINE
if (! result) if (! result)
result = cvCreateFileCapture_XINE (filename); result = cvCreateFileCapture_XINE (filename);
#endif #endif
case CV_CAP_GSTREAMER: if (apiPreference) break;
#ifdef HAVE_GSTREAMER #ifdef HAVE_GSTREAMER
case CV_CAP_GSTREAMER:
if (! result) if (! result)
result = cvCreateCapture_GStreamer (CV_CAP_GSTREAMER_FILE, filename); result = cvCreateCapture_GStreamer (CV_CAP_GSTREAMER_FILE, filename);
if (apiPreference) break;
#endif #endif
case CV_CAP_QT:
#if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT) #if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT)
case CV_CAP_QT:
if (! result) if (! result)
result = cvCreateFileCapture_QT (filename); result = cvCreateFileCapture_QT (filename);
if (apiPreference) break;
#endif #endif
case CV_CAP_AVFOUNDATION:
#ifdef HAVE_AVFOUNDATION #ifdef HAVE_AVFOUNDATION
case CV_CAP_AVFOUNDATION:
if (! result) if (! result)
result = cvCreateFileCapture_AVFoundation (filename); result = cvCreateFileCapture_AVFoundation (filename);
if (apiPreference) break;
#endif #endif
case CV_CAP_OPENNI:
#ifdef HAVE_OPENNI #ifdef HAVE_OPENNI
case CV_CAP_OPENNI:
if (! result) if (! result)
result = cvCreateFileCapture_OpenNI (filename); result = cvCreateFileCapture_OpenNI (filename);
if (apiPreference) break;
#endif #endif
case CV_CAP_IMAGES: case CV_CAP_IMAGES:
if (! result) if (! result)
result = cvCreateFileCapture_Images (filename); result = cvCreateFileCapture_Images (filename);