mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19827 from alalek:build_videoio_macosx_override_3.4

Browse Source
This commit is contained in:
Alexander Alekhin 2021-04-01 12:34:23 +00:00
commit 6865787a75
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,13 +90,14 @@ class CvCaptureCAM : public CvCapture {
public: public:
CvCaptureCAM(int cameraNum = -1) ; CvCaptureCAM(int cameraNum = -1) ;
~CvCaptureCAM(); ~CvCaptureCAM();
virtual bool grabFrame(); bool grabFrame() CV_OVERRIDE;
virtual IplImage* retrieveFrame(int); IplImage* retrieveFrame(int) CV_OVERRIDE;
virtual IplImage* queryFrame(); double getProperty(int property_id) const CV_OVERRIDE;
virtual double getProperty(int property_id) const; bool setProperty(int property_id, double value) CV_OVERRIDE;
virtual bool setProperty(int property_id, double value);
virtual int didStart();
int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; } int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
virtual IplImage* queryFrame();
virtual int didStart();
private: private:
AVCaptureSession *mCaptureSession; AVCaptureSession *mCaptureSession;
AVCaptureDeviceInput *mCaptureDeviceInput; AVCaptureDeviceInput *mCaptureDeviceInput;
@ -132,12 +133,13 @@ class CvCaptureFile : public CvCapture {
public: public:
CvCaptureFile(const char* filename) ; CvCaptureFile(const char* filename) ;
~CvCaptureFile(); ~CvCaptureFile();
virtual bool grabFrame(); bool grabFrame() CV_OVERRIDE;
virtual IplImage* retrieveFrame(int); IplImage* retrieveFrame(int) CV_OVERRIDE;
virtual double getProperty(int property_id) const; double getProperty(int property_id) const CV_OVERRIDE;
virtual bool setProperty(int property_id, double value); bool setProperty(int property_id, double value) CV_OVERRIDE;
virtual int didStart();
int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; } int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
virtual int didStart();
private: private:
AVAsset *mAsset; AVAsset *mAsset;
AVAssetTrack *mAssetTrack; AVAssetTrack *mAssetTrack;

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

@ -94,13 +94,14 @@ class CvCaptureCAM : public CvCapture {
public: public:
CvCaptureCAM(int cameraNum = -1) ; CvCaptureCAM(int cameraNum = -1) ;
~CvCaptureCAM(); ~CvCaptureCAM();
virtual bool grabFrame(); bool grabFrame() CV_OVERRIDE;
virtual IplImage* retrieveFrame(int); IplImage* retrieveFrame(int) CV_OVERRIDE;
virtual double getProperty(int property_id) const; double getProperty(int property_id) const CV_OVERRIDE;
virtual bool setProperty(int property_id, double value); bool setProperty(int property_id, double value) CV_OVERRIDE;
virtual int didStart();
int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; } int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
virtual int didStart();
private: private:
AVCaptureSession *mCaptureSession; AVCaptureSession *mCaptureSession;
AVCaptureDeviceInput *mCaptureDeviceInput; AVCaptureDeviceInput *mCaptureDeviceInput;
@ -136,13 +137,14 @@ class CvCaptureFile : public CvCapture {
public: public:
CvCaptureFile(const char* filename) ; CvCaptureFile(const char* filename) ;
~CvCaptureFile(); ~CvCaptureFile();
virtual bool grabFrame(); bool grabFrame() CV_OVERRIDE;
virtual IplImage* retrieveFrame(int); IplImage* retrieveFrame(int) CV_OVERRIDE;
virtual double getProperty(int property_id) const; double getProperty(int property_id) const CV_OVERRIDE;
virtual bool setProperty(int property_id, double value); bool setProperty(int property_id, double value) CV_OVERRIDE;
virtual int didStart();
int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; } int getCaptureDomain() /*const*/ CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
virtual int didStart();
private: private:
AVAsset *mAsset; AVAsset *mAsset;
AVAssetTrack *mAssetTrack; AVAssetTrack *mAssetTrack;