Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19827 from alalek:build_videoio_macosx_override_3.4

Browse Source
pull/19834/head
Alexander Alekhin 4 years ago
parent 7f664850f5 4ae2c11520
commit 6865787a75
2 changed files with 24 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      modules/videoio/src/cap_avfoundation.mm
  2. 22
      modules/videoio/src/cap_avfoundation_mac.mm

22
modules/videoio/src/cap_avfoundation.mm
Unescape 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;
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 IplImage* queryFrame();
virtual double getProperty(int property_id) const;
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;
@ -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
Unescape 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;

Write Preview
Loading…
Cancel
Save