Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp2269336imw; Wed, 6 Jul 2022 03:04:42 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vEEvNymrQKYsAj1uXRaYUXAoseKccfLeKr7a5AiDkrNOrxhIwd7mjJEanNu4XxEs87JCT9 X-Received: by 2002:a17:90b:4a8a:b0:1ed:4a56:d7e7 with SMTP id lp10-20020a17090b4a8a00b001ed4a56d7e7mr48856207pjb.1.1657101882231; Wed, 06 Jul 2022 03:04:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657101882; cv=none; d=google.com; s=arc-20160816; b=nnFmbq9jZfzS9sTUW81UDQ2dFAzYT8a2O7MjvnL4yOh82dC0ufcTm2ZsdCwCrZKf52 ZZQMoEJb4GxkKzM5xdgdBh2HUwLOZhMp7bjB2nUfvspcv6CICTbvNuHPJwdy77gJJ77J rWvtyGarGBu24vbxnqYJQcOwAS5Z+4vzwhwWG5G8iYQmpJzXKpeT9rxs2s8ZrVsWUKIZ s0PoPz3q4WCY4kjp0hM2bWz4wPzSof0Ew63hdgpU0wxj+fsXGIh/w3HHzWNw4+9aomLB C0/lkK5wuXuO4MfVXgjUxfMpwLR52LyJNGPpr9R9GFt5OhR+5xSxSUiU5fzUxfdGc+Bw o85Q== 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=ME6NYugOVK0BOtBQs3DLnXk1/xWGzf/7AZ+q53cSMH4=; b=pHb4a8N0D4XrTNZGDftj2IlOV+ZpcMBFSsgdKMhNiJnD1yoWHhCfxmSx+a/p9dHxsG Qf1zk54bWVbIl+ff7SQVRuBNv/vk4BoxBZpBKe8sp9EhH4KKu4QohWxrB3d2ITouXLgm sgj8JdqediECYJOMl6ur+DaxM+f4r9uup6Lc/GUEiwA4/EW81T8NzDYFv+FZmnIWDMRe l7fmRh7c2DZiuNEPyBFA5bjwtcXDWPDFi7s7IImkuUxUaRIlSp4PAXHhLyjjlT4nl+SW 5/Tw0IrxxC/2rtb10GDls9RIaF5ID45rRRCvAQ2865lhAPVDhD/+V/SJttfSR6gyUcdF tISw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=cUVeBF0G; 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 x14-20020a170902ec8e00b00163e1591f90si19423846plg.24.2022.07.06.03.04.26; Wed, 06 Jul 2022 03:04:42 -0700 (PDT) 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=cUVeBF0G; 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 S233230AbiGFJi4 (ORCPT + 99 others); Wed, 6 Jul 2022 05:38:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232728AbiGFJiT (ORCPT ); Wed, 6 Jul 2022 05:38:19 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 718AB237D0; Wed, 6 Jul 2022 02:38:18 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:3a70:988d:42ce:f5cc]) (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 B9A4366019C4; Wed, 6 Jul 2022 10:38:16 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1657100297; bh=BCrFtwmwew8PNj9oIBOiMYIYjxUWWFLXB3JoJRd0CEA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cUVeBF0G0V6+s5eD0FrzPA4OLUfCmtU2FAU1xBkbirAM3bbmjmnf51Zqf1zU1QhR8 fVuD5WLL3hGf9wMkHVG7UXyM6XlfT9i7fVjpHVzyTvJMtJkJa1GnuNYkCqBmgGq4PE H38XAPfKUiJBWNf4Ti0GFBulx1XkcXvGJu5zLgl5Btq7sD+HIhpCNFH725syTbWYZ3 mznSeDFrYZJTeWVfD9T5tOjHpOQZ2Pxq8zrnEoVE8PIBZRskSvDiO6pCwmgtK1BrWt M2iYde38vbmttqdXqOF9c33CcHFyOoWgsw4kysRmK2uXR5ouThwfJwx8U0JiURus9m TfAq4VtIQZ8xA== From: Benjamin Gaignard To: mchehab@kernel.org, hverkuil@xs4all.nl, ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, gregkh@linuxfoundation.org, mripard@kernel.org, paul.kocialkowski@bootlin.com, wens@csie.org, jernej.skrabec@gmail.com, samuel@sholland.org, nicolas.dufresne@collabora.com, andrzej.p@collabora.com Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, kernel@collabora.com, Benjamin Gaignard Subject: [PATCH v11 09/17] media: uapi: HEVC: Define V4L2_CID_STATELESS_HEVC_SLICE_PARAMS as a dynamic array Date: Wed, 6 Jul 2022 11:37:55 +0200 Message-Id: <20220706093803.158810-10-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220706093803.158810-1-benjamin.gaignard@collabora.com> References: <20220706093803.158810-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, T_SCC_BODY_TEXT_LINE 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 Make explicit that V4L2_CID_STATELESS_HEVC_SLICE_PARAMS control is a dynamic array control type. Some drivers may be able to receive multiple slices in one control to improve decoding performance. Signed-off-by: Benjamin Gaignard --- Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst | 2 ++ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 1 + drivers/staging/media/sunxi/cedrus/cedrus.c | 2 ++ include/media/hevc-ctrls.h | 3 +++ 4 files changed, 8 insertions(+) diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst index e88b5e6944a6..c2e0adece613 100644 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst @@ -2986,6 +2986,8 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - These bitstream parameters are defined according to :ref:`hevc`. They are described in section 7.4.7 "General slice segment header semantics" of the specification. + This control is a dynamically sized 1-dimensional array, + V4L2_CTRL_FLAG_DYNAMIC_ARRAY flag must be set when using it. .. c:type:: v4l2_ctrl_hevc_slice_params diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c index 9f55503cd3d6..d594efbcbb93 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c @@ -1510,6 +1510,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, break; case V4L2_CID_STATELESS_HEVC_SLICE_PARAMS: *type = V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS; + *flags |= V4L2_CTRL_FLAG_DYNAMIC_ARRAY; break; case V4L2_CID_STATELESS_HEVC_SCALING_MATRIX: *type = V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX; diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c index 87be975a72b6..b12219123a6b 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c @@ -178,6 +178,8 @@ static const struct cedrus_control cedrus_controls[] = { { .cfg = { .id = V4L2_CID_STATELESS_HEVC_SLICE_PARAMS, + /* The driver can only handle 1 entry per slice for now */ + .dims = { 1 }, }, .codec = CEDRUS_CODEC_H265, }, diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h index 57053cfa099b..341fc795d550 100644 --- a/include/media/hevc-ctrls.h +++ b/include/media/hevc-ctrls.h @@ -314,6 +314,9 @@ struct v4l2_hevc_pred_weight_table { /** * struct v4l2_ctrl_hevc_slice_params - HEVC slice parameters * + * This control is a dynamically sized 1-dimensional array, + * V4L2_CTRL_FLAG_DYNAMIC_ARRAY flag must be set when using it. + * * @bit_size: size (in bits) of the current slice data * @data_bit_offset: offset (in bits) to the video data in the current slice data * @nal_unit_type: specifies the coding type of the slice (B, P or I) -- 2.32.0