|
@@ -1254,6 +1254,7 @@ struct v4l2_ext_control {
|
|
|
__s32 value;
|
|
|
__s64 value64;
|
|
|
char *string;
|
|
|
+ void *ptr;
|
|
|
};
|
|
|
} __attribute__ ((packed));
|
|
|
|
|
@@ -1278,7 +1279,10 @@ enum v4l2_ctrl_type {
|
|
|
V4L2_CTRL_TYPE_CTRL_CLASS = 6,
|
|
|
V4L2_CTRL_TYPE_STRING = 7,
|
|
|
V4L2_CTRL_TYPE_BITMASK = 8,
|
|
|
- V4L2_CTRL_TYPE_INTEGER_MENU = 9,
|
|
|
+ V4L2_CTRL_TYPE_INTEGER_MENU = 9,
|
|
|
+
|
|
|
+ /* Compound types are >= 0x0100 */
|
|
|
+ V4L2_CTRL_COMPOUND_TYPES = 0x0100,
|
|
|
};
|
|
|
|
|
|
/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
|
|
@@ -1314,9 +1318,11 @@ struct v4l2_querymenu {
|
|
|
#define V4L2_CTRL_FLAG_SLIDER 0x0020
|
|
|
#define V4L2_CTRL_FLAG_WRITE_ONLY 0x0040
|
|
|
#define V4L2_CTRL_FLAG_VOLATILE 0x0080
|
|
|
+#define V4L2_CTRL_FLAG_HAS_PAYLOAD 0x0100
|
|
|
|
|
|
-/* Query flag, to be ORed with the control ID */
|
|
|
+/* Query flags, to be ORed with the control ID */
|
|
|
#define V4L2_CTRL_FLAG_NEXT_CTRL 0x80000000
|
|
|
+#define V4L2_CTRL_FLAG_NEXT_COMPOUND 0x40000000
|
|
|
|
|
|
/* User-class control IDs defined by V4L2 */
|
|
|
#define V4L2_CID_MAX_CTRLS 1024
|