From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
Add cols and rows fields to the core control structures in preparation
for matrix support.
Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
---
drivers/media/v4l2-core/v4l2-ctrls.c | 24 ++++++++++++++++--------
include/media/v4l2-ctrls.h | 6 ++++++
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index a1c5e3e..8ed8a70 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -1729,7 +1729,7 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
u32 id, const char *name, const char *unit,
enum v4l2_ctrl_type type,
s64 min, s64 max, u64 step, s64 def,
- u32 elem_size,
+ u32 cols, u32 rows, u32 elem_size,
u32 nstores, u32 initial_store,
u32 flags, const char * const *qmenu,
const s64 *qmenu_int, void *priv)
@@ -1743,6 +1743,11 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
if (hdl->error)
return NULL;
+ if (cols == 0)
+ cols = 1;
+ if (rows == 0)
+ rows = 1;
+
if (type == V4L2_CTRL_TYPE_INTEGER64)
elem_size = sizeof(s64);
else if (type == V4L2_CTRL_TYPE_STRING)
@@ -1823,6 +1828,8 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
ctrl->is_string = type == V4L2_CTRL_TYPE_STRING;
ctrl->is_ptr = type >= V4L2_PROP_TYPES || ctrl->is_string;
ctrl->is_int = !ctrl->is_ptr && type != V4L2_CTRL_TYPE_INTEGER64;
+ ctrl->cols = cols;
+ ctrl->rows = rows;
ctrl->elem_size = elem_size;
ctrl->nstores = nstores;
ctrl->cur_store = initial_store;
@@ -1893,8 +1900,8 @@ struct v4l2_ctrl *v4l2_ctrl_new_custom(struct v4l2_ctrl_handler *hdl,
ctrl = v4l2_ctrl_new(hdl, cfg->ops, cfg->type_ops, cfg->id, name, unit,
type, min, max,
- is_menu ? cfg->menu_skip_mask : step,
- def, cfg->elem_size,
+ is_menu ? cfg->menu_skip_mask : step, def,
+ cfg->cols, cfg->rows, cfg->elem_size,
cfg->nstores, cfg->initial_store,
flags, qmenu, qmenu_int, priv);
if (ctrl)
@@ -1921,7 +1928,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_std(struct v4l2_ctrl_handler *hdl,
return NULL;
}
return v4l2_ctrl_new(hdl, ops, NULL, id, name, unit, type,
- min, max, step, def, 0, 0, 0,
+ min, max, step, def, 0, 0, 0, 0, 0,
flags, NULL, NULL, NULL);
}
EXPORT_SYMBOL(v4l2_ctrl_new_std);
@@ -1955,7 +1962,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu(struct v4l2_ctrl_handler *hdl,
return NULL;
}
return v4l2_ctrl_new(hdl, ops, NULL, id, name, unit, type,
- 0, max, mask, def, 0, 0, 0,
+ 0, max, mask, def, 0, 0, 0, 0, 0,
flags, qmenu, qmenu_int, NULL);
}
EXPORT_SYMBOL(v4l2_ctrl_new_std_menu);
@@ -1988,7 +1995,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_std_menu_items(struct v4l2_ctrl_handler *hdl,
return NULL;
}
return v4l2_ctrl_new(hdl, ops, NULL, id, name, unit, type,
- 0, max, mask, def, 0, 0, 0,
+ 0, max, mask, def, 0, 0, 0, 0, 0,
flags, qmenu, NULL, NULL);
}
@@ -2014,7 +2021,7 @@ struct v4l2_ctrl *v4l2_ctrl_new_int_menu(struct v4l2_ctrl_handler *hdl,
return NULL;
}
return v4l2_ctrl_new(hdl, ops, NULL, id, name, unit, type,
- 0, max, 0, def, 0, 0, 0,
+ 0, max, 0, def, 0, 0, 0, 0, 0,
flags, NULL, qmenu_int, NULL);
}
EXPORT_SYMBOL(v4l2_ctrl_new_int_menu);
@@ -2358,7 +2365,8 @@ int v4l2_query_ext_ctrl(struct v4l2_ctrl_handler *hdl, struct v4l2_query_ext_ctr
qc->min.val = ctrl->minimum;
qc->max.val = ctrl->maximum;
qc->def.val = ctrl->default_value;
- qc->cols = qc->rows = 1;
+ qc->cols = ctrl->cols;
+ qc->rows = ctrl->rows;
if (ctrl->type == V4L2_CTRL_TYPE_MENU
|| ctrl->type == V4L2_CTRL_TYPE_INTEGER_MENU)
qc->step.val = 1;
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 9ce740d..ad62b71 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -132,6 +132,8 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);
* @minimum: The control's minimum value.
* @maximum: The control's maximum value.
* @default_value: The control's default value.
+ * @rows: The number of rows in the matrix.
+ * @cols: The number of columns in the matrix.
* @step: The control's step value for non-menu controls.
* @elem_size: The size in bytes of the control.
* @menu_skip_mask: The control's skip mask for menu controls. This makes it
@@ -184,6 +186,7 @@ struct v4l2_ctrl {
const char *unit;
enum v4l2_ctrl_type type;
s64 minimum, maximum, default_value;
+ u32 rows, cols;
u32 elem_size;
union {
u64 step;
@@ -271,6 +274,8 @@ struct v4l2_ctrl_handler {
* @max: The control's maximum value.
* @step: The control's step value for non-menu controls.
* @def: The control's default value.
+ * @rows: The number of rows in the matrix.
+ * @cols: The number of columns in the matrix.
* @elem_size: The size in bytes of the control.
* @nstores: The number of configuration stores.
* @initial_store: The configuration store used as the initial current value.
@@ -299,6 +304,7 @@ struct v4l2_ctrl_config {
s64 max;
u64 step;
s64 def;
+ u32 rows, cols;
u32 elem_size;
u32 nstores, initial_store;
u32 flags;
--
1.8.5.2
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
