Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp199838rwb; Thu, 12 Jan 2023 05:20:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXt/DDNdU75S5VRIgQQZoQuSpKCO7AIxcH38WrJBlcEYnuwdYl2L3HZwfInttXpfIXUxjzvr X-Received: by 2002:a17:906:819:b0:7ad:e67d:f15c with SMTP id e25-20020a170906081900b007ade67df15cmr72196744ejd.48.1673529639217; Thu, 12 Jan 2023 05:20:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673529639; cv=none; d=google.com; s=arc-20160816; b=Nrh1HNQxWKECdGqSQa/NBbz9AP5+IZqzJB5H1DfZJImnvh2mdElTITdp+qqscuP9y9 iJV5w2pdQviPgXXA7qn12549AgkFPysaNNEE7wdQ9nggWyLdQ8A5FYtOlYhe0Fx55Idm IdmfNEh51EZ0hDviHSO1z0v0T/tB6iimyBWOgCB3eW+iOm9hJpBe2m5ViHDI4oM+DxmL az8V2oF0WDQcprlPxPrrhiE36YE6kgSy4SStysKQBHT3Ch4Z7Aq7wxIu+aIvaOCn0N2h Gd+DzAKvXrpE/QNtFUDbQFVL9USrPlUp/mNKrQ6PBvesBX3jWLubxM3ETYzc7Z5VY80f grXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=e1djzduo0bxwKcJJzVadqYoAShQQJ5wpZuK2knus43M=; b=wvFOM295Wit5i56V9JJ7P933k0Zo1sKYuG7RbLWKQV+URGLVWFgntDz8fwDcczHFy2 cktoIS68FonWQMusNmJHXrzgNKDSe6ZU7RFYPcz0eVKXFIWLxA2mnL8f5y/D63qkwrOV 51hAisVQXgVlKCX9PnyhBYNeB/hxjbnOh2YY0CZPVYiBlMwisHr+maCI+8sKmLYK0KOd iZleHCcQfQsOpNwnvEzTlGQsOHehymD9fyZrv5/3Nit/DiHwoEW6l0gklg8m8M28YFcV qKWO4SKqOOnTre8Nsx9BetRLf6We+oDWw6FULaxXNfvKBO5rOEyn2aETXyV45cF74rJT fUng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=P22F8isb; 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=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dd10-20020a1709069b8a00b007c31599251csi19604560ejc.590.2023.01.12.05.20.26; Thu, 12 Jan 2023 05:20:39 -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=P22F8isb; 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=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231723AbjALM5U (ORCPT + 50 others); Thu, 12 Jan 2023 07:57:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231761AbjALM4x (ORCPT ); Thu, 12 Jan 2023 07:56:53 -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 7421050E41; Thu, 12 Jan 2023 04:56:52 -0800 (PST) Received: from localhost (89-26-75-29.goll.dyn.salzburg-online.at [89.26.75.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sebastianfricke) by madras.collabora.co.uk (Postfix) with ESMTPSA id 2CAEF6602DB9; Thu, 12 Jan 2023 12:56:51 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1673528211; bh=L7yUo+Zy/WcujWFgTjyCDy8xs7O/0zxdTxZIPyBpgSk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=P22F8isb/92Gjf4AENjAKMgGWDmFwC0qIFR7iMIgoD9bBf9rFm664WPACZSLAr8E2 qfajrA7qgYi5RoMLhupOs4cAP6zWL05znXgyChFWLKpziSUCzxy+2hrjfXNN7dXHWa 0zHFrQsP6FZvz+0ew0u+No52ksa3xqB8VjYR74M0OaS8qN0CRB7YojDQSo6ZoAJGtr EjQL9xHzvjcnsFjrFiMR93+H8rstCGkRnMCshoJu05db/zuBOPM9wqLLatm//9x0TE jcl1H3/M/lAi6hMVNz6qQI+rELbEZeur5dMwA2IIuaY/+ydg2CE91YAxI1jb1XVVY/ wI3oUA0Z1tQ7A== From: Sebastian Fricke Date: Thu, 12 Jan 2023 13:56:22 +0100 Subject: [PATCH v2 07/12] staging: media: rkvdec: Add a routine to fetch SPS attributes as a callback MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230101-patch-series-v2-6-2-rc1-v2-7-fa1897efac14@collabora.com> References: <20230101-patch-series-v2-6-2-rc1-v2-0-fa1897efac14@collabora.com> In-Reply-To: <20230101-patch-series-v2-6-2-rc1-v2-0-fa1897efac14@collabora.com> To: Mauro Carvalho Chehab , Ezequiel Garcia , Greg Kroah-Hartman Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, Jonas Karlman , Alex Bee , Nicolas Dufresne , Collabora Kernel-domain , Robert Beckett , Laurent Pinchart , Andrzej Pietrasiewicz , Benjamin Gaignard , Sebastian Fricke X-Mailer: b4 0.11.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1673528186; l=2158; i=sebastian.fricke@collabora.com; s=linux-media; h=from:subject:message-id; bh=L7yUo+Zy/WcujWFgTjyCDy8xs7O/0zxdTxZIPyBpgSk=; b=BQBpXVr9E3Fn2xXJWy5utkd9tAkwvp5ZmvKorxmvoteBpq2FSBbzIP1smBJqXM3OVtIox4UT7+qw qNzHyG+6AZYM2KNQS3zMp/Hpk0VCVIgsydDjavwdm+2IKSiWNpT1 X-Developer-Key: i=sebastian.fricke@collabora.com; a=ed25519; pk=pYXedPwrTtErcj7ERYeo/IpTrpe4QbJuEzSB52fslBg= 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: X-Mailing-List: linux-kernel@vger.kernel.org Add a callback for each codec variant, that fetches basic information like resolution, bit-depth and sub-sampling from a SPS structure. This data is used to verify whether a new SPS structure is valid. Signed-off-by: Sebastian Fricke --- drivers/staging/media/rkvdec/rkvdec.c | 10 ++++++++++ drivers/staging/media/rkvdec/rkvdec.h | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index a46f918926a2..e8c750a7343a 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -52,6 +52,16 @@ static int rkvdec_get_valid_fmt(struct rkvdec_ctx *ctx) return ctx->coded_fmt_desc->decoded_fmts[0]; } +static int rkvdec_get_sps_attributes(struct rkvdec_ctx *ctx, void *sps, + struct sps_attributes *attributes) +{ + const struct rkvdec_coded_fmt_desc *coded_desc = ctx->coded_fmt_desc; + + if (coded_desc->ops->get_sps_attributes) + return coded_desc->ops->get_sps_attributes(ctx, sps, attributes); + return 0; +} + static int rkvdec_try_ctrl(struct v4l2_ctrl *ctrl) { struct rkvdec_ctx *ctx = container_of(ctrl->handler, struct rkvdec_ctx, ctrl_hdl); diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/staging/media/rkvdec/rkvdec.h index e353a4403e5b..7b6702c360fd 100644 --- a/drivers/staging/media/rkvdec/rkvdec.h +++ b/drivers/staging/media/rkvdec/rkvdec.h @@ -63,10 +63,20 @@ vb2_to_rkvdec_decoded_buf(struct vb2_buffer *buf) base.vb.vb2_buf); } +struct sps_attributes { + unsigned int width; + unsigned int height; + unsigned int luma_bitdepth; + unsigned int chroma_bitdepth; + unsigned int subsampling; +}; + struct rkvdec_coded_fmt_ops { int (*adjust_fmt)(struct rkvdec_ctx *ctx, struct v4l2_format *f); u32 (*valid_fmt)(struct rkvdec_ctx *ctx); + int (*get_sps_attributes)(struct rkvdec_ctx *ctx, void *sps, + struct sps_attributes *attributes); int (*start)(struct rkvdec_ctx *ctx); void (*stop)(struct rkvdec_ctx *ctx); int (*run)(struct rkvdec_ctx *ctx); -- 2.25.1