Commit ef56b3ee authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Mauro Carvalho Chehab

media: s5p-mfc: Use standard frame skip mode control

Use the standard menu control for frame skip mode in the MFC
driver. The legacy private menu control is kept for backward
compatibility.
Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Reviewed-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 94dfb168
...@@ -261,6 +261,11 @@ static struct mfc_control controls[] = { ...@@ -261,6 +261,11 @@ static struct mfc_control controls[] = {
.menu_skip_mask = 0, .menu_skip_mask = 0,
.default_value = V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_DISABLED, .default_value = V4L2_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE_DISABLED,
}, },
{
.id = V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE,
.maximum = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT,
.default_value = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED,
},
{ {
.id = V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT, .id = V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT,
.type = V4L2_CTRL_TYPE_BOOLEAN, .type = V4L2_CTRL_TYPE_BOOLEAN,
...@@ -1849,6 +1854,7 @@ static int s5p_mfc_enc_s_ctrl(struct v4l2_ctrl *ctrl) ...@@ -1849,6 +1854,7 @@ static int s5p_mfc_enc_s_ctrl(struct v4l2_ctrl *ctrl)
p->seq_hdr_mode = ctrl->val; p->seq_hdr_mode = ctrl->val;
break; break;
case V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE: case V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE:
case V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE:
p->frame_skip_mode = ctrl->val; p->frame_skip_mode = ctrl->val;
break; break;
case V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT: case V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT:
......
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