Merge pull request #11396 from terfendail:msmf_icapture

modules/videoio/src/cap.cpp

@@ -188,11 +188,6 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
         // bail out to let the user know that it is not available
         if (pref) break;
 
-#ifdef HAVE_MSMF
-    case CAP_MSMF:
-        TRY_OPEN(capture, cvCreateCameraCapture_MSMF(index))
-        if (pref) break;
-#endif
     case CAP_VFW: // or CAP_V4L or CAP_V4L2
 #ifdef HAVE_VFW
         TRY_OPEN(capture, cvCreateCameraCapture_VFW(index))
@@ -303,12 +298,6 @@ CV_IMPL CvCapture * cvCreateFileCaptureWithPreference (const char * filename, in
         if (apiPreference) break;
 #endif
 
-#ifdef HAVE_MSMF
-    case CAP_MSMF:
-        TRY_OPEN(result, cvCreateFileCapture_MSMF (filename))
-        if (apiPreference) break;
-#endif
-
 #ifdef HAVE_VFW
     case CAP_VFW:
         TRY_OPEN(result, cvCreateFileCapture_VFW (filename))
@@ -377,11 +366,6 @@ static CvVideoWriter* cvCreateVideoWriterWithPreference(const char* filename, in
         default:
             //exit if the specified API is unavaliable
             if (apiPreference != CAP_ANY) break;
-        #ifdef HAVE_MSMF
-        case CAP_MSMF:
-            TRY_OPEN(result, cvCreateVideoWriter_MSMF(filename, fourcc, fps, frameSize, is_color))
-            if (apiPreference != CAP_ANY) break;
-        #endif
         #ifdef HAVE_VFW
         case CAP_VFW:
             TRY_OPEN(result, cvCreateVideoWriter_VFW(filename, fourcc, fps, frameSize, is_color))
@@ -440,6 +424,9 @@ static Ptr<IVideoCapture> IVideoCapture_create(int index)
 #ifdef HAVE_GSTREAMER
         CAP_GSTREAMER,
 #endif
+#ifdef HAVE_MSMF
+        CAP_MSMF,
+#endif
 #ifdef HAVE_DSHOW
         CAP_DSHOW,
 #endif
@@ -468,6 +455,7 @@ static Ptr<IVideoCapture> IVideoCapture_create(int index)
     for (int i = 0; domains[i] >= 0; i++)
     {
 #if defined(HAVE_GSTREAMER)    || \
+    defined(HAVE_MSMF)         || \
     defined(HAVE_DSHOW)        || \
     defined(HAVE_INTELPERC)    || \
     defined(WINRT_VIDEO)       || \
@@ -482,6 +470,11 @@ static Ptr<IVideoCapture> IVideoCapture_create(int index)
                 capture = createGStreamerCapture(index);
                 break;
 #endif
+#ifdef HAVE_MSMF
+        case CAP_MSMF:
+            capture = cvCreateCapture_MSMF(index);
+            break; // CAP_MSMF
+#endif
 #ifdef HAVE_DSHOW
             case CAP_DSHOW:
                 capture = makePtr<VideoCapture_DShow>(index);
@@ -543,6 +536,14 @@ static Ptr<IVideoCapture> IVideoCapture_create(const String& filename, int apiPr
             return capture;
     }
 #endif
+#ifdef HAVE_MSMF
+    if (useAny || apiPreference == CAP_MSMF)
+    {
+        capture = cvCreateCapture_MSMF(filename);
+        if (capture && capture->isOpened())
+            return capture;
+    }
+#endif
 #ifdef HAVE_GPHOTO2
     if (useAny || apiPreference == CAP_GPHOTO2)
     {
@@ -581,6 +582,14 @@ static Ptr<IVideoWriter> IVideoWriter_create(const String& filename, int apiPref
             return iwriter;
     }
 #endif
+#ifdef HAVE_MSMF
+    if (apiPreference == CAP_MSMF || apiPreference == CAP_ANY)
+    {
+        iwriter = cvCreateVideoWriter_MSMF(filename, _fourcc, fps, frameSize, isColor);
+        if (!iwriter.empty())
+            return iwriter;
+    }
+#endif
 #ifdef HAVE_MFX
     if (apiPreference == CAP_INTEL_MFX || apiPreference == CAP_ANY)
     {

modules/videoio/src/precomp.hpp

@@ -116,10 +116,6 @@ CvVideoWriter* cvCreateVideoWriter_Win32( const char* filename, int fourcc,
 CvVideoWriter* cvCreateVideoWriter_VFW( const char* filename, int fourcc,
                                         double fps, CvSize frameSize, int is_color );
 CvCapture* cvCreateCameraCapture_DShow( int index );
-CvCapture* cvCreateCameraCapture_MSMF( int index );
-CvCapture* cvCreateFileCapture_MSMF (const char* filename);
-CvVideoWriter* cvCreateVideoWriter_MSMF( const char* filename, int fourcc,
-                                        double fps, CvSize frameSize, int is_color );
 CvCapture* cvCreateCameraCapture_OpenNI( int index );
 CvCapture* cvCreateCameraCapture_OpenNI2( int index );
 CvCapture* cvCreateFileCapture_OpenNI( const char* filename );
@@ -195,6 +191,10 @@ namespace cv
 
     Ptr<cv::IVideoCapture> cvCreateFileCapture_FFMPEG_proxy(const String& filename);
     Ptr<IVideoWriter> cvCreateVideoWriter_FFMPEG_proxy(const String& filename, int fourcc, double fps, Size frameSize, int isColor);
+
+    Ptr<IVideoCapture> cvCreateCapture_MSMF(int index);
+    Ptr<IVideoCapture> cvCreateCapture_MSMF(const String& filename);
+    Ptr<IVideoWriter> cvCreateVideoWriter_MSMF(const String& filename, int fourcc, double fps, Size frameSize, int is_color);
 }
 
 #endif /* __VIDEOIO_H_ */