Merge pull request #19809 from alalek:issue_19513

4 years ago · 53a16b1186
parent 6f1eefec69 40c0830b63
commit 53a16b1186
2 changed files with 4 additions and 3 deletions
--- a/modules/videoio/src/cap_avfoundation.mm
+++ b/modules/videoio/src/cap_avfoundation.mm
@ -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;
--- a/modules/videoio/src/cap_avfoundation_mac.mm
+++ b/modules/videoio/src/cap_avfoundation_mac.mm
@ -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;