media: mediatek: vcodec: Skip non CBR bitrate mode
Commit Message
V4L2_MPEG_VIDEO_BITRATE_MODE_CBR is the only bitrate mode supported
by the mediatek driver. The other bitrates must be skipped in
QUERY_MENU.
Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
---
drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Comments
On Tue, Aug 2, 2022 at 12:42 PM Hirokazu Honda <hiroh@chromium.org> wrote:
>
> V4L2_MPEG_VIDEO_BITRATE_MODE_CBR is the only bitrate mode supported
> by the mediatek driver. The other bitrates must be skipped in
> QUERY_MENU.
>
> Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
This should have a fixes tag:
Fixes: d8e8aa866ed8 ("media: mediatek: vcodec: Report supported bitrate modes")
Otherwise,
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
I believe this also makes the check in mtk_vcodec_enc.c:vidioc_venc_s_ctrl()
redundant.
> ---
> drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
> index 25e816863597..ca7c4058f6b8 100644
> --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
> +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c
> @@ -1403,7 +1403,8 @@ int mtk_vcodec_enc_ctrls_setup(struct mtk_vcodec_ctx *ctx)
> V4L2_MPEG_VIDEO_VP8_PROFILE_0, 0, V4L2_MPEG_VIDEO_VP8_PROFILE_0);
> v4l2_ctrl_new_std_menu(handler, ops, V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
> V4L2_MPEG_VIDEO_BITRATE_MODE_CBR,
> - 0, V4L2_MPEG_VIDEO_BITRATE_MODE_CBR);
> + ~(1 << V4L2_MPEG_VIDEO_BITRATE_MODE_CBR),
> + V4L2_MPEG_VIDEO_BITRATE_MODE_CBR);
>
>
> if (handler->error) {
> --
> 2.37.1.455.g008518b4e5-goog
>
@@ -1403,7 +1403,8 @@ int mtk_vcodec_enc_ctrls_setup(struct mtk_vcodec_ctx *ctx)
V4L2_MPEG_VIDEO_VP8_PROFILE_0, 0, V4L2_MPEG_VIDEO_VP8_PROFILE_0);
v4l2_ctrl_new_std_menu(handler, ops, V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
V4L2_MPEG_VIDEO_BITRATE_MODE_CBR,
- 0, V4L2_MPEG_VIDEO_BITRATE_MODE_CBR);
+ ~(1 << V4L2_MPEG_VIDEO_BITRATE_MODE_CBR),
+ V4L2_MPEG_VIDEO_BITRATE_MODE_CBR);
if (handler->error) {