Re: [PATCH 05/10] media: mtk-vcodec: venc: specify bitrate range per-chip

Tiffany Lin
2020-06-16T09:06:33Z

On Wed, 2020-05-20 at 17:27 +0900, Alexandre Courbot wrote:
> Different chips have different supported bitrate ranges. Move the min
> and max supported bitrates to the platform data.
>

Acked-by: Tiffany Lin <tiffany.lin@mediatek.com>

> Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
> ---
> drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 4 ++++
> drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 3 ++-
> drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 2 ++
> 3 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> index e7b155e7432e..b8f913de8d80 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> @@ -311,12 +311,16 @@ enum mtk_chip {
> *
> * @uses_ext: whether the encoder uses the extended firmware messaging format
> * @has_lt_irq: whether the encoder uses the LT irq
> + * @min_birate: minimum supported encoding bitrate
> + * @max_bitrate: maximum supported encoding bitrate
> */
> struct mtk_vcodec_enc_pdata {
> enum mtk_chip chip;
>
> bool uses_ext;
> bool has_lt_irq;
> + unsigned long min_bitrate;
> + unsigned long max_bitrate;
> };
>
> /**
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> index d469ff6464b2..50ba9da59153 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> @@ -1232,7 +1232,8 @@ int mtk_vcodec_enc_ctrls_setup(struct mtk_vcodec_ctx *ctx)
> v4l2_ctrl_handler_init(handler, MTK_MAX_CTRLS_HINT);
>
> v4l2_ctrl_new_std(handler, ops, V4L2_CID_MPEG_VIDEO_BITRATE,
> - 1, 4000000, 1, 4000000);
> + ctx->dev->venc_pdata->min_bitrate,
> + ctx->dev->venc_pdata->max_bitrate, 1, 4000000);
> v4l2_ctrl_new_std(handler, ops, V4L2_CID_MPEG_VIDEO_B_FRAMES,
> 0, 2, 1, 0);
> v4l2_ctrl_new_std(handler, ops, V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE,
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
> index c1365209263e..221fa0303075 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
> @@ -380,6 +380,8 @@ static int mtk_vcodec_probe(struct platform_device *pdev)
> static const struct mtk_vcodec_enc_pdata mt8173_pdata = {
> .chip = MTK_MT8173,
> .has_lt_irq = true,
> + .min_bitrate = 1,
> + .max_bitrate = 4000000,
> };
>
> static const struct of_device_id mtk_vcodec_enc_match[] = {