Merge pull request #8985 from alalek:update_videoio

modules/videoio/include/opencv2/videoio.hpp

@@ -115,7 +115,7 @@ enum VideoCaptureAPIs {
        CAP_FFMPEG       = 1900,         //!< Open and record video file or stream using the FFMPEG library
        CAP_IMAGES       = 2000,         //!< OpenCV Image Sequence (e.g. img_%02d.jpg)
        CAP_ARAVIS       = 2100,         //!< Aravis SDK
-       CAP_OCV_MJPEG    = 2200,         //!< Built-in MotionJPEG codec
+       CAP_OPENCV_MJPEG = 2200,         //!< Built-in OpenCV MotionJPEG codec
        CAP_INTEL_MFX    = 2300          //!< Intel MediaSDK
      };
 

modules/videoio/include/opencv2/videoio/videoio_c.h

@@ -124,8 +124,7 @@ enum
     CV_CAP_FFMPEG = 1900,    // FFMPEG
     CV_CAP_IMAGES = 2000,    // OpenCV Image Sequence (e.g. img_%02d.jpg)
 
-    CV_CAP_ARAVIS = 2100,     // Aravis GigE SDK
-    CV_CAP_OCV_MJPEG = 2200   // Built-in MotionJPEG codec
+    CV_CAP_ARAVIS = 2100     // Aravis GigE SDK
 };
 
 /** @brief start capturing frames from camera: index = camera_index + domain_offset (CV_CAP_*)

modules/videoio/misc/gen_dict.json

 {
     "const_ignore_list": [
         "CV_CAP_OPENNI",
+        "CV_CAP_OPENNI2",
         "CV_CAP_PROP_OPENNI_",
         "CV_CAP_INTELPERC",
         "CV_CAP_PROP_INTELPERC_",
@@ -20,6 +21,7 @@
         "CV_CAP_UNICAP",
         "CV_CAP_DSHOW",
         "CV_CAP_PVAPI",
+        "CV_CAP_ARAVIS",
         "CV_CAP_PROP_DC1394_OFF",
         "CV_CAP_PROP_DC1394_MODE_MANUAL",
         "CV_CAP_PROP_DC1394_MODE_AUTO",

modules/videoio/src/cap_aravis.cpp

@@ -109,7 +109,7 @@ public:
     virtual IplImage* retrieveFrame(int);
     virtual int getCaptureDomain()
     {
-        return CV_CAP_ARAVIS;
+        return cv::CAP_ARAVIS;
     }
 
 protected:

modules/videoio/src/precomp.hpp

@@ -90,7 +90,7 @@ struct CvCapture
     virtual bool setProperty(int, double) { return 0; }
     virtual bool grabFrame() { return true; }
     virtual IplImage* retrieveFrame(int) { return 0; }
-    virtual int getCaptureDomain() { return CV_CAP_ANY; } // Return the type of the capture object: CV_CAP_VFW, etc...
+    virtual int getCaptureDomain() { return cv::CAP_ANY; } // Return the type of the capture object: CAP_VFW, etc...
 };
 
 /*************************** CvVideoWriter structure ****************************/