Merge pull request #26601 from dai-xin:4.x

asmorkalov · web-flow · commit 4a4031dc4847 · 2025-01-22T20:48:29.000+03:00
VideoCapture open camera slow
diff --git a/modules/videoio/src/cap_dshow.cpp b/modules/videoio/src/cap_dshow.cpp
@@ -3360,7 +3360,7 @@ namespace cv
 {
 videoInput VideoCapture_DShow::g_VI;
 
-VideoCapture_DShow::VideoCapture_DShow(int index)
+VideoCapture_DShow::VideoCapture_DShow(int index, const VideoCaptureParameters& params)
     : m_index(-1)
     , m_width(-1)
     , m_height(-1)
@@ -3370,6 +3370,16 @@ VideoCapture_DShow::VideoCapture_DShow(int index)
     , m_convertRGBSet(true)
 {
     CoInitialize(0);
+
+    if (!params.empty()) {
+        int tmpW = params.get<int>(CV_CAP_PROP_FRAME_WIDTH, -1);
+        int tmpH = params.get<int>(CV_CAP_PROP_FRAME_HEIGHT, -1);
+        int tmpFOURCC = params.get<int>(CV_CAP_PROP_FOURCC, -1);
+        if (tmpW != -1 && tmpH != -1) {
+            g_VI.setupDeviceFourcc(index, tmpW, tmpH, tmpFOURCC);
+        }
+    }
+
     open(index);
 }
 VideoCapture_DShow::~VideoCapture_DShow()
@@ -3675,9 +3685,9 @@ void VideoCapture_DShow::close()
     m_convertRGBSet = true;
 }
 
-Ptr<IVideoCapture> create_DShow_capture(int index)
+Ptr<IVideoCapture> create_DShow_capture(int index, const VideoCaptureParameters& params)
 {
-    return makePtr<VideoCapture_DShow>(index);
+    return makePtr<VideoCapture_DShow>(index, params);
 }
 
 
diff --git a/modules/videoio/src/cap_dshow.hpp b/modules/videoio/src/cap_dshow.hpp
@@ -21,7 +21,7 @@ namespace cv
 class VideoCapture_DShow : public IVideoCapture
 {
 public:
-    VideoCapture_DShow(int index);
+    VideoCapture_DShow(int index, const VideoCaptureParameters& params);
     virtual ~VideoCapture_DShow();
 
     virtual double getProperty(int propIdx) const CV_OVERRIDE;
diff --git a/modules/videoio/src/cap_interface.hpp b/modules/videoio/src/cap_interface.hpp
@@ -358,7 +358,7 @@ Ptr<IVideoWriter> cvCreateVideoWriter_MSMF(const std::string& filename, int four
                                            double fps, const Size& frameSize,
                                            const VideoWriterParameters& params);
 
-Ptr<IVideoCapture> create_DShow_capture(int index);
+Ptr<IVideoCapture> create_DShow_capture(int index, const VideoCaptureParameters& params);
 
 Ptr<IVideoCapture> create_V4L_capture_cam(int index);
 Ptr<IVideoCapture> create_V4L_capture_file(const std::string &filename);

Original file line number	Diff line number	Diff line change
`@@ -3360,7 +3360,7 @@ namespace cv`
`3360`	`3360`	`{`
`3361`	`3361`	`videoInput VideoCapture_DShow::g_VI;`
`3362`	`3362`
`3363`		`-VideoCapture_DShow::VideoCapture_DShow(int index)`
	`3363`	`+VideoCapture_DShow::VideoCapture_DShow(int index, const VideoCaptureParameters& params)`
`3364`	`3364`	`: m_index(-1)`
`3365`	`3365`	`, m_width(-1)`
`3366`	`3366`	`, m_height(-1)`
`@@ -3370,6 +3370,16 @@ VideoCapture_DShow::VideoCapture_DShow(int index)`
`3370`	`3370`	`, m_convertRGBSet(true)`
`3371`	`3371`	`{`
`3372`	`3372`	`CoInitialize(0);`
	`3373`	`+`
	`3374`	`+ if (!params.empty()) {`
	`3375`	`+ int tmpW = params.get<int>(CV_CAP_PROP_FRAME_WIDTH, -1);`
	`3376`	`+ int tmpH = params.get<int>(CV_CAP_PROP_FRAME_HEIGHT, -1);`
	`3377`	`+ int tmpFOURCC = params.get<int>(CV_CAP_PROP_FOURCC, -1);`
	`3378`	`+ if (tmpW != -1 && tmpH != -1) {`
	`3379`	`+ g_VI.setupDeviceFourcc(index, tmpW, tmpH, tmpFOURCC);`
	`3380`	`+ }`
	`3381`	`+ }`
	`3382`	`+`
`3373`	`3383`	`open(index);`
`3374`	`3384`	`}`
`3375`	`3385`	`VideoCapture_DShow::~VideoCapture_DShow()`
`@@ -3675,9 +3685,9 @@ void VideoCapture_DShow::close()`
`3675`	`3685`	`m_convertRGBSet = true;`
`3676`	`3686`	`}`
`3677`	`3687`
`3678`		`-Ptr<IVideoCapture> create_DShow_capture(int index)`
	`3688`	`+Ptr<IVideoCapture> create_DShow_capture(int index, const VideoCaptureParameters& params)`
`3679`	`3689`	`{`
`3680`		`- return makePtr<VideoCapture_DShow>(index);`
	`3690`	`+ return makePtr<VideoCapture_DShow>(index, params);`
`3681`	`3691`	`}`
`3682`	`3692`
`3683`	`3693`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace cv`
`21`	`21`	`class VideoCapture_DShow : public IVideoCapture`
`22`	`22`	`{`
`23`	`23`	`public:`
`24`		`- VideoCapture_DShow(int index);`
	`24`	`+ VideoCapture_DShow(int index, const VideoCaptureParameters& params);`
`25`	`25`	`virtual ~VideoCapture_DShow();`
`26`	`26`
`27`	`27`	`virtual double getProperty(int propIdx) const CV_OVERRIDE;`