Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp1027765imw; Tue, 5 Jul 2022 02:27:20 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uIxfOAMk56DiB1LJC+vJNubFhqyU5CDPwDGzivyg8K01MifgKHriVpbpD7ssDAwXd9KHIp X-Received: by 2002:a17:902:ba93:b0:16b:f484:65d3 with SMTP id k19-20020a170902ba9300b0016bf48465d3mr1213767pls.39.1657013240631; Tue, 05 Jul 2022 02:27:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657013240; cv=none; d=google.com; s=arc-20160816; b=Fg9z07ezmVvJG48ubspjmYj4v4XGn6DrwtCkF/RTzjvh7hJwv/2LyKTSLRAZ+E1lXx 4GL8pWAEFLpIFWFY/XsvyIqFADc2m7rLC0H9CIklHVvQygPyX+Gv35gc41NgrLOIOfWx RqjVBpzWclc8fp6WBb9KEaEWdxYfD+I1uzd9cXJBe+8U+B0ZeYVlaJnv8lYV758x75DD /cwRUuPgql4eUgQ1G7ZDN+rymLgX+zrvUDbWeSBJHat8cJ/A5be/ClDfwhZ9niLf3xyt bRMMyKU7TaSLUfy5fzlI7w1agMuhGuoHN/8wrBd1pwBAQBIvKmw/Z/epiLoS9WJgypst bYRQ== 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=jgr2Yb1hXwpxgo5rZNr4d9Vh8G2sNbnaKQLjfVns9OM=; b=gSLp8gHSnGoeiAPKnVULsib9okHI0SpJ7M+SxPFZkIhbGBlvmWNIXnEUfD4AeVOccu dmuv+OCq44kgmwJiqDPKDQeP+O57q56GKjto/lzYhcDIT9gRv3dvxf1pvoZS47aVHGyY ihZUmUwV6yue8Gw93AqD/MNfIcNMiStip1ppNs9ztkSti8UDoVOU60/zoUVNuR039+81 /JKmEH31w+Ieqb+zRVL0XH4YaVEtOGAdmyhpSTsx5RKvtoRFOQuy858hjDj4Zqx0ykT1 p+tzmG64ZfojF3xeOnipbR5XDQauMLbjjxIKEEQlxO/ofMtmC9kkF0yYFc2DpWm1dzmv y+Jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=UuaLudWC; 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 c21-20020a170902849500b0016b7dd2626fsi20949748plo.195.2022.07.05.02.27.08; Tue, 05 Jul 2022 02:27:20 -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=UuaLudWC; 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 S231593AbiGEIzL (ORCPT + 99 others); Tue, 5 Jul 2022 04:55:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230514AbiGEIyk (ORCPT ); Tue, 5 Jul 2022 04:54:40 -0400 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 00EF2DFBA; Tue, 5 Jul 2022 01:54:37 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:6610:ee84:2ba:7917]) (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 EE2EC66019A1; Tue, 5 Jul 2022 09:54:35 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1657011276; bh=fzUCStYFvYKydL3xXfrJSKhQ4GVJBcqhFieEb/6dH30=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UuaLudWC6m00TrvGPwzAbo8H2AQmtqYyQeO0dBtTXVCl/Lx41oHoSkiUgVDCU2Z1g 8GcGV0Ed3kwQIeRdv8TBpKuGXW+aD6T6zB6Tt/2T3Ehr8jGThFi9qOiHfY8sL+eVhz Pn9TdWnYyN9Q2rBGSKWHc6fvW3j40bzP4pCOoCip4v24/1S4q16Cpqb6i0bE/dI4q2 sRhLNWLcTvbiIzjY9lKV2SaFfWp1i6b2zmfcz9xuJeD0y55vHrLYuLIGt83nARu5Zf /UxVyrXvv+VKRUTjbNhfdkqUW3zwMiXsRDftBNNfs8Ja1jBTbex8iOLx8ZNwrMFPY9 7ygtlK04Q+lCA== 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 v10 12/17] media: uapi: Move the HEVC stateless control type out of staging Date: Tue, 5 Jul 2022 10:54:15 +0200 Message-Id: <20220705085420.272912-13-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220705085420.272912-1-benjamin.gaignard@collabora.com> References: <20220705085420.272912-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 Move the HEVC stateless controls types out of staging, and re-number them. Signed-off-by: Benjamin Gaignard Acked-by: Nicolas Dufresne Tested-by: Jernej Skrabec --- .../userspace-api/media/videodev2.h.rst.exceptions | 5 +++++ include/media/hevc-ctrls.h | 7 ------- include/uapi/linux/videodev2.h | 6 ++++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Documentation/userspace-api/media/videodev2.h.rst.exceptions b/Documentation/userspace-api/media/videodev2.h.rst.exceptions index 0b91200776f8..2feea4a5a008 100644 --- a/Documentation/userspace-api/media/videodev2.h.rst.exceptions +++ b/Documentation/userspace-api/media/videodev2.h.rst.exceptions @@ -153,6 +153,11 @@ replace symbol V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_VP9_FRAME :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_HDR10_CLL_INFO :c:type:`v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_HDR10_MASTERING_DISPLAY :c:type:`v4l2_ctrl_type` +replace symbol V4L2_CTRL_TYPE_HEVC_SPS :c:type:`v4l2_ctrl_type` +replace symbol V4L2_CTRL_TYPE_HEVC_PPS :c:type:`v4l2_ctrl_type` +replace symbol V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS :c:type:`v4l2_ctrl_type` +replace symbol V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX :c:type:`v4l2_ctrl_type` +replace symbol V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS :c:type:`v4l2_ctrl_type` # V4L2 capability defines replace define V4L2_CAP_VIDEO_CAPTURE device-capabilities diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h index 3a6601a46ced..42d16e8a1050 100644 --- a/include/media/hevc-ctrls.h +++ b/include/media/hevc-ctrls.h @@ -22,13 +22,6 @@ #define V4L2_CID_STATELESS_HEVC_START_CODE (V4L2_CID_CODEC_BASE + 1016) #define V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS (V4L2_CID_CODEC_BASE + 1017) -/* enum v4l2_ctrl_type type values */ -#define V4L2_CTRL_TYPE_HEVC_SPS 0x0120 -#define V4L2_CTRL_TYPE_HEVC_PPS 0x0121 -#define V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS 0x0122 -#define V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX 0x0123 -#define V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS 0x0124 - enum v4l2_stateless_hevc_decode_mode { V4L2_STATELESS_HEVC_DECODE_MODE_SLICE_BASED, V4L2_STATELESS_HEVC_DECODE_MODE_FRAME_BASED, diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 37f9f23a67fe..e0d19a6b5bc7 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -1836,6 +1836,12 @@ enum v4l2_ctrl_type { V4L2_CTRL_TYPE_VP9_COMPRESSED_HDR = 0x0260, V4L2_CTRL_TYPE_VP9_FRAME = 0x0261, + + V4L2_CTRL_TYPE_HEVC_SPS = 0x0270, + V4L2_CTRL_TYPE_HEVC_PPS = 0x0271, + V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS = 0x0272, + V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX = 0x0273, + V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS = 0x0274, }; /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ -- 2.32.0