diff --git a/modules/videoio/src/cap_avfoundation.mm b/modules/videoio/src/cap_avfoundation.mm index 1ff612e231..650bad2b25 100644 --- a/modules/videoio/src/cap_avfoundation.mm +++ b/modules/videoio/src/cap_avfoundation.mm @@ -90,13 +90,14 @@ class CvCaptureCAM : public CvCapture { public: CvCaptureCAM(int cameraNum = -1) ; ~CvCaptureCAM(); - virtual bool grabFrame(); - virtual IplImage* retrieveFrame(int); + bool grabFrame() CV_OVERRIDE; + IplImage* retrieveFrame(int) CV_OVERRIDE; + double getProperty(int property_id) const CV_OVERRIDE; + bool setProperty(int property_id, double value) CV_OVERRIDE; + int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; } + virtual IplImage* queryFrame(); - 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; @@ -132,12 +133,13 @@ class CvCaptureFile : public CvCapture { public: CvCaptureFile(const char* filename) ; ~CvCaptureFile(); - virtual bool grabFrame(); - virtual IplImage* retrieveFrame(int); - virtual double getProperty(int property_id) const; - virtual bool setProperty(int property_id, double value); - virtual int didStart(); + bool grabFrame() CV_OVERRIDE; + IplImage* retrieveFrame(int) CV_OVERRIDE; + double getProperty(int property_id) const CV_OVERRIDE; + bool setProperty(int property_id, double value) CV_OVERRIDE; int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; } + + virtual int didStart(); private: AVAsset *mAsset; AVAssetTrack *mAssetTrack; diff --git a/modules/videoio/src/cap_avfoundation_mac.mm b/modules/videoio/src/cap_avfoundation_mac.mm index 55872539ad..3049b4ba6e 100644 --- a/modules/videoio/src/cap_avfoundation_mac.mm +++ b/modules/videoio/src/cap_avfoundation_mac.mm @@ -94,13 +94,14 @@ class CvCaptureCAM : public CvCapture { public: CvCaptureCAM(int cameraNum = -1) ; ~CvCaptureCAM(); - virtual bool grabFrame(); - virtual IplImage* retrieveFrame(int); - virtual double getProperty(int property_id) const; - virtual bool setProperty(int property_id, double value); - virtual int didStart(); + bool grabFrame() CV_OVERRIDE; + IplImage* retrieveFrame(int) CV_OVERRIDE; + double getProperty(int property_id) const CV_OVERRIDE; + bool setProperty(int property_id, double value) CV_OVERRIDE; int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; } + virtual int didStart(); + private: AVCaptureSession *mCaptureSession; AVCaptureDeviceInput *mCaptureDeviceInput; @@ -136,13 +137,14 @@ class CvCaptureFile : public CvCapture { public: CvCaptureFile(const char* filename) ; ~CvCaptureFile(); - virtual bool grabFrame(); - virtual IplImage* retrieveFrame(int); - virtual double getProperty(int property_id) const; - virtual bool setProperty(int property_id, double value); - virtual int didStart(); + bool grabFrame() CV_OVERRIDE; + IplImage* retrieveFrame(int) CV_OVERRIDE; + double getProperty(int property_id) const CV_OVERRIDE; + bool setProperty(int property_id, double value) CV_OVERRIDE; int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; } + virtual int didStart(); + private: AVAsset *mAsset; AVAssetTrack *mAssetTrack;