diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-06-12 06:55:21 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-17 10:57:18 -0400 |
commit | 20d88eef66a86989ea3cffe2a4e0d16cbf2d4563 (patch) | |
tree | f59c3f0aea4fc3e50e79e9ef0399d0dfcec4dfa4 /include/media | |
parent | 2a9ec3731137f973c6289698de6566a25418b96f (diff) |
[media] v4l2-ctrls: prepare for array support
Add dims, nr_of_dims and elems fields to the core control structures in preparation
for N-dimensional array support.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/v4l2-ctrls.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index eb69c52e2f64..d30da09b7b69 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h | |||
@@ -129,7 +129,10 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv); | |||
129 | * @maximum: The control's maximum value. | 129 | * @maximum: The control's maximum value. |
130 | * @default_value: The control's default value. | 130 | * @default_value: The control's default value. |
131 | * @step: The control's step value for non-menu controls. | 131 | * @step: The control's step value for non-menu controls. |
132 | * @elems: The number of elements in the N-dimensional array. | ||
132 | * @elem_size: The size in bytes of the control. | 133 | * @elem_size: The size in bytes of the control. |
134 | * @dims: The size of each dimension. | ||
135 | * @nr_of_dims:The number of dimensions in @dims. | ||
133 | * @menu_skip_mask: The control's skip mask for menu controls. This makes it | 136 | * @menu_skip_mask: The control's skip mask for menu controls. This makes it |
134 | * easy to skip menu items that are not valid. If bit X is set, | 137 | * easy to skip menu items that are not valid. If bit X is set, |
135 | * then menu item X is skipped. Of course, this only works for | 138 | * then menu item X is skipped. Of course, this only works for |
@@ -176,7 +179,10 @@ struct v4l2_ctrl { | |||
176 | const char *name; | 179 | const char *name; |
177 | enum v4l2_ctrl_type type; | 180 | enum v4l2_ctrl_type type; |
178 | s64 minimum, maximum, default_value; | 181 | s64 minimum, maximum, default_value; |
182 | u32 elems; | ||
179 | u32 elem_size; | 183 | u32 elem_size; |
184 | u32 dims[V4L2_CTRL_MAX_DIMS]; | ||
185 | u32 nr_of_dims; | ||
180 | union { | 186 | union { |
181 | u64 step; | 187 | u64 step; |
182 | u64 menu_skip_mask; | 188 | u64 menu_skip_mask; |
@@ -255,6 +261,7 @@ struct v4l2_ctrl_handler { | |||
255 | * @max: The control's maximum value. | 261 | * @max: The control's maximum value. |
256 | * @step: The control's step value for non-menu controls. | 262 | * @step: The control's step value for non-menu controls. |
257 | * @def: The control's default value. | 263 | * @def: The control's default value. |
264 | * @dims: The size of each dimension. | ||
258 | * @elem_size: The size in bytes of the control. | 265 | * @elem_size: The size in bytes of the control. |
259 | * @flags: The control's flags. | 266 | * @flags: The control's flags. |
260 | * @menu_skip_mask: The control's skip mask for menu controls. This makes it | 267 | * @menu_skip_mask: The control's skip mask for menu controls. This makes it |
@@ -280,6 +287,7 @@ struct v4l2_ctrl_config { | |||
280 | s64 max; | 287 | s64 max; |
281 | u64 step; | 288 | u64 step; |
282 | s64 def; | 289 | s64 def; |
290 | u32 dims[V4L2_CTRL_MAX_DIMS]; | ||
283 | u32 elem_size; | 291 | u32 elem_size; |
284 | u32 flags; | 292 | u32 flags; |
285 | u64 menu_skip_mask; | 293 | u64 menu_skip_mask; |