Split highgui module to videoio and highgui

samples/cpp/CMakeLists.txt

@@ -4,8 +4,9 @@
 # ----------------------------------------------------------------------------
 
 SET(OPENCV_CPP_SAMPLES_REQUIRED_DEPS opencv_core opencv_imgproc opencv_flann
-    opencv_imgcodecs opencv_highgui opencv_ml opencv_video opencv_objdetect opencv_photo opencv_nonfree
-    opencv_features2d opencv_calib3d opencv_stitching opencv_videostab opencv_shape)
+    opencv_imgcodecs opencv_videoio opencv_highgui opencv_ml opencv_video
+    opencv_objdetect opencv_photo opencv_nonfree opencv_features2d opencv_calib3d
+    opencv_stitching opencv_videostab opencv_shape)
 
 ocv_check_dependencies(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS})
 

samples/cpp/bgfg_gmg.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "opencv2/video.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include <opencv2/core/utility.hpp>
 #include <iostream>

samples/cpp/bgfg_segm.cpp

@@ -2,6 +2,7 @@
 #include <opencv2/core/utility.hpp>
 #include "opencv2/imgproc.hpp"
 #include "opencv2/video/background_segm.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include <stdio.h>
 

samples/cpp/calibration.cpp

@@ -3,6 +3,7 @@
 #include "opencv2/imgproc.hpp"
 #include "opencv2/calib3d.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 
 #include <cctype>

samples/cpp/camshiftdemo.cpp

@@ -1,6 +1,7 @@
 #include <opencv2/core/utility.hpp>
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/imgproc.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 
 #include <iostream>

samples/cpp/dbt_face_detection.cpp

@@ -2,6 +2,7 @@
 
 #include <opencv2/imgproc/imgproc.hpp>  // Gaussian Blur
 #include <opencv2/core/core.hpp>        // Basic OpenCV structures (cv::Mat, Scalar)
+#include <opencv2/videoio/videoio.hpp>
 #include <opencv2/highgui/highgui.hpp>  // OpenCV window I/O
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/objdetect/objdetect.hpp>

samples/cpp/facedetect.cpp

@@ -1,9 +1,11 @@
 #include "opencv2/objdetect.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/core/utility.hpp"
 
+#include "opencv2/videoio/videoio_c.h"
 #include "opencv2/highgui/highgui_c.h"
 
 #include <cctype>

samples/cpp/fback.cpp

@@ -1,5 +1,6 @@
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
 #include <iostream>

samples/cpp/ffilldemo.cpp

@@ -1,5 +1,6 @@
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
 #include <iostream>

samples/cpp/image_sequence.cpp

@@ -1,4 +1,5 @@
 #include <opencv2/core/core.hpp>
+#include <opencv2/videoio/videoio.hpp>
 #include <opencv2/highgui/highgui.hpp>
 
 #include <iostream>

samples/cpp/intelperc_capture.cpp

@@ -1,6 +1,7 @@
 // testOpenCVCam.cpp : Defines the entry point for the console application.
 //
 
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
 #include <iostream>

samples/cpp/laplace.cpp

@@ -1,3 +1,4 @@
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 

samples/cpp/linemod.cpp

@@ -3,6 +3,7 @@
 #include <opencv2/imgproc/imgproc_c.h> // cvFindContours
 #include <opencv2/imgproc.hpp>
 #include <opencv2/objdetect.hpp>
+#include <opencv2/videoio.hpp>
 #include <opencv2/highgui.hpp>
 #include <iterator>
 #include <set>

samples/cpp/lkdemo.cpp

@@ -1,5 +1,6 @@
 #include "opencv2/video/tracking.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 
 #include <iostream>

samples/cpp/motempl.cpp

@@ -1,5 +1,6 @@
 #include "opencv2/video/tracking_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
+#include "opencv2/videoio/videoio_c.h"
 #include "opencv2/highgui/highgui_c.h"
 #include <time.h>
 #include <stdio.h>

samples/cpp/openni_capture.cpp

@@ -1,3 +1,4 @@
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 

samples/cpp/phase_corr.cpp

@@ -1,4 +1,5 @@
 #include "opencv2/core/core.hpp"
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 

samples/cpp/polar_transforms.cpp

@@ -1,4 +1,5 @@
 #include "opencv2/imgproc/imgproc_c.h"
+#include "opencv2/videoio/videoio_c.h"
 #include "opencv2/highgui/highgui_c.h"
 
 #include <ctype.h>

samples/cpp/segment_objects.cpp

@@ -1,4 +1,5 @@
 #include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/video/background_segm.hpp"
 #include <stdio.h>

samples/cpp/select3dobj.cpp

@@ -13,6 +13,7 @@
 #include "opencv2/imgproc.hpp"
 #include "opencv2/calib3d.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 
 #include <ctype.h>

samples/cpp/smiledetect.cpp

@@ -3,6 +3,7 @@
 #include "opencv2/imgproc.hpp"
 #include "opencv2/core/utility.hpp"
 
+#include "opencv2/videoio/videoio_c.h"
 #include "opencv2/highgui/highgui_c.h"
 
 #include <cctype>

samples/cpp/starter_video.cpp

@@ -12,6 +12,7 @@
 */
 
 #include <opencv2/imgcodecs.hpp>
+#include <opencv2/videoio/videoio.hpp>
 #include <opencv2/highgui/highgui.hpp>
 
 #include <iostream>

samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video-input-psnr-ssim.cpp

@@ -5,6 +5,7 @@
 
 #include <opencv2/core/core.hpp>        // Basic OpenCV structures (cv::Mat, Scalar)
 #include <opencv2/imgproc/imgproc.hpp>  // Gaussian Blur
+#include <opencv2/videoio/videoio.hpp>
 #include <opencv2/highgui/highgui.hpp>  // OpenCV window I/O
 
 using namespace std;

samples/cpp/tutorial_code/HighGUI/video-write/video-write.cpp

@@ -2,7 +2,7 @@
 #include <string>   // for strings
 
 #include <opencv2/core/core.hpp>        // Basic OpenCV structures (cv::Mat)
-#include <opencv2/highgui/highgui.hpp>  // Video write
+#include <opencv2/videoio/videoio.hpp>  // Video write
 
 using namespace std;
 using namespace cv;

samples/cpp/tutorial_code/calib3d/camera_calibration/camera_calibration.cpp

@@ -7,7 +7,8 @@
 #include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/calib3d.hpp>
-#include "opencv2/imgcodecs.hpp"
+#include <opencv2/imgcodecs.hpp>
+#include <opencv2/videoio.hpp>
 #include <opencv2/highgui.hpp>
 
 #ifndef _CRT_SECURE_NO_WARNINGS

samples/cpp/tutorial_code/objectDetection/objectDetection.cpp

@@ -1,4 +1,5 @@
 #include "opencv2/objdetect.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
 

samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp

@@ -4,6 +4,7 @@
  * @brief A simplified version of facedetect.cpp, show how to load a cascade classifier and how to find objects (Face + eyes) in a video stream - Using LBP here
  */
 #include "opencv2/objdetect.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
 

samples/cpp/tutorial_code/video/bg_sub.cpp

@@ -6,6 +6,7 @@
 
 //opencv
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio.hpp"
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/video/background_segm.hpp>
 //C

samples/cpp/ufacedetect.cpp

@@ -1,5 +1,6 @@
 #include "opencv2/objdetect.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/core/utility.hpp"

samples/cpp/video_homography.cpp

@@ -6,6 +6,7 @@
 */
 
 #include "opencv2/calib3d/calib3d.hpp"
+#include "opencv2/videoio/videoio.hpp"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/features2d/features2d.hpp"

samples/cpp/videostab.cpp

@@ -7,6 +7,7 @@
 #include <opencv2/core/utility.hpp>
 #include "opencv2/video.hpp"
 #include "opencv2/imgproc.hpp"
+#include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/videostab.hpp"
 #include "opencv2/opencv_modules.hpp"