Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp1317816iog; Tue, 14 Jun 2022 03:49:27 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uNa0bMuM/PONewpHhWBaxbZwK3GSNR5SGLYYfeZLgxF7Nok2CoPcByAQ0V9Pt0Zv2VyXNs X-Received: by 2002:a17:90a:b396:b0:1ea:4542:82c1 with SMTP id e22-20020a17090ab39600b001ea454282c1mr3978636pjr.74.1655203767339; Tue, 14 Jun 2022 03:49:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655203767; cv=none; d=google.com; s=arc-20160816; b=jwJD1UKeu5lI800en+eqwfCmPCqcnTBJzwD7Ek1EdkP5i90fxw7eTz8EenA6qFhVEs wAllnP1QeOIuIm1OiNZrAvFNpR7u3G+y/e+N5daSJmkkGDV8q4C8aL4ZxNQN0At+Vij+ K7nyigI3bqoQXjmdQlOEuEuWb22+YNvfaxSQUS5+9M6CUcCDCIwfkKSMxLuTwwmXWnJw c17IeM4WVK+X6Ny4KWt/G+VLNlJ7u2zcjl29xgP0p9hXt2ghZzPYAvZixFOFaAAr+d/L zjKOD/mn4+yoLVNpKJD+zw7Kji1uSrdL/spZoGupOlB4jBd2m0LO488CnHq8g7LfZRL7 ufHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id; bh=8ooCAkojeGqdlesLFhhaOiRZlZGYd6HkGpUUPky3MeM=; b=LalEsGAS0NgeUzmfx1rMccIKy/6CyrQapiz++fI9Ledq45MhQeXlLUmwygVvg2LFsD cflPeq0CLXofmlnOrMAqHXlCGHOThKsGEqomYcUaTOAcZZ4Kglw9EvDKPNd7aiYlG9Mz ep/DoidVyaP2ioMr9YJEGDT+WpvY9c5PduqVjkcDyAydnAnkWehKemwpM7M3o/CN0gjK bT8NodW17NtXOeqDfKq+xj/W9pVNkYh240NXZzgCbCgoYCM5BBVwSERwzbNbh6JCsGE9 44tcCgkdoghSnSnlED8Upg2KNFS3TIqpKPhD4k/neXsVxmJAKMngVssVOOAaDC3nBK/f DnkQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=xs4all.nl Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pl8-20020a17090b268800b001e27be0055asi10019440pjb.48.2022.06.14.03.49.14; Tue, 14 Jun 2022 03:49:27 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=xs4all.nl Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239851AbiFNK30 (ORCPT + 99 others); Tue, 14 Jun 2022 06:29:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355830AbiFNK2i (ORCPT ); Tue, 14 Jun 2022 06:28:38 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B62447549; Tue, 14 Jun 2022 03:28:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D9A76B81808; Tue, 14 Jun 2022 10:28:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9200CC3411B; Tue, 14 Jun 2022 10:28:28 +0000 (UTC) Message-ID: <3a886196-5f35-8b59-cfc5-f99b92ea85e0@xs4all.nl> Date: Tue, 14 Jun 2022 12:28:26 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.0 Subject: Re: [PATCH v8 00/17] Move HEVC stateless controls out of staging Content-Language: en-US To: Benjamin Gaignard , mchehab@kernel.org, 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 References: <20220614083614.240641-1-benjamin.gaignard@collabora.com> From: Hans Verkuil In-Reply-To: <20220614083614.240641-1-benjamin.gaignard@collabora.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,NICE_REPLY_A,RCVD_IN_DNSWL_HI, 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 Hi Benjamin, On 6/14/22 10:35, Benjamin Gaignard wrote: > 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 8: > - Same than v7 but rebased on media_stage/master I get the following documentation warning: Documentation/output/videodev2.h.rst:6: WARNING: undefined label: v4l2-ctrl-flag-dynamic-array The new flag needs to be added to Documentation/userspace-api/media/videodev2.h.rst.exceptions. I also get these kerneldoc warnings: kerneldoc: WARNINGS include/uapi/linux/v4l2-controls.h:2123: warning: Function parameter or member 'reserved' not described in 'v4l2_ctrl_hevc_sps' include/uapi/linux/v4l2-controls.h:2123: warning: Function parameter or member 'padding' not described in 'v4l2_ctrl_hevc_sps' include/uapi/linux/v4l2-controls.h:2203: warning: Function parameter or member 'reserved' not described in 'v4l2_ctrl_hevc_pps' include/uapi/linux/v4l2-controls.h:2203: warning: Function parameter or member 'padding' not described in 'v4l2_ctrl_hevc_pps' include/uapi/linux/v4l2-controls.h:2237: warning: Function parameter or member 'reserved' not described in 'v4l2_hevc_dpb_entry' include/uapi/linux/v4l2-controls.h:2339: warning: cannot understand function prototype: 'struct v4l2_ctrl_hevc_slice_params ' include/uapi/linux/v4l2-controls.h:2425: warning: Function parameter or member 'reserved' not described in 'v4l2_ctrl_hevc_decode_params' include/uapi/linux/v4l2-controls.h:2425: warning: Function parameter or member 'padding' not described in 'v4l2_ctrl_hevc_decode_params' Run 'scripts/kernel-doc -none include/uapi/linux/v4l2-controls.h' to get these warnings. The "cannot understand function prototype" warning is because /** * v4l2_ctrl_hevc_slice_params - HEVC slice parameters is missing 'struct' before 'v4l2_ctrl_hevc_slice_params'. After adding that I get these warnings: include/uapi/linux/v4l2-controls.h:2123: warning: Function parameter or member 'reserved' not described in 'v4l2_ctrl_hevc_sps' include/uapi/linux/v4l2-controls.h:2123: warning: Function parameter or member 'padding' not described in 'v4l2_ctrl_hevc_sps' include/uapi/linux/v4l2-controls.h:2203: warning: Function parameter or member 'reserved' not described in 'v4l2_ctrl_hevc_pps' include/uapi/linux/v4l2-controls.h:2203: warning: Function parameter or member 'padding' not described in 'v4l2_ctrl_hevc_pps' include/uapi/linux/v4l2-controls.h:2237: warning: Function parameter or member 'reserved' not described in 'v4l2_hevc_dpb_entry' include/uapi/linux/v4l2-controls.h:2382: warning: Function parameter or member 'reserved0' not described in 'v4l2_ctrl_hevc_slice_params' include/uapi/linux/v4l2-controls.h:2382: warning: Function parameter or member 'reserved1' not described in 'v4l2_ctrl_hevc_slice_params' include/uapi/linux/v4l2-controls.h:2382: warning: Function parameter or member 'padding' not described in 'v4l2_ctrl_hevc_slice_params' include/uapi/linux/v4l2-controls.h:2425: warning: Function parameter or member 'reserved' not described in 'v4l2_ctrl_hevc_decode_params' include/uapi/linux/v4l2-controls.h:2425: warning: Function parameter or member 'padding' not described in 'v4l2_ctrl_hevc_decode_params' Regards, Hans > > 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_V8 > > 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. > > 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_V7 > > 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 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 | 25 +- > .../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 | 458 +++++++++ > include/uapi/linux/videodev2.h | 13 + > 24 files changed, 1848 insertions(+), 1220 deletions(-) > delete mode 100644 include/media/hevc-ctrls.h >