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

Merge pull request #5474 from paroj:v4l2ctrls

Browse Source
This commit is contained in:
Alexander Alekhin 2015-10-23 16:28:26 +00:00
commit 09e6c82190
4 changed files with 248 additions and 605 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/videoio/include/opencv2/videoio.hpp
View File

@ -133,7 +133,9 @@ enum { CAP_PROP_POS_MSEC =0,
CAP_PROP_TILT =34,
CAP_PROP_ROLL =35,
CAP_PROP_IRIS =36,
CAP_PROP_SETTINGS =37
CAP_PROP_SETTINGS =37,
CAP_PROP_BUFFERSIZE =38,
CAP_PROP_AUTOFOCUS =39
};

1
modules/videoio/include/opencv2/videoio/videoio_c.h
View File

@ -189,6 +189,7 @@ enum
CV_CAP_PROP_IRIS =36,
CV_CAP_PROP_SETTINGS =37,
CV_CAP_PROP_BUFFERSIZE =38,
CV_CAP_PROP_AUTOFOCUS =39,
CV_CAP_PROP_AUTOGRAB =1024, // property for videoio class CvCapture_Android only
CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING=1025, // readonly, tricky property, returns cpnst char* indeed

847
modules/videoio/src/cap_v4l.cpp
View File

File diff suppressed because it is too large Load Diff

1
modules/videoio/src/precomp.hpp
View File

@ -49,6 +49,7 @@
#include "opencv2/imgcodecs.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/imgcodecs/imgcodecs_c.h"
#include "opencv2/videoio/videoio_c.h"