From patchwork Fri Jul 8 12:05:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Gaignard X-Patchwork-Id: 589108 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66741C43334 for ; Fri, 8 Jul 2022 12:06:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238136AbiGHMGK (ORCPT ); Fri, 8 Jul 2022 08:06:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237765AbiGHMGI (ORCPT ); Fri, 8 Jul 2022 08:06:08 -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 2716E87340; Fri, 8 Jul 2022 05:06:07 -0700 (PDT) Received: from benjamin-XPS-13-9310.. (unknown [IPv6:2a01:e0a:120:3210:3cab:61a1:2b1f:896b]) (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 032C266019BF; Fri, 8 Jul 2022 13:06:04 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1657281965; bh=oR1vIJX0M4WLom1qHGcFhu7RKQFofXwwY/N0SjmofPo=; h=From:To:Cc:Subject:Date:From; b=bMiC9ktT7iO4ZCB19V+PjdDBRG+SXGxKPI9updyHCELhayVZNOCaGblpJHinNLgWj GREWycA2GpXePXu++Tjg+sw9zASf2pt6jqCONLv60QK1SxG6LCvBXrDbkdaY2mQUsn 8fgUxUsZmg47TyejZsxBctwEUxD/+bP2Ajkix0uAw1WPxm5LdGSWVGfxmizjrEyeWk 8X7rrGSsuHnGZQ7onJAz6l+bkR9gwt8ixdIigsPTmUQDdtSPnC59Z+XmRnzACMt6px XROnNk+9SY9/HueVYK2KFBNTVooF4l4KxJJuPQvxL4mzzXYPK5eDDUakFC7KUUjtig gixgEnOVY5mTg== 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 v12 00/17] Move HEVC stateless controls out of staging Date: Fri, 8 Jul 2022 14:05:37 +0200 Message-Id: <20220708120554.495495-1-benjamin.gaignard@collabora.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@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 12: - Fix commit message in patch "HEVC: fix padding in v4l2 control structures" - Reword num_entry_point_offsets field usage. version 11: - Be more verbose about num_entry_point_offsets field usage. - Fix various typos in "Add documentation to uAPI structure" patch. version 10: - Rebased on media_stage/master - Add Acked-by tag from Nicolas - Add Tested-by tag from Jernej - Fix typo in patch 14 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_V10 With patches to decode 10-bits bitstream and produce P010 frames the Fluster score which was 77/147 before, is now 141/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_V10 The 6 failing tests are: - PICSIZE_{A,B,C,D}_Bossen_1 where resolutions are to big for Hantro hardware. - 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 9: - Reword some commit message - Use fls() - Remove useless padding at the end of hevc structures - Reword all _minus* field description - change CVS to codec video sequence - Fix various typo - Fix undefined label: v4l2-ctrl-flag-dynamic-array warning - fix the waring reported by 'scripts/kernel-doc -none include/uapi/linux/v4l2-controls.h' version 8: - Same than v7 but rebased on media_stage/master version 7: - Apply Jernej patches for Cedrus about bit offset definition and V4L2_CID_STATELESS_HEVC_SLICE_PARAMS being a dynamic array control. - Based on media_tree/master 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. 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 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 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 | 899 ++++++++++++++++++ .../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 | 6 + .../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 | 212 ++++- 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 | 44 +- drivers/staging/media/hantro/hantro_hevc.c | 10 +- drivers/staging/media/hantro/hantro_hw.h | 4 +- drivers/staging/media/sunxi/cedrus/cedrus.c | 26 +- .../staging/media/sunxi/cedrus/cedrus_dec.c | 10 +- .../staging/media/sunxi/cedrus/cedrus_h265.c | 23 +- .../staging/media/sunxi/cedrus/cedrus_video.c | 1 - include/media/hevc-ctrls.h | 250 ----- include/media/v4l2-ctrls.h | 48 +- include/uapi/linux/v4l2-controls.h | 459 +++++++++ include/uapi/linux/videodev2.h | 13 + 24 files changed, 1828 insertions(+), 1226 deletions(-) delete mode 100644 include/media/hevc-ctrls.h