media: venus: venc : Add support for priority ID control.

Add support for base layer priority ID control in encoder.
This is a preparation patch to support v6.

[hverkuil: changed 54 to 51 in v4l2_ctrl_handler_init]

Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org>
Acked-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index a26bde0976d642e4173a565c6d493836385134a5..b984d508ed7118dfa6a9aefc5b4f0604ee24baef 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -236,6 +236,8 @@ struct venc_controls {
                u32 hevc;
                u32 vp9;
        } level;
+
+       u32 base_priority_id;
 };
 
 struct venus_buffer {

diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c
index 496ad4de6af354f1fd1a5263034e20314143bfc1..9fbe8388a938cd576a62baaba9a354a0945addfa 100644 (file)
--- a/drivers/media/platform/qcom/venus/venc_ctrls.c
+++ b/drivers/media/platform/qcom/venus/venc_ctrls.c
@@ -259,6 +259,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
        case V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE:
                ctr->frame_skip_mode = ctrl->val;
                break;
+       case V4L2_CID_MPEG_VIDEO_BASELAYER_PRIORITY_ID:
+               ctr->base_priority_id = ctrl->val;
+               break;
        default:
                return -EINVAL;
        }
@@ -274,7 +277,7 @@ int venc_ctrl_init(struct venus_inst *inst)
 {
        int ret;
 
-       ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 50);
+       ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 51);
        if (ret)
                return ret;
 
@@ -476,6 +479,10 @@ int venc_ctrl_init(struct venus_inst *inst)
                               (1 << V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT)),
                               V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED);
 
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_BASELAYER_PRIORITY_ID, 0,
+                         6, 1, 0);
+
        ret = inst->ctrl_handler.error;
        if (ret)
                goto err;