Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A8C02C19F2A for ; Thu, 11 Aug 2022 15:34:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=I/PjryqInJ7i7Yj59nqh4YHHVkYYXAuVHtZYKJoQjUA=; b=nh/wXKapF9okadsm/HPSftrJsx 0ickSJb/A8eQpMVuPyuEdhjLm7HYA21Kes0KHpyqzZv43C5xeLdLwMz54/6ovf6Nm8BCy/pTHcDTz 3hnareXfTp9QHpoSZ9oR5nk02ApbiAZaPdzIi03qW/LTO3VknNFxbJOECs29O2ZwUg28Wufg2Iam1 /PEzw1wt1cUKZYa/stvkNtaIcol0Re2DMLhmepYL5yc72YedvgMr1LJPX8qZ84CumIAJ08RDyJWrh ucld1nXswSwmNGuefh0lSg4RWSA6EDPBYhU8it5rrH0Eq6JjE+Nk/57JP8Rg3S6lvOmyjCpFztbsr 5bpjJHaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oMACV-00E12Y-KA; Thu, 11 Aug 2022 15:34:23 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oMABr-00E0Rk-W0; Thu, 11 Aug 2022 15:33:46 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 529BDB8215E; Thu, 11 Aug 2022 15:33:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B007FC433B5; Thu, 11 Aug 2022 15:33:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660232021; bh=xizQ1FcyAgy3xUVeDsDcPWFhWdEEzYl0CwRjLQCek1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JMVw7Tkg1oyV7qv71PPsbFLm947vNv9LkY47OqE4B6P8/iD8FH5pvOKUQFjuCGxTM 63Re0Qd6UahsI+jLchAsZzDUKU2Ng65+8PYjZUYDv2Sf1KJzYGkP3nRO1szBpLTyvv xIL5I2g1V2gMDO+5Cso0As21AoSzdyYs25Y/pH1N22PoyjFJuZnkGXy7nW/GsbcFcG DOMn7DybooO43QqF+M6go8786FwNOM4cjrZCJbKlgzat7jFpWkxhNUjvDOY3H1sIzt y3hSf1Zxc3EdGRekpGKVuWL+ITGLnkVLGFrlQLDZxCfQvjvlLGe8ZjjUf+qpplfQQN tFFec03oxFFBQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hirokazu Honda , Irui Wang , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , tiffany.lin@mediatek.com, andrew-ct.chen@mediatek.com, matthias.bgg@gmail.com, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 5.19 049/105] media: mediatek: vcodec: Report supported bitrate modes Date: Thu, 11 Aug 2022 11:27:33 -0400 Message-Id: <20220811152851.1520029-49-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220811152851.1520029-1-sashal@kernel.org> References: <20220811152851.1520029-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220811_083344_218824_6DC26518 X-CRM114-Status: GOOD ( 11.64 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Hirokazu Honda [ Upstream commit d8e8aa866ed8636fd6c1017c3d9453eab2922496 ] The media driver supports constant bitrate mode only. The supported rate control mode is reported through querymenu() and s_ctrl() fails if non constant bitrate mode (e.g. VBR) is requested. Signed-off-by: Hirokazu Honda Reviewed-by: Irui Wang Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- .../media/platform/mediatek/vcodec/mtk_vcodec_enc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c index c21367038c34..98d451ce2545 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_enc.c @@ -50,6 +50,14 @@ static int vidioc_venc_s_ctrl(struct v4l2_ctrl *ctrl) int ret = 0; switch (ctrl->id) { + case V4L2_CID_MPEG_VIDEO_BITRATE_MODE: + mtk_v4l2_debug(2, "V4L2_CID_MPEG_VIDEO_BITRATE_MODE val= %d", + ctrl->val); + if (ctrl->val != V4L2_MPEG_VIDEO_BITRATE_MODE_CBR) { + mtk_v4l2_err("Unsupported bitrate mode =%d", ctrl->val); + ret = -EINVAL; + } + break; case V4L2_CID_MPEG_VIDEO_BITRATE: mtk_v4l2_debug(2, "V4L2_CID_MPEG_VIDEO_BITRATE val = %d", ctrl->val); @@ -1373,6 +1381,9 @@ int mtk_vcodec_enc_ctrls_setup(struct mtk_vcodec_ctx *ctx) 0, V4L2_MPEG_VIDEO_H264_LEVEL_4_0); v4l2_ctrl_new_std_menu(handler, ops, V4L2_CID_MPEG_VIDEO_VP8_PROFILE, 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); if (handler->error) { -- 2.35.1