generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged android-experimental branch back to trunk.

Browse Source
This commit is contained in:
Andrey Kamaev
2011-04-06 14:31:03 +00:00
parent bbdd0aecbd
commit 68534d70f3
120 changed files with 3483 additions and 1620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/highgui/include/opencv2/highgui/highgui_c.h
View File

@@ -290,7 +290,9 @@ enum
CV_CAP_PVAPI =800, // PvAPI, Prosilica GigE SDK
CV_CAP_OPENNI =900 // OpenNI (for Kinect)
CV_CAP_OPENNI =900, // OpenNI (for Kinect)
CV_CAP_ANDROID =1000 // Android
};
/* start capturing frames from camera: index = camera_index + domain_offset (CV_CAP_*) */
@@ -387,6 +389,14 @@ enum
CV_CAP_OPENNI_SXGA_15HZ = 1
};
//supported by Android camera output formats
enum
{
CV_CAP_ANDROID_COLOR_FRAME = 1, //TODO: check RGB or BGR?
CV_CAP_ANDROID_GREY_FRAME = 0,
CV_CAP_ANDROID_YUV_FRAME = 2
};
/* retrieve or set capture properties */
CVAPI(double) cvGetCaptureProperty( CvCapture* capture, int property_id );
CVAPI(int) cvSetCaptureProperty( CvCapture* capture, int property_id, double value );