From nobody Thu Nov 14 19:37:15 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 511EDC43217 for ; Thu, 12 May 2022 02:21:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241186AbiELCVN (ORCPT ); Wed, 11 May 2022 22:21:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240471AbiELCUQ (ORCPT ); Wed, 11 May 2022 22:20:16 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F4D16EC43; Wed, 11 May 2022 19:20:13 -0700 (PDT) X-UUID: a28f92ebfa4941be8a4259a5221efa20-20220512 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.4,REQID:3329ee1f-5c71-4610-b3ea-539beea3c21d,OB:0,LO B:0,IP:0,URL:0,TC:0,Content:-20,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,AC TION:release,TS:-20 X-CID-META: VersionHash:faefae9,CLOUDID:be1d4125-b432-452e-9e03-2bf3148aed85,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,File:nil,QS:0,BEC:nil X-UUID: a28f92ebfa4941be8a4259a5221efa20-20220512 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1297563382; Thu, 12 May 2022 10:20:09 +0800 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Thu, 12 May 2022 10:20:08 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 12 May 2022 10:20:08 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 12 May 2022 10:20:04 +0800 From: Yunfei Dong To: Yunfei Dong , Alexandre Courbot , Nicolas Dufresne , "Hans Verkuil" , AngeloGioacchino Del Regno , Benjamin Gaignard , Tiffany Lin , Andrew-CT Chen , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Tomasz Figa CC: George Sun , Xiaoyong Lu , Hsin-Yi Wang , Fritz Koenig , Daniel Vetter , dri-devel , Irui Wang , "Steve Cho" , , , , , , Subject: [PATCH v12, 08/17] media: mediatek: vcodec: Getting supported decoder format types Date: Thu, 12 May 2022 10:19:41 +0800 Message-ID: <20220512021950.29087-9-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220512021950.29087-1-yunfei.dong@mediatek.com> References: <20220512021950.29087-1-yunfei.dong@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Getting supported output and capture queue format types according to decoder capability. Signed-off-by: Yunfei Dong Reviewed-by: AngeloGioacchino Del Regno --- .../vcodec/mtk_vcodec_dec_stateless.c | 118 +++++++++++++----- 1 file changed, 84 insertions(+), 34 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateles= s.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c index 0034b2ee9259..5101322f4fe9 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c @@ -81,34 +81,23 @@ static const struct mtk_stateless_control mtk_stateless= _controls[] =3D { =20 #define NUM_CTRLS ARRAY_SIZE(mtk_stateless_controls) =20 -static const struct mtk_video_fmt mtk_video_formats[] =3D { - { - .fourcc =3D V4L2_PIX_FMT_H264_SLICE, - .type =3D MTK_FMT_DEC, - .num_planes =3D 1, - }, - { - .fourcc =3D V4L2_PIX_FMT_MM21, - .type =3D MTK_FMT_FRAME, - .num_planes =3D 2, - }, -}; - -static const unsigned int num_supported_formats =3D ARRAY_SIZE(mtk_video_f= ormats); - -#define DEFAULT_OUT_FMT_IDX 0 -#define DEFAULT_CAP_FMT_IDX 1 - -static const struct mtk_codec_framesizes mtk_vdec_framesizes[] =3D { - { - .fourcc =3D V4L2_PIX_FMT_H264_SLICE, - .stepwise =3D { MTK_VDEC_MIN_W, MTK_VDEC_MAX_W, 16, - MTK_VDEC_MIN_H, MTK_VDEC_MAX_H, 16 }, - }, +static struct mtk_video_fmt mtk_video_formats[2]; +static struct mtk_codec_framesizes mtk_vdec_framesizes[1]; + +static struct mtk_video_fmt default_out_format; +static struct mtk_video_fmt default_cap_format; +static unsigned int num_formats; +static unsigned int num_framesizes; + +static struct v4l2_frmsize_stepwise stepwise_fhd =3D { + .min_width =3D MTK_VDEC_MIN_W, + .max_width =3D MTK_VDEC_MAX_W, + .step_width =3D 16, + .min_height =3D MTK_VDEC_MIN_H, + .max_height =3D MTK_VDEC_MAX_H, + .step_height =3D 16 }; =20 -static const unsigned int num_supported_framesize =3D ARRAY_SIZE(mtk_vdec_= framesizes); - static void mtk_vdec_stateless_cap_to_disp(struct mtk_vcodec_ctx *ctx, int= error, struct media_request *src_buf_req) { @@ -323,6 +312,62 @@ const struct media_device_ops mtk_vcodec_media_ops =3D= { .req_queue =3D v4l2_m2m_request_queue, }; =20 +static void mtk_vcodec_add_formats(unsigned int fourcc, + struct mtk_vcodec_ctx *ctx) +{ + struct mtk_vcodec_dev *dev =3D ctx->dev; + const struct mtk_vcodec_dec_pdata *pdata =3D dev->vdec_pdata; + int count_formats =3D *pdata->num_formats; + int count_framesizes =3D *pdata->num_framesizes; + + switch (fourcc) { + case V4L2_PIX_FMT_H264_SLICE: + mtk_video_formats[count_formats].fourcc =3D fourcc; + mtk_video_formats[count_formats].type =3D MTK_FMT_DEC; + mtk_video_formats[count_formats].num_planes =3D 1; + + mtk_vdec_framesizes[count_framesizes].fourcc =3D fourcc; + mtk_vdec_framesizes[count_framesizes].stepwise =3D stepwise_fhd; + num_framesizes++; + break; + case V4L2_PIX_FMT_MM21: + mtk_video_formats[count_formats].fourcc =3D fourcc; + mtk_video_formats[count_formats].type =3D MTK_FMT_FRAME; + mtk_video_formats[count_formats].num_planes =3D 2; + break; + default: + mtk_v4l2_err("Can not add unsupported format type"); + return; + } + + num_formats++; + mtk_v4l2_debug(3, "num_formats: %d num_frames:%d dec_capability: 0x%x", + count_formats, count_framesizes, ctx->dev->dec_capability); +} + +static void mtk_vcodec_get_supported_formats(struct mtk_vcodec_ctx *ctx) +{ + int cap_format_count =3D 0, out_format_count =3D 0; + + if (num_formats && num_framesizes) + return; + + if (ctx->dev->dec_capability & MTK_VDEC_FORMAT_MM21) { + mtk_vcodec_add_formats(V4L2_PIX_FMT_MM21, ctx); + cap_format_count++; + } + if (ctx->dev->dec_capability & MTK_VDEC_FORMAT_H264_SLICE) { + mtk_vcodec_add_formats(V4L2_PIX_FMT_H264_SLICE, ctx); + out_format_count++; + } + + if (cap_format_count) + default_cap_format =3D mtk_video_formats[cap_format_count - 1]; + if (out_format_count) + default_out_format =3D + mtk_video_formats[cap_format_count + out_format_count - 1]; +} + static void mtk_init_vdec_params(struct mtk_vcodec_ctx *ctx) { struct vb2_queue *src_vq; @@ -330,6 +375,11 @@ static void mtk_init_vdec_params(struct mtk_vcodec_ctx= *ctx) src_vq =3D v4l2_m2m_get_vq(ctx->m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); =20 + if (!ctx->dev->vdec_pdata->is_subdev_supported) + ctx->dev->dec_capability |=3D + MTK_VDEC_FORMAT_H264_SLICE | MTK_VDEC_FORMAT_MM21; + mtk_vcodec_get_supported_formats(ctx); + /* Support request api for output plane */ src_vq->supports_requests =3D true; src_vq->requires_requests =3D true; @@ -363,11 +413,11 @@ const struct mtk_vcodec_dec_pdata mtk_vdec_8183_pdata= =3D { .ctrls_setup =3D mtk_vcodec_dec_ctrls_setup, .vdec_vb2_ops =3D &mtk_vdec_request_vb2_ops, .vdec_formats =3D mtk_video_formats, - .num_formats =3D &num_supported_formats, - .default_out_fmt =3D &mtk_video_formats[DEFAULT_OUT_FMT_IDX], - .default_cap_fmt =3D &mtk_video_formats[DEFAULT_CAP_FMT_IDX], + .num_formats =3D &num_formats, + .default_out_fmt =3D &default_out_format, + .default_cap_fmt =3D &default_cap_format, .vdec_framesizes =3D mtk_vdec_framesizes, - .num_framesizes =3D &num_supported_framesize, + .num_framesizes =3D &num_framesizes, .uses_stateless_api =3D true, .worker =3D mtk_vdec_worker, .flush_decoder =3D mtk_vdec_flush_decoder, @@ -383,11 +433,11 @@ const struct mtk_vcodec_dec_pdata mtk_lat_sig_core_pd= ata =3D { .ctrls_setup =3D mtk_vcodec_dec_ctrls_setup, .vdec_vb2_ops =3D &mtk_vdec_request_vb2_ops, .vdec_formats =3D mtk_video_formats, - .num_formats =3D &num_supported_formats, - .default_out_fmt =3D &mtk_video_formats[DEFAULT_OUT_FMT_IDX], - .default_cap_fmt =3D &mtk_video_formats[DEFAULT_CAP_FMT_IDX], + .num_formats =3D &num_formats, + .default_out_fmt =3D &default_out_format, + .default_cap_fmt =3D &default_cap_format, .vdec_framesizes =3D mtk_vdec_framesizes, - .num_framesizes =3D &num_supported_framesize, + .num_framesizes =3D &num_framesizes, .uses_stateless_api =3D true, .worker =3D mtk_vdec_worker, .flush_decoder =3D mtk_vdec_flush_decoder, --=20 2.18.0