Commit bfe81950 authored by Boris Brezillon's avatar Boris Brezillon Committed by Mauro Carvalho Chehab

media: v4l2: Initialize mpeg slice controls

Make sure the default value at least passes the std_validate() tests.
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 2b411629
......@@ -1466,7 +1466,14 @@ static bool std_equal(const struct v4l2_ctrl *ctrl, u32 idx,
static void std_init(const struct v4l2_ctrl *ctrl, u32 idx,
union v4l2_ctrl_ptr ptr)
{
switch (ctrl->type) {
struct v4l2_ctrl_mpeg2_slice_params *p_mpeg2_slice_params;
/*
* The cast is needed to get rid of a gcc warning complaining that
* V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS is not part of the
* v4l2_ctrl_type enum.
*/
switch ((u32)ctrl->type) {
case V4L2_CTRL_TYPE_STRING:
idx *= ctrl->elem_size;
memset(ptr.p_char + idx, ' ', ctrl->minimum);
......@@ -1491,6 +1498,17 @@ static void std_init(const struct v4l2_ctrl *ctrl, u32 idx,
case V4L2_CTRL_TYPE_U32:
ptr.p_u32[idx] = ctrl->default_value;
break;
case V4L2_CTRL_TYPE_MPEG2_SLICE_PARAMS:
p_mpeg2_slice_params = ptr.p;
/* 4:2:0 */
p_mpeg2_slice_params->sequence.chroma_format = 1;
/* 8 bits */
p_mpeg2_slice_params->picture.intra_dc_precision = 0;
/* interlaced top field */
p_mpeg2_slice_params->picture.picture_structure = 1;
p_mpeg2_slice_params->picture.picture_coding_type =
V4L2_MPEG2_PICTURE_CODING_TYPE_I;
break;
default:
idx *= ctrl->elem_size;
memset(ptr.p + idx, 0, ctrl->elem_size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment