On 3/14/22 11:09, quic_dikshita@xxxxxxxxxxx wrote:
> From: Dikshita Agarwal <quic_dikshita@xxxxxxxxxxx>
>
> Add support for intra-refresh type v4l2 control.
>
> Signed-off-by: Dikshita Agarwal <quic_dikshita@xxxxxxxxxxx>
> ---
> drivers/media/platform/qcom/venus/core.h | 1 +
> drivers/media/platform/qcom/venus/venc.c | 6 +++++-
> drivers/media/platform/qcom/venus/venc_ctrls.c | 10 ++++++++++
> 3 files changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
> index 7c3bac0..65c0f01 100644
> --- a/drivers/media/platform/qcom/venus/core.h
> +++ b/drivers/media/platform/qcom/venus/core.h
> @@ -260,6 +260,7 @@ struct venc_controls {
>
> u32 header_mode;
> bool aud_enable;
> + u32 intra_refresh_type;
> u32 intra_refresh_period;
>
> struct {
> diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
> index 84bafc3..bff8caf 100644
> --- a/drivers/media/platform/qcom/venus/venc.c
> +++ b/drivers/media/platform/qcom/venus/venc.c
> @@ -893,8 +893,12 @@ static int venc_set_properties(struct venus_inst *inst)
> mbs++;
> mbs /= ctr->intra_refresh_period;
>
> - intra_refresh.mode = HFI_INTRA_REFRESH_RANDOM;
> intra_refresh.cir_mbs = mbs;
> + if (ctr->intra_refresh_type ==
> + V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC)
> + intra_refresh.mode = HFI_INTRA_REFRESH_CYCLIC;
> + else
> + intra_refresh.mode = HFI_INTRA_REFRESH_RANDOM;
> }
>
> ptype = HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH;
> diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c
> index 1ada42d..51f5a572 100644
> --- a/drivers/media/platform/qcom/venus/venc_ctrls.c
> +++ b/drivers/media/platform/qcom/venus/venc_ctrls.c
> @@ -316,6 +316,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
> case V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY:
> ctr->mastering = *ctrl->p_new.p_hdr10_mastering;
> break;
> + case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE:
> + ctr->intra_refresh_type = ctrl->val;
> + break;
> case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD:
> ctr->intra_refresh_period = ctrl->val;
> break;
> @@ -582,6 +585,13 @@ int venc_ctrl_init(struct venus_inst *inst)
> V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY,
> v4l2_ctrl_ptr_create(NULL));
>
> + v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,
> + V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE,
> + V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC,
> + ~((1 << V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM) |
> + (1 << V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC)),
Just set this to 0. All menu items in the range 0..max are used, so nothing
needs to be skipped.
This argument should only be set to a non-0 value if one or more items in
the range 0..max are to be skipped.
After that change you can add my:
Acked-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
Regards,
Hans
> + V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM);
> +
> v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD, 0,
> ((4096 * 2304) >> 8), 1, 0);
