Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp1224019iog; Tue, 14 Jun 2022 01:37:11 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vKbOFX0LoDosuY+Ym2BnlsDxGDCV75S1eIOR5AeIycYBNJ4LHZXI1muHPuUARD2X2pkBus X-Received: by 2002:a17:90b:3a8b:b0:1e8:3056:10fc with SMTP id om11-20020a17090b3a8b00b001e8305610fcmr3365178pjb.145.1655195831549; Tue, 14 Jun 2022 01:37:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655195831; cv=none; d=google.com; s=arc-20160816; b=SlcEhDM8KQJ8swMQ5TEhIqG/eAMe4y0drG4i26YiHjbsVI6HWZbOE1IVnytyx57kc6 TEOiHxfo/3p3fRHYrLQEVQ/MNNcpJK12RMt64CTdbwAGLleE40te1HtxApcsOBw6AGou PE/RACvpeiuBvQZxKKtGP+ifUfy8aj2mIwX47yzxZbDDoL5cRYLH1u3nL/RHZT3kBaYl Ym9fFZHGDQ4NGNWpU3DVV0uxI/OZgyLdkc6yBwJhmIyT/3cRmYTs2kQOygyTG6ra+M58 j+SiFCjNheCteO1LyLZVOCSm/Ju+LLMxVfWjF+LsNDXouhT2kJUsG7kvb3/fBQlLRkBW 7E9w== 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=ayV6mKpgg6hYdPreLghcY99CpRdV5drqTIWD7VAernU=; b=IqR7mCZBMb5sjv+2yUsYvgLABDJMfR7QhIxu8wo7+hm0eR78pdVu6E3IhKNsj1FzUJ 8EA3bZT4BhuVruofG7tTDK6qN6T2l5X7F1l2rV3ZGcC2+xGsyi8giJLGYMA7tUtE+0uf pb+ooCiT6MOskKZK/cItjAg66BOEsIq1r73GSrtI21haNROGIQ2XP3pc13jh+Xeyxif2 ygD6qpMTEY1uymSVMObQprvYNaIIQ8ZefjPzuAbcbooYPPc5p8eindsD6avxH1U5GZ95 XewhbSupBqM+O5wSYi46qC7MlEcPOP541I5t6OJEi9KEfRkwkXjc5Vtx226X8eZJrwEn H5Mw== 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 h13-20020a056a001a4d00b0050e12e5d0c8si13588622pfv.54.2022.06.14.01.36.59; Tue, 14 Jun 2022 01:37:11 -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 S1355342AbiFNH5O (ORCPT + 99 others); Tue, 14 Jun 2022 03:57:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355259AbiFNH5N (ORCPT ); Tue, 14 Jun 2022 03:57:13 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D94E3F320; Tue, 14 Jun 2022 00:57:11 -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 E8841B817AD; Tue, 14 Jun 2022 07:57:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58487C3411B; Tue, 14 Jun 2022 07:57:05 +0000 (UTC) Message-ID: <434a4936-1374-a1d9-4204-2538f802267f@xs4all.nl> Date: Tue, 14 Jun 2022 09:57:04 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [PATCH v7 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: <20220614074947.160316-1-benjamin.gaignard@collabora.com> From: Hans Verkuil In-Reply-To: <20220614074947.160316-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, I tried to apply this patch series to the latest git://linuxtv.org/media_stage.git and it failed to apply. Can you rebase this series? Regards, Hans On 6/14/22 09:49, 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 7: > - Apply Jernej patches for Cedrus about bit offset definition and > V4L2_CID_STATELESS_HEVC_SLICE_PARAMS being a dynamic array control. > > 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 | 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 >