Message ID | 20230220104849.398203-7-benjamin.gaignard@collabora.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1239790wrn; Mon, 20 Feb 2023 02:53:25 -0800 (PST) X-Google-Smtp-Source: AK7set8Z5I60c7peYtmj3gQEPq4WLlXJ0MU8ndj3ORGbn3vuwGL4NlNa67n+EC/VXwS8IvBzIxbb X-Received: by 2002:aa7:8bdb:0:b0:5a8:b37e:bb5 with SMTP id s27-20020aa78bdb000000b005a8b37e0bb5mr2227975pfd.12.1676890405636; Mon, 20 Feb 2023 02:53:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676890405; cv=none; d=google.com; s=arc-20160816; b=TGAc4ZAicfmU9nwsHs3KpaYkTg7Nu2rfdrjL2mWXO6TJqFfqlWBoC2U4c0WZJ9vAeN zVIrljtdYdybKzwKbvAxO7Six0zCuH5u6rd9bWkhbT7g+AR+xak6gMALr9xZ4getYpE7 QyE48tBQQ2BxJCYXP7b17RpVxGHojRQ0sc4DjKESNqRgXYtylTpdnPMtada/xr3eVB2J QtqHZEvxxjVy7Flo+NvqNj4AQUgc8FLvPO/ZWUhvdioOFXXSQwYYUW6kby2UwHj8jdjq HCwG+tMtceACjyNfkDgeAQmYOlAhYGhnI5oDw3R+FH8Iuem9RMV91QGft8PcVBX9gzqg Y8rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ee21mlckjAumj77F4902THfQPQZSX/w3iGwzBxpFyjI=; b=M5xkJAvvf8ZO+x64sIiUMVSKecqbY3FpeYI0ILPKVg+b0kbQ93pkWFz6haae8f8eci NycCsMdl9raMBUMjk1jXajp2hx4ewRgS6viqb5mpX6iKBRsTu6erMMcKlvRZfVl72u+/ 7e9ATUQpxgR00B79MBqB4UqD68EVjF1orXuVYK7oOYmDgoRBmNV/r64pKd8cVJqcq7up dsebK8IWiy9yePxaAexCzqUONyatO5aX6vHBesE/dxncxI9XRkiYXHLxN5jssZ1WJbFQ a+PVZVKjvwUpNf6+I+0rLwOdOoWtqUxByYlSCZ5BHtlqqOCVJkKAMveYptikK4ccxQ4i NsgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="WsfFgn/L"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f13-20020a056a001acd00b0056cb4662b9csi15168374pfv.16.2023.02.20.02.53.13; Mon, 20 Feb 2023 02:53:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="WsfFgn/L"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231714AbjBTKtS (ORCPT <rfc822;kautuk.consul.80@gmail.com> + 99 others); Mon, 20 Feb 2023 05:49:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231678AbjBTKtC (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 20 Feb 2023 05:49:02 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED522A5F2; Mon, 20 Feb 2023 02:49:01 -0800 (PST) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:d30c:b155:96fb:dcc]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: benjamin.gaignard) by madras.collabora.co.uk (Postfix) with ESMTPSA id 465BF6602173; Mon, 20 Feb 2023 10:49:00 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1676890140; bh=tiJU1XPfasKdiChhkAX5L0vI56X8ZEAvctUJUjANgAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WsfFgn/LAzRHgba5r4let4PikDJEKi3nz7x+JN032GIebw38U8b7q4/jfMgEUcc7E 9pEIGIASB0M7KVFEIhKtCEJGOrTBmNzE3jBC+D4eAv2if/fA3fu3s3pPGJN0HjUqqN 9qeKO3HLaWIKZw9ZnsKztmlrgYTqiYVCckpDNgKuuQmxQZtCp1IlMyVMP/HTCAKOYE 7+bWt8KZjpOSxJWK2DcIWE3KbWCg4wPPMOfbVpi0MVHZXHKSdJHLxJg72AekvkLkWF Bm8o+RgflIzQxHd7NjTg3gMoBco76PBfzJhGfUEsPlO/a82027p/MJZ7Dio+14xo8b rsf7MsWy4/GXA== From: Benjamin Gaignard <benjamin.gaignard@collabora.com> To: ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, mchehab@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, hverkuil-cisco@xs4all.nl, nicolas.dufresne@collabora.co.uk, robert.mader@collabora.com Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, Benjamin Gaignard <benjamin.gaignard@collabora.com> Subject: [PATCH v9 6/6] media: verisilicon: VP9: Only propose 10 bits compatible pixels formats Date: Mon, 20 Feb 2023 11:48:49 +0100 Message-Id: <20230220104849.398203-7-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230220104849.398203-1-benjamin.gaignard@collabora.com> References: <20230220104849.398203-1-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758347033831394941?= X-GMAIL-MSGID: =?utf-8?q?1758347033831394941?= |
Series |
media: verisilicon: HEVC: fix 10bits handling
|
|
Commit Message
Benjamin Gaignard
Feb. 20, 2023, 10:48 a.m. UTC
When decoding a 10bits bitstreams VP9 driver should only expose
10bits pixel formats.
To fulfill this requirement it is needed to call hantro_reset_raw_fmt()
when bit depth change and to correctly set match_depth in pixel formats
enumeration.
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
---
version 9:
- Fix brackets
drivers/media/platform/verisilicon/hantro_drv.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
Comments
On Mon, Feb 20 2023 at 11:48:49 AM +0100, Benjamin Gaignard <benjamin.gaignard@collabora.com> wrote: > When decoding a 10bits bitstreams VP9 driver should only expose > 10bits pixel formats. > To fulfill this requirement it is needed to call > hantro_reset_raw_fmt() > when bit depth change and to correctly set match_depth in pixel > formats > enumeration. > > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> > --- > version 9: > - Fix brackets > > drivers/media/platform/verisilicon/hantro_drv.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/platform/verisilicon/hantro_drv.c > b/drivers/media/platform/verisilicon/hantro_drv.c > index 7d452f1afaae..d20e62c025ae 100644 > --- a/drivers/media/platform/verisilicon/hantro_drv.c > +++ b/drivers/media/platform/verisilicon/hantro_drv.c > @@ -307,9 +307,14 @@ static int hantro_vp9_s_ctrl(struct v4l2_ctrl > *ctrl) > struct hantro_ctx, ctrl_handler); > > switch (ctrl->id) { > - case V4L2_CID_STATELESS_VP9_FRAME: > - ctx->bit_depth = ctrl->p_new.p_vp9_frame->bit_depth; > - break; > + case V4L2_CID_STATELESS_VP9_FRAME: { > + int bit_depth = ctrl->p_new.p_vp9_frame->bit_depth; > + > + if (ctx->bit_depth == bit_depth) > + return 0; > + > + return hantro_reset_raw_fmt(ctx, bit_depth); > + } > default: > return -EINVAL; > } > -- > 2.34.1 >
diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index 7d452f1afaae..d20e62c025ae 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -307,9 +307,14 @@ static int hantro_vp9_s_ctrl(struct v4l2_ctrl *ctrl) struct hantro_ctx, ctrl_handler); switch (ctrl->id) { - case V4L2_CID_STATELESS_VP9_FRAME: - ctx->bit_depth = ctrl->p_new.p_vp9_frame->bit_depth; - break; + case V4L2_CID_STATELESS_VP9_FRAME: { + int bit_depth = ctrl->p_new.p_vp9_frame->bit_depth; + + if (ctx->bit_depth == bit_depth) + return 0; + + return hantro_reset_raw_fmt(ctx, bit_depth); + } default: return -EINVAL; }