Merge pull request #11092 from terfendail:msmf_videocapture

Update for MSMF-based VideoCapture and VideoWriter (#11092)

* MSMF based VideoCapture updated to handle video stream formats different from RGB24

* MSMF based VideoWriter updated to handle video frame top-bottom line ordering regardless of output format

* Fixed race condition in MSMF based VideoCapture

* Refactored MSMF based VideoCapture and VideoWriter

* Disabled frame rate estimation for MP43

* Removed test for unsupported avi container from MSMF VideoWriter tests

* Enabled MSMF-based VideoIO by default

CMakeLists.txt

@@ -261,7 +261,7 @@ OCV_OPTION(WITH_UNICAP         "Include Unicap support (GPL)"                OFF
 OCV_OPTION(WITH_V4L            "Include Video 4 Linux support"               ON   IF (UNIX AND NOT ANDROID AND NOT APPLE) )
 OCV_OPTION(WITH_LIBV4L         "Use libv4l for Video 4 Linux support"        OFF  IF (UNIX AND NOT ANDROID AND NOT APPLE) )
 OCV_OPTION(WITH_DSHOW          "Build VideoIO with DirectShow support"       ON   IF (WIN32 AND NOT ARM AND NOT WINRT) )
-OCV_OPTION(WITH_MSMF           "Build VideoIO with Media Foundation support" OFF  IF WIN32 )
+OCV_OPTION(WITH_MSMF           "Build VideoIO with Media Foundation support" ON  IF WIN32 )
 OCV_OPTION(WITH_XIMEA          "Include XIMEA cameras support"               OFF  IF (NOT ANDROID AND NOT WINRT) )
 OCV_OPTION(WITH_XINE           "Include Xine support (GPL)"                  OFF  IF (UNIX AND NOT APPLE AND NOT ANDROID) )
 OCV_OPTION(WITH_CLP            "Include Clp support (EPL)"                   OFF)

modules/videoio/src/cap.cpp

@@ -305,15 +305,11 @@ CV_IMPL CvCapture * cvCreateFileCaptureWithPreference (const char * filename, in
         if (apiPreference) break;
 #endif
 
-    case CAP_VFW:
-#ifdef HAVE_VFW
-        TRY_OPEN(result, cvCreateFileCapture_VFW (filename))
-#endif
-
 #if defined HAVE_LIBV4L || defined HAVE_CAMV4L || defined HAVE_CAMV4L2 || defined HAVE_VIDEOIO
+    case CAP_V4L:
         TRY_OPEN(result, cvCreateCameraCapture_V4L(filename))
-#endif
         if (apiPreference) break;
+#endif
 
     case CAP_MSMF:
 #ifdef HAVE_MSMF
@@ -325,6 +321,12 @@ CV_IMPL CvCapture * cvCreateFileCaptureWithPreference (const char * filename, in
 #endif
         if (apiPreference) break;
 
+#ifdef HAVE_VFW
+    case CAP_VFW:
+        TRY_OPEN(result, cvCreateFileCapture_VFW (filename))
+        if (apiPreference) break;
+#endif
+
 #ifdef HAVE_GSTREAMER
     case CAP_GSTREAMER:
         TRY_OPEN(result, cvCreateCapture_GStreamer (CV_CAP_GSTREAMER_FILE, filename))
@@ -398,16 +400,16 @@ static CvVideoWriter* cvCreateVideoWriterWithPreference(const char* filename, in
             TRY_OPEN(result, cvCreateVideoWriter_FFMPEG_proxy (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))
-            if (apiPreference != CAP_ANY) break;
-        #endif
         #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))
+            if (apiPreference != CAP_ANY) break;
+        #endif
         #ifdef HAVE_AVFOUNDATION
         case CAP_AVFOUNDATION:
             TRY_OPEN(result, cvCreateVideoWriter_AVFoundation(filename, fourcc, fps, frameSize, is_color))

modules/videoio/test/test_video_io.cpp

@@ -375,8 +375,7 @@ Ext_Fourcc_PSNR synthetic_params[] = {
 #endif
     makeParam("wmv", "WMV3", 30.f, CAP_MSMF),
     makeParam("wmv", "WVC1", 30.f, CAP_MSMF),
-    makeParam("avi", "H264", 30.f, CAP_MSMF),
-    makeParam("avi", "MJPG", 30.f, CAP_MSMF),
+    makeParam("mov", "H264", 30.f, CAP_MSMF),
 #endif
 
 #ifdef HAVE_VFW