mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-08 01:53:19 +08:00
Code Issues Actions Packages Projects 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
commit 53a16b1186
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/videoio/src/cap_avfoundation.mm
View File

@ -96,7 +96,7 @@ class CvCaptureCAM : public CvCapture {
virtual double getProperty(int property_id) const; virtual double getProperty(int property_id) const;
virtual bool setProperty(int property_id, double value); virtual bool setProperty(int property_id, double value);
virtual int didStart(); virtual int didStart();
int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
private: private:
AVCaptureSession *mCaptureSession; AVCaptureSession *mCaptureSession;
AVCaptureDeviceInput *mCaptureDeviceInput; AVCaptureDeviceInput *mCaptureDeviceInput;
@ -137,6 +137,7 @@ public:
virtual double getProperty(int property_id) const; virtual double getProperty(int property_id) const;
virtual bool setProperty(int property_id, double value); virtual bool setProperty(int property_id, double value);
virtual int didStart(); virtual int didStart();
int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
private: private:
AVAsset *mAsset; AVAsset *mAsset;
AVAssetTrack *mAssetTrack; AVAssetTrack *mAssetTrack;

4
modules/videoio/src/cap_avfoundation_mac.mm
View File

@ -99,7 +99,7 @@ public:
virtual double getProperty(int property_id) const; virtual double getProperty(int property_id) const;
virtual bool setProperty(int property_id, double value); virtual bool setProperty(int property_id, double value);
virtual int didStart(); virtual int didStart();
int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
private: private:
AVCaptureSession *mCaptureSession; AVCaptureSession *mCaptureSession;
@ -141,7 +141,7 @@ public:
virtual double getProperty(int property_id) const; virtual double getProperty(int property_id) const;
virtual bool setProperty(int property_id, double value); virtual bool setProperty(int property_id, double value);
virtual int didStart(); virtual int didStart();
int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
private: private:
AVAsset *mAsset; AVAsset *mAsset;