potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #19809 from alalek:issue_19513

Browse Source
This commit is contained in:
Alexander Alekhin
2021-03-31 10:50:20 +00:00
parent 6f1eefec69 40c0830b63
commit 53a16b1186
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/src/cap_avfoundation.mm
+2 -1
View File
@@ -96,7 +96,7 @@ class CvCaptureCAM : public CvCapture {
virtual double getProperty(int property_id) const;
virtual bool setProperty(int property_id, double value);
virtual int didStart();
int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
private:
AVCaptureSession *mCaptureSession;
AVCaptureDeviceInput *mCaptureDeviceInput;
@@ -137,6 +137,7 @@ public:
virtual double getProperty(int property_id) const;
virtual bool setProperty(int property_id, double value);
virtual int didStart();
int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
private:
AVAsset *mAsset;
AVAssetTrack *mAssetTrack;
modules/videoio/src/cap_avfoundation_mac.mm
+2 -2
View File
@@ -99,7 +99,7 @@ public:
virtual double getProperty(int property_id) const;
virtual bool setProperty(int property_id, double value);
virtual int didStart();
int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
private:
AVCaptureSession *mCaptureSession;
@@ -141,7 +141,7 @@ public:
virtual double getProperty(int property_id) const;
virtual bool setProperty(int property_id, double value);
virtual int didStart();
int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
private:
AVAsset *mAsset;