Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp2401085ioo; Sat, 28 May 2022 12:27:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxh2oJOGqi4uYVb8auTpl8qeP9pcTWbNEcFsNrcW9yq8XwcJk5TVN/lKLH/CvOTZr4mkzbC X-Received: by 2002:a05:6a00:803:b0:518:8afd:25 with SMTP id m3-20020a056a00080300b005188afd0025mr35375414pfk.41.1653766035828; Sat, 28 May 2022 12:27:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653766035; cv=none; d=google.com; s=arc-20160816; b=hS4BNAa1xl2WirE/t+h8/JDlfVReAC9xgAKWvyAYKe9tvyy5ezUUdw0/UvRHCM/pzi 7cdZanw4QdUzT5jHCMCcCA2LohFn7cXxEQCVkO5HM/026wmhERKHA8/rmTvGd9uNUEOT 9f2ybZ3wRLlsYqR6/DLpMSHpCPtzEmvR3ryax7Ugn0cN0C9g0gB1GaNjhBEPkM1VqBJ5 UUafR5zkuO77zWe//CRmFBlNpgBghSEq0qzWXn7PDsQgV394V0XqeaprJ8qy0se7RXp8 lNTJKEgGgIh1obvxxwY2kPSF3vQczO23YuNLmFmYiL4J258iGp7Wnos8GHkgSzIlWfW5 WEHw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=XuJ+SeBA1dL2lG7OdqXPQhBBWQiyEr5PhWdeEllgDFU=; b=UmE/dF9n3n0nvpNNDBFufKXD8bCqb1UyDwiCDYZYpkpOUBGnNNOOH6Oi3nUAHbMSZN 4yQ9CfgpF7dH0Me9Nud84QB0kAZPLUndp6d4avw0F7W7ayJr93+wJyRRSq0Zg/l2ti7X d0SM0Wd0WOEjkoEwzk18cn17rqOF1YkHLsTDN/3QkmcST/4FhaZU4RQzdKt9s7SCI7C9 jWjvyfwNsKbW7zbIqaY8r8mxMrwmhLMKmkP8nFE1vcoH2mdG9U/LAODMmZTzdwesKNok cIwLJ6M7B5Gb91cFgftkCUpaP89NH4Y23YizUSt4hHkhFynLcEHjGdqKTH5XuBLa5XF7 7SRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=gk84JhoW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id c7-20020a056a00248700b0050dcf85b9e1si11111657pfv.141.2022.05.28.12.27.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 May 2022 12:27:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=gk84JhoW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E93C3515B6; Sat, 28 May 2022 11:56:25 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353240AbiE0Obz (ORCPT + 99 others); Fri, 27 May 2022 10:31:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240872AbiE0Obx (ORCPT ); Fri, 27 May 2022 10:31:53 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 79BC53701A; Fri, 27 May 2022 07:31:51 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: benjamin.gaignard) with ESMTPSA id 4E8FF1F462A2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1653661909; bh=DnfHieYj/Muzgq3lfRgmbn4LPfXwx7ExtPybg7p/isE=; h=From:To:Cc:Subject:Date:From; b=gk84JhoWJ0zsMuiSu1QnIYBbd1v/Y5BF28C3Jn9bmhjCOOPKKFV2M/H/ZmLdVEjPt VEPwLsYIURS587bNJ3j7vnmM12kTC5Gq6D59kDmW5QmKqAlkTLTfwAS3ZlvIEVII8y Ne427IsPYBQefbxUP71SGbMHWBdkwqBhiEcvBsuT3HbQbt9XWDwDg2a4aIxoKwprYu 5kFg5gNG1pGSzYnnFNNykgENicp7E6kqf7TxqZYw32X6LgYbRpMoBLD5tjbhpH1kir twdXR3k9DFlgUkfqGa8WoHV1FnKbuhrSUPkKnJsvHB84kJXt/tA7+Nk4rT91rwcV5U LUi7/oiTht0Wg== 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 v6 00/17] Move HEVC stateless controls out of staging Date: Fri, 27 May 2022 16:31:17 +0200 Message-Id: <20220527143134.3360174-1-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=no 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 This series aims to make HEVC uapi stable and usable for hardware decoder. HEVC uapi is used by 2 mainlined drivers (Cedrus and Hantro) and 2 out of the tree drivers (rkvdec and RPI). version 6: - Add short_term_ref_pic_set_size and long_term_ref_pic_set_size in v4l2_ctrl_hevc_decode_params structure. - Change slice_pic_order_cnt type to s32 to match with PoC type. - Set V4L2_CTRL_FLAG_DYNAMIC_ARRAY flag automatically when using V4L2_CID_STATELESS_HEVC_SLICE_PARAMS control. - Add a define for max slices count - Stop using Hantro dedicated control. This version has been tested with these branches: - GStreamer: https://gitlab.freedesktop.org/benjamin.gaignard1/gstreamer/-/tree/HEVC_aligned_with_kernel_5.15 - Linux: https://gitlab.collabora.com/benjamin.gaignard/for-upstream/-/tree/HEVC_UAPI_V6 With patches to decode 10-bits bitstream and produce P010 frames the Fluster score which was 77/147 before, is now 138/147. The 10-bits series will comes after this because of it dependency to uAPI change. If you are curious you can find the WIP branch here: https://gitlab.collabora.com/benjamin.gaignard/for-upstream/-/commits/WIP_HEVC_UAPI_V6 The 9 failing tests are: - CONFWIN_A_Sony_1 which contains conformance_window_flag that isn't supported by the hardware (but visually ok aside a pixel shift). - PICSIZE_{A,B,C,D}_Bossen_1 where resolutions are to big for Hantro hardware. - TSKIP_A_MS_3 is ok when testing alone but fail (corrupted lines on the first frame) when running it after a couple of other tests. - VPSSPSPPS_A_MainConcept_1 where there is an issue on gst parser side because of VPS/SPS/PPS ordering - WPP_D_ericsson_MAIN_2 and WPP_D_ericsson_MAIN10_2 are visually ok but some difference exist on 5 decoded frames. Some pixels values are no the same the very end of few lines. version 6: - Stop using Hantro dedicated control and compute the number of bytes to skip inside the driver. - Rebased on media_tree/master version 5: - Change __u16 pic_order_cnt[2] into __s32 pic_order_cnt_val in hevc_dpb_entry structure - Add defines for SEI pic_struct values (patch 4) - Fix numbers of bits computation in cedrus_h265_skip_bits() parameters - Fix num_short_term_ref_pic_sets and num_long_term_ref_pics_sps documentation (patch 8) - Rebased on v5-18-rc1 GStreamer H265 decoder plugin aligned with HEVC uAPI v5: https://gitlab.freedesktop.org/benjamin.gaignard1/gstreamer/-/tree/HEVC_aligned_with_kernel_5.15 Version 4: - Add num_entry_point_offsets field in struct v4l2_ctrl_hevc_slice_params - Fix V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS name - Initialize control V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS - Fix space/tab issue in kernel-doc - Add patch to change data_bit_offset definition - Fix hantro-media SPDX license - put controls under stateless section in v4l2-ctrls-defs.c At the end fluster tests results on IMX8MQ is 77/147 for HEVC codec. Benjamin Gaignard (14): media: uapi: HEVC: Add missing fields in HEVC controls media: uapi: HEVC: Rename HEVC stateless controls with STATELESS prefix media: uapi: HEVC: Change pic_order_cnt definition in v4l2_hevc_dpb_entry media: uapi: HEVC: Add SEI pic struct flags media: uapi: HEVC: Add documentation to uAPI structure media: uapi: HEVC: Define V4L2_CID_STATELESS_HEVC_SLICE_PARAMS as a dynamic array media: uapi: Move parsed HEVC pixel format out of staging media: uapi: Add V4L2_CID_STATELESS_HEVC_ENTRY_POINT_OFFSETS control media: uapi: Move the HEVC stateless control type out of staging media: controls: Log HEVC stateless control in .std_log media: hantro: Stop using Hantro dedicated control media: uapi: HEVC: fix padding in v4l2 control structures media: uapi: Change data_bit_offset definition media: uapi: move HEVC stateless controls out of staging Hans Verkuil (3): videodev2.h: add V4L2_CTRL_FLAG_DYNAMIC_ARRAY v4l2-ctrls: add support for dynamically allocated arrays. vivid: add dynamic array test control .../media/v4l/ext-ctrls-codec-stateless.rst | 897 ++++++++++++++++++ .../media/v4l/ext-ctrls-codec.rst | 780 --------------- .../media/v4l/pixfmt-compressed.rst | 7 +- .../media/v4l/vidioc-g-ext-ctrls.rst | 20 + .../media/v4l/vidioc-queryctrl.rst | 8 + .../media/videodev2.h.rst.exceptions | 5 + .../media/test-drivers/vivid/vivid-ctrls.c | 15 + drivers/media/v4l2-core/v4l2-ctrls-api.c | 103 +- drivers/media/v4l2-core/v4l2-ctrls-core.c | 206 +++- drivers/media/v4l2-core/v4l2-ctrls-defs.c | 38 +- drivers/media/v4l2-core/v4l2-ctrls-priv.h | 3 +- drivers/media/v4l2-core/v4l2-ctrls-request.c | 13 +- drivers/staging/media/hantro/hantro_drv.c | 62 +- .../staging/media/hantro/hantro_g2_hevc_dec.c | 69 +- drivers/staging/media/hantro/hantro_hevc.c | 10 +- drivers/staging/media/hantro/hantro_hw.h | 4 +- drivers/staging/media/sunxi/cedrus/cedrus.c | 24 +- .../staging/media/sunxi/cedrus/cedrus_dec.c | 10 +- .../staging/media/sunxi/cedrus/cedrus_h265.c | 6 +- include/media/hevc-ctrls.h | 250 ----- include/media/v4l2-ctrls.h | 48 +- include/uapi/linux/v4l2-controls.h | 458 +++++++++ include/uapi/linux/videodev2.h | 13 + 23 files changed, 1830 insertions(+), 1219 deletions(-) delete mode 100644 include/media/hevc-ctrls.h -- 2.32.0