From: Alexandre Courbot <acourbot@chromium.org>
To: Tiffany Lin <tiffany.lin@mediatek.com>,
Andrew-CT Chen <andrew-ct.chen@mediatek.com>,
Rui Wang <gtk_ruiwang@mediatek.com>,
Yunfei Dong <yunfei.dong@mediatek.com>,
Pi-Hsun Shih <pihsun@chromium.org>,
Maoguang Meng <maoguang.meng@mediatek.com>
Cc: linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
Alexandre Courbot <acourbot@chromium.org>,
linux-media@vger.kernel.org
Subject: [PATCH v2 05/18] media: mtk-vcodec: venc: specify bitrate range per-chip
Date: Fri, 26 Jun 2020 17:04:29 +0900 [thread overview]
Message-ID: <20200626080442.292309-6-acourbot@chromium.org> (raw)
In-Reply-To: <20200626080442.292309-1-acourbot@chromium.org>
Different chips have different supported bitrate ranges. Move the min
and max supported bitrates to the platform data.
Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
Acked-by: Tiffany Lin <tiffany.lin@mediatek.com>
---
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[] = {
--
2.27.0.212.ge8ba1cc988-goog
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2020-06-26 10:55 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-26 8:04 [PATCH v2 00/18] media: mtk-vcodec: venc: support for MT8183 and v4l2-compliance fixes Alexandre Courbot
2020-06-26 8:04 ` [PATCH v2 01/18] media: mtk-vcodec: abstract firmware interface Alexandre Courbot
2020-07-01 3:19 ` Tiffany Lin
2020-06-26 8:04 ` [PATCH v2 02/18] media: mtk-vcodec: add SCP firmware ops Alexandre Courbot
2020-06-26 8:04 ` [PATCH v2 03/18] media: mtk-vcodec: venc: support SCP firmware Alexandre Courbot
2020-06-26 8:04 ` [PATCH v2 04/18] media: mtk-vcodec: venc: handle firmware version field Alexandre Courbot
2020-06-26 8:04 ` Alexandre Courbot [this message]
2020-06-26 8:04 ` [PATCH v2 06/18] media: mtk-vcodec: venc: specify supported formats per-chip Alexandre Courbot
2020-07-01 3:15 ` Tiffany Lin
2020-06-26 8:04 ` [PATCH v2 07/18] media: mtk-vcodec: add support for MT8183 encoder Alexandre Courbot
2020-06-26 8:04 ` [PATCH v2 08/18] media: dt-bindings: mtk-vcodec: specify SCP node Alexandre Courbot
2020-06-26 8:04 ` [PATCH v2 09/18] media: dt-bindings: mtk-vcodec: document mediatek, mt8183-vcodec-enc Alexandre Courbot
2020-06-26 8:04 ` [PATCH v2 10/18] Revert "media: mtk-vcodec: Remove extra area allocation in an input buffer on encoding" Alexandre Courbot
2020-07-01 3:30 ` Tiffany Lin
2020-06-26 8:04 ` [PATCH v2 11/18] media: mtk-vcodec: venc support MIN_OUTPUT_BUFFERS control Alexandre Courbot
2020-07-01 3:30 ` Tiffany Lin
2020-06-26 8:04 ` [PATCH v2 12/18] media: mtk-vcodec: venc: set OUTPUT buffers field to V4L2_FIELD_NONE Alexandre Courbot
2020-07-01 3:46 ` Tiffany Lin
2020-06-26 8:04 ` [PATCH v2 13/18] media: mtk-vcodec: venc: use platform data for ENUM_FRAMESIZES Alexandre Courbot
2020-06-26 8:04 ` [PATCH v2 14/18] media: mtk-vcodec: venc: support ENUM_FRAMESIZES on OUTPUT formats Alexandre Courbot
2020-06-26 8:04 ` [PATCH v2 15/18] media: mtk-vcodec: venc: support G_PARM on CAPTURE queue Alexandre Courbot
2020-06-26 8:04 ` [PATCH v2 16/18] media: mtk-vcodec: venc: make S_PARM return -ENOTTY for " Alexandre Courbot
2020-07-03 8:30 ` Hans Verkuil
2020-07-04 12:36 ` Alexandre Courbot
2020-07-06 12:41 ` Hans Verkuil
2020-07-07 4:44 ` Alexandre Courbot
2020-06-26 8:04 ` [PATCH v2 17/18] media: mtk-vcodec: venc: set default time per frame Alexandre Courbot
2020-06-26 8:04 ` [PATCH v2 18/18] media: mtk-vcodec: venc: fix invalid time per frame in S_PARM Alexandre Courbot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200626080442.292309-6-acourbot@chromium.org \
--to=acourbot@chromium.org \
--cc=andrew-ct.chen@mediatek.com \
--cc=gtk_ruiwang@mediatek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=maoguang.meng@mediatek.com \
--cc=pihsun@chromium.org \
--cc=tiffany.lin@mediatek.com \
--cc=yunfei.dong@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).