Commit 42f2ea26 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Mauro Carvalho Chehab
Browse files

media: mtk-vcodec: venc: specify bitrate range per-chip 



Different chips have different supported bitrate ranges. Move the min
and max supported bitrates to the platform data.

Signed-off-by: default avatarAlexandre Courbot <acourbot@chromium.org>
Acked-by: default avatarTiffany Lin <tiffany.lin@mediatek.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent c2bc0456

drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h

+4 −0
Original line number Diff line number Diff line
@@ -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;

};



#define MTK_ENC_CTX_IS_EXT(ctx) ((ctx)->dev->venc_pdata->uses_ext)

drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c

+2 −1
Original line number Diff line number Diff line
@@ -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,

drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -395,6 +395,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[] = {