potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

fourcc support, improved buffer handling, check if exposure, gain & fps properties are available

Browse Source
This commit is contained in:
ArkadiuszRaj
2016-10-09 16:58:30 +02:00
parent 48ae99ecef
commit 8bd595acfe
3 changed files with 131 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/include/opencv2/videoio.hpp
+2 -1
View File
@@ -113,7 +113,8 @@ enum VideoCaptureAPIs {
CAP_GPHOTO2 = 1700, //!< gPhoto2 connection
CAP_GSTREAMER = 1800, //!< GStreamer
CAP_FFMPEG = 1900, //!< Open and record video file or stream using the FFMPEG library
CAP_IMAGES = 2000 //!< OpenCV Image Sequence (e.g. img_%02d.jpg)
CAP_IMAGES = 2000, //!< OpenCV Image Sequence (e.g. img_%02d.jpg)
CAP_ARAVIS = 2100 //!< Aravis SDK
};
/** @brief %VideoCapture generic properties identifier.
modules/videoio/include/opencv2/videoio/videoio_c.h
+3 -12
View File
@@ -116,15 +116,15 @@ enum
CV_CAP_GIGANETIX = 1300, // Smartek Giganetix GigEVisionSDK
CV_CAP_ARAVIS = 1400, // Aravis GigE SDK
CV_CAP_INTELPERC = 1500, // Intel Perceptual Computing
CV_CAP_OPENNI2 = 1600, // OpenNI2 (for Kinect)
CV_CAP_GPHOTO2 = 1700,
CV_CAP_GSTREAMER = 1800, // GStreamer
CV_CAP_FFMPEG = 1900, // FFMPEG
CV_CAP_IMAGES = 2000 // OpenCV Image Sequence (e.g. img_%02d.jpg)
CV_CAP_IMAGES = 2000, // OpenCV Image Sequence (e.g. img_%02d.jpg)
CV_CAP_ARAVIS = 2100 // Aravis GigE SDK
};
/** @brief start capturing frames from camera: index = camera_index + domain_offset (CV_CAP_*)
@@ -409,8 +409,6 @@ enum
CV_CAP_PROP_XI_SENSOR_FEATURE_SELECTOR = 585, // Selects the current feature which is accessible by XI_PRM_SENSOR_FEATURE_VALUE.
CV_CAP_PROP_XI_SENSOR_FEATURE_VALUE = 586, // Allows access to sensor feature value currently selected by XI_PRM_SENSOR_FEATURE_SELECTOR.
// ARAVIS
CV_CAP_PROP_ARAVIS_PIXELFORMAT = 1001, // Pixel format
// Properties for Android cameras
CV_CAP_PROP_ANDROID_FLASH_MODE = 8001,
@@ -491,13 +489,6 @@ enum
CV_CAP_OPENNI_QVGA_60HZ = 4
};
// Supported output modes of Aravis image generator
enum
{
CV_CAP_MODE_GRAY8 = 0, // Y8 (default)
CV_CAP_MODE_GRAY12 = 1 // Y12
};
enum
{
CV_CAP_INTELPERC_DEPTH_MAP = 0, // Each pixel is a 16-bit integer. The value indicates the distance from an object to the camera's XY plane or the Cartesian depth.