media: venus: venc: Add support for frame-specific min/max qp controls

Add support for frame type specific min and max qp controls
for encoder.
This is a preparation patch to support v6.

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 dfc13b2f371fe1c897d5d0f6a71699b827f0d615..a26bde0976d642e4173a565c6d493836385134a5 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -192,10 +192,28 @@ struct venc_controls {
        u32 h264_b_qp;
        u32 h264_min_qp;
        u32 h264_max_qp;
+       u32 h264_i_min_qp;
+       u32 h264_i_max_qp;
+       u32 h264_p_min_qp;
+       u32 h264_p_max_qp;
+       u32 h264_b_min_qp;
+       u32 h264_b_max_qp;
        u32 h264_loop_filter_mode;
        s32 h264_loop_filter_alpha;
        s32 h264_loop_filter_beta;
 
+       u32 hevc_i_qp;
+       u32 hevc_p_qp;
+       u32 hevc_b_qp;
+       u32 hevc_min_qp;
+       u32 hevc_max_qp;
+       u32 hevc_i_min_qp;
+       u32 hevc_i_max_qp;
+       u32 hevc_p_min_qp;
+       u32 hevc_p_max_qp;
+       u32 hevc_b_min_qp;
+       u32 hevc_b_max_qp;
+
        u32 vp8_min_qp;
        u32 vp8_max_qp;
 

diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 6e830fc83b095627b1325ef5938e62a04a02deda..e4775ec97a87dfe6f962a2f1872f97aa308e8539 100644 (file)
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -669,17 +669,28 @@ static int venc_set_properties(struct venus_inst *inst)
                return ret;
 
        ptype = HFI_PROPERTY_PARAM_VENC_SESSION_QP;
-       quant.qp_i = ctr->h264_i_qp;
-       quant.qp_p = ctr->h264_p_qp;
-       quant.qp_b = ctr->h264_b_qp;
+       if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) {
+               quant.qp_i = ctr->hevc_i_qp;
+               quant.qp_p = ctr->hevc_p_qp;
+               quant.qp_b = ctr->hevc_b_qp;
+       } else {
+               quant.qp_i = ctr->h264_i_qp;
+               quant.qp_p = ctr->h264_p_qp;
+               quant.qp_b = ctr->h264_b_qp;
+       }
        quant.layer_id = 0;
        ret = hfi_session_set_property(inst, ptype, &quant);
        if (ret)
                return ret;
 
        ptype = HFI_PROPERTY_PARAM_VENC_SESSION_QP_RANGE;
-       quant_range.min_qp = ctr->h264_min_qp;
-       quant_range.max_qp = ctr->h264_max_qp;
+       if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) {
+               quant_range.min_qp = ctr->hevc_min_qp;
+               quant_range.max_qp = ctr->hevc_max_qp;
+       } else {
+               quant_range.min_qp = ctr->h264_min_qp;
+               quant_range.max_qp = ctr->h264_max_qp;
+       }
        quant_range.layer_id = 0;
        ret = hfi_session_set_property(inst, ptype, &quant_range);
        if (ret)

diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c
index cf860e6446c0db469f5c48a49009dc530d5e71c1..496ad4de6af354f1fd1a5263034e20314143bfc1 100644 (file)
--- a/drivers/media/platform/qcom/venus/venc_ctrls.c
+++ b/drivers/media/platform/qcom/venus/venc_ctrls.c
@@ -135,9 +135,60 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
        case V4L2_CID_MPEG_VIDEO_H264_MIN_QP:
                ctr->h264_min_qp = ctrl->val;
                break;
+       case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP:
+               ctr->h264_i_min_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP:
+               ctr->h264_p_min_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP:
+               ctr->h264_b_min_qp = ctrl->val;
+               break;
        case V4L2_CID_MPEG_VIDEO_H264_MAX_QP:
                ctr->h264_max_qp = ctrl->val;
                break;
+       case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP:
+               ctr->h264_i_max_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP:
+               ctr->h264_p_max_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP:
+               ctr->h264_b_max_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP:
+               ctr->hevc_i_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_QP:
+               ctr->hevc_p_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP:
+               ctr->hevc_b_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP:
+               ctr->hevc_min_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP:
+               ctr->hevc_i_min_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP:
+               ctr->hevc_p_min_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP:
+               ctr->hevc_b_min_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP:
+               ctr->hevc_max_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP:
+               ctr->hevc_i_max_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP:
+               ctr->hevc_p_max_qp = ctrl->val;
+               break;
+       case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP:
+               ctr->hevc_b_max_qp = ctrl->val;
+               break;
        case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE:
                ctr->multi_slice_mode = ctrl->val;
                break;
@@ -223,7 +274,7 @@ int venc_ctrl_init(struct venus_inst *inst)
 {
        int ret;
 
-       ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 33);
+       ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 50);
        if (ret)
                return ret;
 
@@ -311,19 +362,70 @@ int venc_ctrl_init(struct venus_inst *inst)
                BITRATE_STEP, BITRATE_DEFAULT_PEAK);
 
        v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
-               V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP, 1, 51, 1, 26);
+                         V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP, 1, 51, 1, 26);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP, 1, 51, 1, 28);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP, 1, 51, 1, 30);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_H264_MIN_QP, 1, 51, 1, 1);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP, 1, 51, 1, 1);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP, 1, 51, 1, 1);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP, 1, 51, 1, 1);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_H264_MAX_QP, 1, 51, 1, 51);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP, 1, 51, 1, 51);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP, 1, 51, 1, 51);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP, 1, 51, 1, 51);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP, 1, 63, 1, 26);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_QP, 1, 63, 1, 28);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP, 1, 63, 1, 30);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP, 1, 63, 1, 1);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP, 1, 63, 1, 1);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP, 1, 63, 1, 1);
+
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP, 1, 63, 1, 1);
 
        v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
-               V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP, 1, 51, 1, 28);
+                         V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP, 1, 63, 1, 63);
 
        v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
-               V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP, 1, 51, 1, 30);
+                         V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP, 1, 63, 1, 63);
 
        v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
-               V4L2_CID_MPEG_VIDEO_H264_MIN_QP, 1, 51, 1, 1);
+                         V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP, 1, 63, 1, 63);
 
        v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
-               V4L2_CID_MPEG_VIDEO_H264_MAX_QP, 1, 51, 1, 51);
+                         V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP, 1, 63, 1, 63);
 
        v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
                V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES, SLICE_BYTE_SIZE_MIN,