Hi Jeff,
Thanks for the patch!
It looks good to me, except one indentation issue but I will fix it when
applying no need to resend it.
On 2/22/20 2:33 AM, Jeffrey Kardatzke wrote:
> Add encoder control for enabling/disabling frame rate control via
> V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE. It is enabled by default.
>
> Signed-off-by: Jeffrey Kardatzke <jkardatzke@xxxxxxxxxx>
> ---
> drivers/media/platform/qcom/venus/core.h | 1 +
> drivers/media/platform/qcom/venus/venc.c | 4 +++-
> drivers/media/platform/qcom/venus/venc_ctrls.c | 8 +++++++-
> 3 files changed, 11 insertions(+), 2 deletions(-)
Acked-by: Stanimir Varbanov <stanimir.varbanov@xxxxxxxxxx>
>
> diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
> index 11585fb3cae3..2b0649ffbd92 100644
> --- a/drivers/media/platform/qcom/venus/core.h
> +++ b/drivers/media/platform/qcom/venus/core.h
> @@ -187,6 +187,7 @@ struct venc_controls {
> u32 bitrate_mode;
> u32 bitrate;
> u32 bitrate_peak;
> + u32 rc_enable;
>
> u32 h264_i_period;
> u32 h264_entropy_mode;
> diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
> index 453edf966d4f..56079c9d9900 100644
> --- a/drivers/media/platform/qcom/venus/venc.c
> +++ b/drivers/media/platform/qcom/venus/venc.c
> @@ -731,7 +731,9 @@ static int venc_set_properties(struct venus_inst *inst)
> if (ret)
> return ret;
>
> - if (ctr->bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR)
> + if (!ctr->rc_enable)
> + rate_control = HFI_RATE_CONTROL_OFF;
> + else if (ctr->bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_VBR)
> rate_control = HFI_RATE_CONTROL_VBR_CFR;
> else
> rate_control = HFI_RATE_CONTROL_CBR_CFR;
> diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c
> index 877c0b3299e9..0572a00b8380 100644
> --- a/drivers/media/platform/qcom/venus/venc_ctrls.c
> +++ b/drivers/media/platform/qcom/venus/venc_ctrls.c
> @@ -199,6 +199,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
> }
> mutex_unlock(&inst->lock);
> break;
> + case V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE:
> + ctr->rc_enable = ctrl->val;
> + break;
> default:
> return -EINVAL;
> }
> @@ -214,7 +217,7 @@ int venc_ctrl_init(struct venus_inst *inst)
> {
> int ret;
>
> - ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 30);
> + ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 31);
> if (ret)
> return ret;
>
> @@ -351,6 +354,9 @@ int venc_ctrl_init(struct venus_inst *inst)
> v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME, 0, 0, 0, 0);
>
> + v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> + V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE, 0, 1, 1, 1);
> +
> ret = inst->ctrl_handler.error;
> if (ret)
> goto err;
>
--
regards,
Stan
