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: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index 912fe0c..3092eb6 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -262,6 +262,11 @@ static struct mfc_control controls[] = {
                .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,
                .type = V4L2_CTRL_TYPE_BOOLEAN,
                .name = "Fixed Target Bit Enable",
@@ -1849,6 +1854,7 @@ static int s5p_mfc_enc_s_ctrl(struct v4l2_ctrl *ctrl)
                p->seq_hdr_mode = ctrl->val;
                break;
        case V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE:
+       case V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE:
                p->frame_skip_mode = ctrl->val;
                break;
        case V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT: