1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

This commit is contained in:
Alexander Alekhin
2018-09-28 12:48:51 +03:00
77 changed files with 586 additions and 443 deletions
@@ -169,6 +169,7 @@ enum VideoCaptureProperties {
CAP_PROP_AUTOFOCUS =39,
CAP_PROP_SAR_NUM =40, //!< Sample aspect ratio: num/den (num)
CAP_PROP_SAR_DEN =41, //!< Sample aspect ratio: num/den (den)
CAP_PROP_BACKEND =42, //!< current backend (enum VideoCaptureAPIs). Read-only property
#ifndef CV_DOXYGEN
CV__CAP_PROP_LATEST
#endif
@@ -808,6 +809,12 @@ public:
*/
CV_WRAP virtual bool open(const String& filename, int apiPreference);
/** @brief Returns used backend API name
@note Stream should be opened.
*/
CV_WRAP String getBackendName() const;
protected:
Ptr<CvCapture> cap;
Ptr<IVideoCapture> icap;
@@ -946,6 +953,12 @@ public:
*/
CV_WRAP static int fourcc(char c1, char c2, char c3, char c4);
/** @brief Returns used backend API name
@note Stream should be opened.
*/
CV_WRAP String getBackendName() const;
protected:
Ptr<CvVideoWriter> writer;
Ptr<IVideoWriter> iwriter;