Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp126393pxj; Thu, 27 May 2021 23:25:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/E6qdeaoi88BlSPtRbwxibbp3kB25jMT5DV9XckUtmJUgUlGXPeH/hchlpqhH+DuQlX07 X-Received: by 2002:a17:906:a0a:: with SMTP id w10mr7457884ejf.416.1622183149972; Thu, 27 May 2021 23:25:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622183149; cv=none; d=google.com; s=arc-20160816; b=SILAd89tUZBskaqEmuacuXzsMlYuUaZlPCD2LAa2zNXjFKrE0hRYJ/1aOqgUIKIrUy Z0ActdLuEWPpFB5exL8pblQVwkNnbBbq57Lu63SywpTdk7gSuerIvaRHyISYpMF8+4HG YKShdxRubnjTwxtCqA3FBdgYJX/B5/R/1NhVO75eFF3iVjQ7bG2i0R2y1o97rfGnUd+h M4qIvTp1GNyNuuiLg97jQKUn6aBnQEEUNSUfy+nH0fg/h080d2md1436/GFlAjKaWHZ6 nPzY1jThJHCTTzePLhgYW7Ygnun9ki7cpdiwsyt7uADcb11zAZyyzkYWXJWL5mFP6nXe riKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject; bh=IiIfOdkt6RH9z1QIVa2Lsth+QYKql5vWX2PEkB1Z6BI=; b=pR+pnRRUhBDVOztr7Ja4fanr7CacrpMq7kJEw1Wow3/Kqz1AhC35nvaRzKJaEkGr33 pHZkYnMOJK4gCCsfGo07zRfn1kwMEFPyLGiqnsMkESqdsIP5LEO2BYIISC0PMYox839G q/0ZJ33Dc6SVdGaBRolR1I8g0KBIXrEP60NFZCJ+PValocoBNNS5c4Yxt4AAVyDcsYiM KwfcIjUB0HaheWrjLdM4fYgbIX1NVTHeZx8XxZV5nPSmuAqOo+koRI8otq81GQA/ybuG bUrJ+HQmeBFyjNhUJQXAEkl5wQo3fvj6Yt3OkXTUEo1rV2HHPjcqRkZcraZNu7AU9yDa H5ow== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e6si4647026edz.576.2021.05.27.23.25.16; Thu, 27 May 2021 23:25:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235031AbhE1F7Z (ORCPT + 99 others); Fri, 28 May 2021 01:59:25 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:60180 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234811AbhE1F7W (ORCPT ); Fri, 28 May 2021 01:59:22 -0400 Received: from [IPv6:2a00:a040:193:3500:ed56:60fb:a74f:177d] (unknown [IPv6:2a00:a040:193:3500:ed56:60fb:a74f:177d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dafna) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id D0F161F43EDC; Fri, 28 May 2021 06:57:05 +0100 (BST) Subject: Re: [PATCH v4,6/6] media: mtk-vcodec: Support MT8192 H264 4K encoding To: Irui Wang , Alexandre Courbot , Hans Verkuil , Tiffany Lin , Andrew-CT Chen , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Tomasz Figa , Hsin-Yi Wang , Maoguang Meng , Longfei Wang , Yong Wu Cc: Yunfei Dong , Fritz Koenig , Tzung-Bi Shih , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, srv_heupstream@mediatek.com, linux-mediatek@lists.infradead.org, Project_Global_Chrome_Upstream_Group@mediatek.com References: <20210521070139.20644-1-irui.wang@mediatek.com> <20210521070139.20644-7-irui.wang@mediatek.com> From: Dafna Hirschfeld Message-ID: <045d7e8e-967e-dc52-8c48-514edee0c1d1@collabora.com> Date: Fri, 28 May 2021 08:57:01 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20210521070139.20644-7-irui.wang@mediatek.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 21.05.21 10:01, Irui Wang wrote: > MT8192 H264 support 4k(3840x2176) and Level 5.1 encoding, > add related path according to enc_capability. > > Signed-off-by: Irui Wang > --- > .../platform/mtk-vcodec/mtk_vcodec_enc.c | 75 ++++++++++++------- > .../platform/mtk-vcodec/venc/venc_h264_if.c | 4 + > 2 files changed, 54 insertions(+), 25 deletions(-) > > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > index 42ff13867940..7396a5050b45 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c > @@ -19,23 +19,32 @@ > > #define MTK_VENC_MIN_W 160U > #define MTK_VENC_MIN_H 128U > -#define MTK_VENC_MAX_W 1920U > -#define MTK_VENC_MAX_H 1088U > +#define MTK_VENC_HD_MAX_W 1920U > +#define MTK_VENC_HD_MAX_H 1088U > +#define MTK_VENC_4K_MAX_W 3840U > +#define MTK_VENC_4K_MAX_H 2176U > + > #define DFT_CFG_WIDTH MTK_VENC_MIN_W > #define DFT_CFG_HEIGHT MTK_VENC_MIN_H > #define MTK_MAX_CTRLS_HINT 20 > > #define MTK_DEFAULT_FRAMERATE_NUM 1001 > #define MTK_DEFAULT_FRAMERATE_DENOM 30000 > +#define MTK_VENC_4K_CAPABILITY_ENABLE BIT(0) > > static void mtk_venc_worker(struct work_struct *work); > > -static const struct v4l2_frmsize_stepwise mtk_venc_framesizes = { > - MTK_VENC_MIN_W, MTK_VENC_MAX_W, 16, > - MTK_VENC_MIN_H, MTK_VENC_MAX_H, 16, > +static const struct v4l2_frmsize_stepwise mtk_venc_hd_framesizes = { > + MTK_VENC_MIN_W, MTK_VENC_HD_MAX_W, 16, > + MTK_VENC_MIN_H, MTK_VENC_HD_MAX_H, 16, > +}; > + > +static const struct v4l2_frmsize_stepwise mtk_venc_4k_framesizes = { > + MTK_VENC_MIN_W, MTK_VENC_4K_MAX_W, 16, > + MTK_VENC_MIN_H, MTK_VENC_4K_MAX_H, 16, > }; > > -#define NUM_SUPPORTED_FRAMESIZE ARRAY_SIZE(mtk_venc_framesizes) > +#define NUM_SUPPORTED_FRAMESIZE ARRAY_SIZE(mtk_venc_hd_framesizes) This define is never used so it can be removed. Thanks, Dafna > > static int vidioc_venc_s_ctrl(struct v4l2_ctrl *ctrl) > { > @@ -151,17 +160,20 @@ static int vidioc_enum_framesizes(struct file *file, void *fh, > struct v4l2_frmsizeenum *fsize) > { > const struct mtk_video_fmt *fmt; > + struct mtk_vcodec_ctx *ctx = fh_to_ctx(fh); > > if (fsize->index != 0) > return -EINVAL; > > fmt = mtk_venc_find_format(fsize->pixel_format, > - fh_to_ctx(fh)->dev->venc_pdata); > + ctx->dev->venc_pdata); > if (!fmt) > return -EINVAL; > > fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE; > - fsize->stepwise = mtk_venc_framesizes; > + fsize->stepwise = > + (ctx->dev->enc_capability & MTK_VENC_4K_CAPABILITY_ENABLE) ? > + mtk_venc_4k_framesizes : mtk_venc_hd_framesizes; > > return 0; > } > @@ -248,7 +260,7 @@ static struct mtk_q_data *mtk_venc_get_q_data(struct mtk_vcodec_ctx *ctx, > /* V4L2 specification suggests the driver corrects the format struct if any of > * the dimensions is unsupported > */ > -static int vidioc_try_fmt(struct v4l2_format *f, > +static int vidioc_try_fmt(struct mtk_vcodec_ctx *ctx, struct v4l2_format *f, > const struct mtk_video_fmt *fmt) > { > struct v4l2_pix_format_mplane *pix_fmt_mp = &f->fmt.pix_mp; > @@ -260,13 +272,22 @@ static int vidioc_try_fmt(struct v4l2_format *f, > pix_fmt_mp->plane_fmt[0].bytesperline = 0; > } else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { > int tmp_w, tmp_h; > + unsigned int max_width, max_height; > + > + if (ctx->dev->enc_capability & MTK_VENC_4K_CAPABILITY_ENABLE) { > + max_width = MTK_VENC_4K_MAX_W; > + max_height = MTK_VENC_4K_MAX_H; > + } else { > + max_width = MTK_VENC_HD_MAX_W; > + max_height = MTK_VENC_HD_MAX_H; > + } > > pix_fmt_mp->height = clamp(pix_fmt_mp->height, > MTK_VENC_MIN_H, > - MTK_VENC_MAX_H); > + max_height); > pix_fmt_mp->width = clamp(pix_fmt_mp->width, > MTK_VENC_MIN_W, > - MTK_VENC_MAX_W); > + max_width); > > /* find next closer width align 16, heign align 32, size align > * 64 rectangle > @@ -275,16 +296,16 @@ static int vidioc_try_fmt(struct v4l2_format *f, > tmp_h = pix_fmt_mp->height; > v4l_bound_align_image(&pix_fmt_mp->width, > MTK_VENC_MIN_W, > - MTK_VENC_MAX_W, 4, > + max_width, 4, > &pix_fmt_mp->height, > MTK_VENC_MIN_H, > - MTK_VENC_MAX_H, 5, 6); > + max_height, 5, 6); > > if (pix_fmt_mp->width < tmp_w && > - (pix_fmt_mp->width + 16) <= MTK_VENC_MAX_W) > + (pix_fmt_mp->width + 16) <= max_width) > pix_fmt_mp->width += 16; > if (pix_fmt_mp->height < tmp_h && > - (pix_fmt_mp->height + 32) <= MTK_VENC_MAX_H) > + (pix_fmt_mp->height + 32) <= max_height) > pix_fmt_mp->height += 32; > > mtk_v4l2_debug(0, > @@ -405,7 +426,7 @@ static int vidioc_venc_s_fmt_cap(struct file *file, void *priv, > } > > q_data->fmt = fmt; > - ret = vidioc_try_fmt(f, q_data->fmt); > + ret = vidioc_try_fmt(ctx, f, q_data->fmt); > if (ret) > return ret; > > @@ -467,7 +488,7 @@ static int vidioc_venc_s_fmt_out(struct file *file, void *priv, > f->fmt.pix.pixelformat = fmt->fourcc; > } > > - ret = vidioc_try_fmt(f, fmt); > + ret = vidioc_try_fmt(ctx, f, fmt); > if (ret) > return ret; > > @@ -545,7 +566,7 @@ static int vidioc_try_fmt_vid_cap_mplane(struct file *file, void *priv, > f->fmt.pix_mp.quantization = ctx->quantization; > f->fmt.pix_mp.xfer_func = ctx->xfer_func; > > - return vidioc_try_fmt(f, fmt); > + return vidioc_try_fmt(ctx, f, fmt); > } > > static int vidioc_try_fmt_vid_out_mplane(struct file *file, void *priv, > @@ -567,7 +588,7 @@ static int vidioc_try_fmt_vid_out_mplane(struct file *file, void *priv, > f->fmt.pix_mp.xfer_func = V4L2_XFER_FUNC_DEFAULT; > } > > - return vidioc_try_fmt(f, fmt); > + return vidioc_try_fmt(ctx, f, fmt); > } > > static int vidioc_venc_g_selection(struct file *file, void *priv, > @@ -1171,16 +1192,16 @@ void mtk_vcodec_enc_set_default_params(struct mtk_vcodec_ctx *ctx) > > v4l_bound_align_image(&q_data->coded_width, > MTK_VENC_MIN_W, > - MTK_VENC_MAX_W, 4, > + MTK_VENC_HD_MAX_W, 4, > &q_data->coded_height, > MTK_VENC_MIN_H, > - MTK_VENC_MAX_H, 5, 6); > + MTK_VENC_HD_MAX_H, 5, 6); > > if (q_data->coded_width < DFT_CFG_WIDTH && > - (q_data->coded_width + 16) <= MTK_VENC_MAX_W) > + (q_data->coded_width + 16) <= MTK_VENC_HD_MAX_W) > q_data->coded_width += 16; > if (q_data->coded_height < DFT_CFG_HEIGHT && > - (q_data->coded_height + 32) <= MTK_VENC_MAX_H) > + (q_data->coded_height + 32) <= MTK_VENC_HD_MAX_H) > q_data->coded_height += 32; > > q_data->sizeimage[0] = > @@ -1210,6 +1231,9 @@ int mtk_vcodec_enc_ctrls_setup(struct mtk_vcodec_ctx *ctx) > { > const struct v4l2_ctrl_ops *ops = &mtk_vcodec_enc_ctrl_ops; > struct v4l2_ctrl_handler *handler = &ctx->ctrl_hdl; > + const u8 h264_max_level = > + (ctx->dev->enc_capability & MTK_VENC_4K_CAPABILITY_ENABLE) ? > + V4L2_MPEG_VIDEO_H264_LEVEL_5_1 : V4L2_MPEG_VIDEO_H264_LEVEL_4_2; > > v4l2_ctrl_handler_init(handler, MTK_MAX_CTRLS_HINT); > > @@ -1240,8 +1264,9 @@ int mtk_vcodec_enc_ctrls_setup(struct mtk_vcodec_ctx *ctx) > V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, > 0, V4L2_MPEG_VIDEO_H264_PROFILE_HIGH); > v4l2_ctrl_new_std_menu(handler, ops, V4L2_CID_MPEG_VIDEO_H264_LEVEL, > - V4L2_MPEG_VIDEO_H264_LEVEL_4_2, > - 0, V4L2_MPEG_VIDEO_H264_LEVEL_4_0); > + h264_max_level, > + 0, V4L2_MPEG_VIDEO_H264_LEVEL_4_0); > + > if (handler->error) { > mtk_v4l2_err("Init control handler fail %d", > handler->error); > diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c > index d0123dfc5f93..b6a4f2074fa5 100644 > --- a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c > +++ b/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c > @@ -215,6 +215,10 @@ static unsigned int h264_get_level(struct venc_h264_inst *inst, > return 41; > case V4L2_MPEG_VIDEO_H264_LEVEL_4_2: > return 42; > + case V4L2_MPEG_VIDEO_H264_LEVEL_5_0: > + return 50; > + case V4L2_MPEG_VIDEO_H264_LEVEL_5_1: > + return 51; > default: > mtk_vcodec_debug(inst, "unsupported level %d", level); > return 31; >