On Tue, Sep 3, 2024 at 12:05 AM Dikshita Agarwal
<quic_dikshita@xxxxxxxxxxx> wrote:
>
>
>
> On 8/15/2024 3:44 AM, Fritz Koenig wrote:
> > HFI supports hierarchical P encoding and the ability to specify the
> > bitrate for the different layers.
> >
> > Connect the controls that V4L2 provides and HFI supports.
> >
> > Signed-off-by: Fritz Koenig <frkoenig@xxxxxxxxxxxx>
> > ---
> > drivers/media/platform/qcom/venus/core.h | 4 ++
> > drivers/media/platform/qcom/venus/venc.c | 85 +++++++++++++++---------
> > drivers/media/platform/qcom/venus/venc_ctrls.c | 92 ++++++++++++++++++++++++++
> > 3 files changed, 151 insertions(+), 30 deletions(-)
> >
> > diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
> > index 55202b89e1b9..fd46a7778d8c 100644
> > --- a/drivers/media/platform/qcom/venus/core.h
> > +++ b/drivers/media/platform/qcom/venus/core.h
> > @@ -26,6 +26,7 @@
> > #define VIDC_CLKS_NUM_MAX 4
> > #define VIDC_VCODEC_CLKS_NUM_MAX 2
> > #define VIDC_RESETS_NUM_MAX 2
> > +#define VIDC_MAX_HIER_CODING_LAYER 6
> >
> > extern int venus_fw_debug;
> >
> > @@ -255,6 +256,7 @@ struct venc_controls {
> > u32 rc_enable;
> > u32 const_quality;
> > u32 frame_skip_mode;
> > + u32 layer_bitrate;
> >
> > u32 h264_i_period;
> > u32 h264_entropy_mode;
> > @@ -273,6 +275,8 @@ struct venc_controls {
> > s32 h264_loop_filter_alpha;
> > s32 h264_loop_filter_beta;
> > u32 h264_8x8_transform;
> > + u32 h264_hier_layers;
> > + u32 h264_hier_layer_bitrate[VIDC_MAX_HIER_CODING_LAYER];
> >
> > u32 hevc_i_qp;
> > u32 hevc_p_qp;
> > diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
> > index 3ec2fb8d9fab..af2c92069967 100644
> > --- a/drivers/media/platform/qcom/venus/venc.c
> > +++ b/drivers/media/platform/qcom/venus/venc.c
> > @@ -734,6 +734,29 @@ static int venc_set_properties(struct venus_inst *inst)
> > if (ret)
> > return ret;
> >
> > + if (ctr->layer_bitrate) {
> > + unsigned int i;
> > +
> > + ptype = HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER;
> > + ret = hfi_session_set_property(inst, ptype, &ctr->h264_hier_layers);
> > + if (ret)
> > + return ret;
> > +
> > + ptype = HFI_PROPERTY_CONFIG_VENC_HIER_P_ENH_LAYER;
> > + ret = hfi_session_set_property(inst, ptype, &ctr->layer_bitrate);
> > + if (ret)
> > + return ret;
> > +
> > + for (i = 0; i < ctr->h264_hier_layers; ++i) {
> > + ptype = HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE;
> > + brate.bitrate = ctr->h264_hier_layer_bitrate[i];
> > + brate.layer_id = i;
> > +
> > + ret = hfi_session_set_property(inst, ptype, &brate);
> > + if (ret)
> > + return ret;
> > + }
> > + }
> > }
> >
> > if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 ||
> > @@ -823,45 +846,47 @@ static int venc_set_properties(struct venus_inst *inst)
> > return ret;
> > }
> >
> > - if (!ctr->bitrate)
> > - bitrate = 64000;
> > - else
> > - bitrate = ctr->bitrate;
> > + if (!ctr->layer_bitrate) {
> > + if (!ctr->bitrate)
> > + bitrate = 64000;
> > + else
> > + bitrate = ctr->bitrate;
> >
> > - ptype = HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE;
> > - brate.bitrate = bitrate;
> > - brate.layer_id = 0;
> > + ptype = HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE;
> > + brate.bitrate = bitrate;
> > + brate.layer_id = 0;
> >
> > - ret = hfi_session_set_property(inst, ptype, &brate);
> > - if (ret)
> > - return ret;
> > + ret = hfi_session_set_property(inst, ptype, &brate);
> > + if (ret)
> > + return ret;
> >
> > - if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 ||
> > - inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) {
> > - ptype = HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER;
> > - if (ctr->header_mode == V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE)
> > - en.enable = 0;
> > + if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 ||
> > + inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) {
> > + ptype = HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER;
> > + if (ctr->header_mode == V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE)
> why move this ctrl setting inside ctr->layer_bitrate check?
> I don't think this depends on layer bitrate.
This was sloppy on my part. I did not look close enough to see that
this wasn't bitrate related.
Will update and send a new patchset.
>
> Thanks,
> Dikshita
> > + en.enable = 0;
> > + else
> > + en.enable = 1;
> > +
> > + ret = hfi_session_set_property(inst, ptype, &en);
> > + if (ret)
> > + return ret;
> > + }
> > +
> > + if (!ctr->bitrate_peak)
> > + bitrate *= 2;
> > else
> > - en.enable = 1;
> > + bitrate = ctr->bitrate_peak;
> >
> > - ret = hfi_session_set_property(inst, ptype, &en);
> > + ptype = HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE;
> > + brate.bitrate = bitrate;
> > + brate.layer_id = 0;
> > +
> > + ret = hfi_session_set_property(inst, ptype, &brate);
> > if (ret)
> > return ret;
> > }
> >
> > - if (!ctr->bitrate_peak)
> > - bitrate *= 2;
> > - else
> > - bitrate = ctr->bitrate_peak;
> > -
> > - ptype = HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE;
> > - brate.bitrate = bitrate;
> > - brate.layer_id = 0;
> > -
> > - ret = hfi_session_set_property(inst, ptype, &brate);
> > - if (ret)
> > - return ret;
> > -
> > ptype = HFI_PROPERTY_PARAM_VENC_SESSION_QP;
> > if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) {
> > quant.qp_i = ctr->hevc_i_qp;
> > diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c
> > index 3e1f6f26eddf..e340783a4ef2 100644
> > --- a/drivers/media/platform/qcom/venus/venc_ctrls.c
> > +++ b/drivers/media/platform/qcom/venus/venc_ctrls.c
> > @@ -346,6 +346,55 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
> >
> > ctr->h264_8x8_transform = ctrl->val;
> > break;
> > + case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE:
> > + if (ctrl->val != V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P)
> > + return -EINVAL;
> > + break;
> > + case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING:
> > + ctr->layer_bitrate = ctrl->val;
> > + break;
> > + case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER:
> > + if (ctrl->val > VIDC_MAX_HIER_CODING_LAYER)
> > + return -EINVAL;
> > + ctr->h264_hier_layers = ctrl->val;
> > + break;
> > + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR:
> > + ctr->h264_hier_layer_bitrate[0] = ctrl->val;
> > + ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[0], 0);
> > + if (ret)
> > + return ret;
> > + break;
> > + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR:
> > + ctr->h264_hier_layer_bitrate[1] = ctrl->val;
> > + ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[1], 1);
> > + if (ret)
> > + return ret;
> > + break;
> > + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR:
> > + ctr->h264_hier_layer_bitrate[2] = ctrl->val;
> > + ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[2], 2);
> > + if (ret)
> > + return ret;
> > + break;
> > + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR:
> > + ctr->h264_hier_layer_bitrate[3] = ctrl->val;
> > + ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[3], 3);
> > + if (ret)
> > + return ret;
> > + break;
> > + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR:
> > + ctr->h264_hier_layer_bitrate[4] = ctrl->val;
> > + ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[4], 4);
> > + if (ret)
> > + return ret;
> > + break;
> > + case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR:
> > + ctr->h264_hier_layer_bitrate[5] = ctrl->val;
> > + ret = dynamic_bitrate_update(inst, ctr->h264_hier_layer_bitrate[5], 5);
> > + if (ret)
> > + return ret;
> > + break;
> > +
> > default:
> > return -EINVAL;
> > }
> > @@ -628,6 +677,49 @@ int venc_ctrl_init(struct venus_inst *inst)
> > V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD, 0,
> > ((4096 * 2304) >> 8), 1, 0);
> >
> > + if (IS_V4(inst->core) || IS_V6(inst->core)) {
> > + v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,
> > + V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE,
> > + V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P,
> > + 1, V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P);
> > +
> > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> > + V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING, 0, 1, 1, 0);
> > +
> > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> > + V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER, 0,
> > + VIDC_MAX_HIER_CODING_LAYER, 1, 0);
> > +
> > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> > + V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR,
> > + BITRATE_MIN, BITRATE_MAX, BITRATE_STEP, BITRATE_DEFAULT);
> > +
> > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> > + V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR,
> > + BITRATE_MIN, BITRATE_MAX,
> > + BITRATE_STEP, BITRATE_DEFAULT);
> > +
> > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> > + V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR,
> > + BITRATE_MIN, BITRATE_MAX,
> > + BITRATE_STEP, BITRATE_DEFAULT);
> > +
> > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> > + V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR,
> > + BITRATE_MIN, BITRATE_MAX,
> > + BITRATE_STEP, BITRATE_DEFAULT);
> > +
> > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> > + V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR,
> > + BITRATE_MIN, BITRATE_MAX,
> > + BITRATE_STEP, BITRATE_DEFAULT);
> > +
> > + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> > + V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR,
> > + BITRATE_MIN, BITRATE_MAX,
> > + BITRATE_STEP, BITRATE_DEFAULT);
> > + }
> > +
> > ret = inst->ctrl_handler.error;
> > if (ret)
> > goto err;
> >
