iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Stanimir Varbanov 2020-07-05 02:11:26 +02:00 committed by Mauro Carvalho Chehab
parent 94dfb1689c
commit ef56b3ee4f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
View File

@ -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)
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: