From mboxrd@z Thu Jan 1 00:00:00 1970 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 C1240C433EF for ; Wed, 1 Jun 2022 15:43:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355802AbiFAPnS (ORCPT ); Wed, 1 Jun 2022 11:43:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353626AbiFAPnR (ORCPT ); Wed, 1 Jun 2022 11:43:17 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC09B12635; Wed, 1 Jun 2022 08:43:15 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id jx22so4552238ejb.12; Wed, 01 Jun 2022 08:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eExjNr6fs8mRydGKpSFoBAs8yn0OjvvcMBEWL8NYO50=; b=QeReasI5nzyoYwf2HE7Um3WaNjpgzi3+hs2cEneet2shfyHEcSAHMZIM5CDltIicgj 9trv5RBkl+Qwg6C5l4NSIYsZGROSeBalRbv/xmfvI2l5JNHo0ZDFEL2VEVqQoTdah8aU IpvV17x4HdV+PHg2mOSKRk4+sPyzfcZ/hPpEr5H6IUl/kHtp4rCxAyRY5NykWyVqHYdu BuE1bLInE6xolADRW15X0ZFlMJZ5lXWdO8fFe9bBMaUaVMEzvLm4F5d41EtnLadU54jL wf4tjgEEIHg9B5ccnUw39SyOgaxNm6CA3xYc8avFezur+ZmsJ6wvKUdBSQhJxCQg+pBV wYNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eExjNr6fs8mRydGKpSFoBAs8yn0OjvvcMBEWL8NYO50=; b=ixyjWVgsc29s92Iz5lqaRNAchEIsIvnk0bNdB9C7RBsxtfyREzSd52FLIo1fQg90x8 o+GLJsqT30cfJgv1QAKcO0J17gMMpl/9zDtsBQ0aM9NHcgY9xuhjOKY4tTNZpGvvK7nf IHlIS+vCee9HqdNM5NqXxmG4s35m4NgjCYrAby8o/N6c+gw5STizwCF/Sr+k80LTKtNA lCmexdjmFMqNUmEcrrvJFVlEndNsp+5vYhj8f53wsetjci8mCUGNr0ebKWMi7+seR0hy Fq4ZPWLz+vIOYOn277jD4iO5ukSVVbYq/ESUFb4kRgHoS5YUV1daD1QaMn9X8ndtkVF4 IKUQ== X-Gm-Message-State: AOAM532odHMnnvVkcHFhgkczVFKUluLk3Wh3TjllITpWZGWL+74/ANA+ yQR47eRJD22ze8sWdO+E8rk= X-Google-Smtp-Source: ABdhPJw7dHJzyhHVwkls8V0XWmtPtkUmYRDHSLb69EOifEu5t+2w0RzoTsPyS4kP1QriRFySeTgQlg== X-Received: by 2002:a17:907:7f26:b0:6ff:ab8:e85 with SMTP id qf38-20020a1709077f2600b006ff0ab80e85mr98874ejc.281.1654098194360; Wed, 01 Jun 2022 08:43:14 -0700 (PDT) Received: from kista.localnet (213-161-3-76.dynamic.telemach.net. [213.161.3.76]) by smtp.gmail.com with ESMTPSA id w20-20020a17090652d400b006f3ef214e22sm861447ejn.136.2022.06.01.08.43.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 08:43:13 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= 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, samuel@sholland.org, nicolas.dufresne@collabora.com, andrzej.p@collabora.com, Benjamin Gaignard 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: Re: Re: [PATCH v6 09/17] media: uapi: HEVC: Define V4L2_CID_STATELESS_HEVC_SLICE_PARAMS as a dynamic array Date: Wed, 01 Jun 2022 17:43:12 +0200 Message-ID: <8069971.T7Z3S40VBb@kista> In-Reply-To: <2630478.mvXUDI8C0e@kista> References: <20220527143134.3360174-1-benjamin.gaignard@collabora.com> <20220527143134.3360174-10-benjamin.gaignard@collabora.com> <2630478.mvXUDI8C0e@kista> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dne nedelja, 29. maj 2022 ob 11:19:12 CEST je Jernej =C5=A0krabec napisal(a= ): > Dne petek, 27. maj 2022 ob 16:31:26 CEST je Benjamin Gaignard napisal(a): > > Make explicit that V4L2_CID_STATELESS_HEVC_SLICE_PARAMS control is > > a dynamic array control type. > > Some drivers may be able to receive multiple slices in one control > > to improve decoding performance. > >=20 > > Define the max size of the dynamic that can driver can set in .dims =3D= {}. > >=20 > > Signed-off-by: Benjamin Gaignard > > --- > > version 6: > > - Set V4L2_CTRL_FLAG_DYNAMIC_ARRAY flag automatically when using > > V4L2_CID_STATELESS_HEVC_SLICE_PARAMS control. > > - Add a define for max slices count > >=20 > > Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst | 2 ++ > > drivers/media/v4l2-core/v4l2-ctrls-defs.c | 1 + > > include/media/hevc-ctrls.h | 5 +++++ > > 3 files changed, 8 insertions(+) > >=20 > > diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst = b/ > Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst > > index 06b967de140c..0796b1563daa 100644 > > --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst > > +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst > > @@ -2986,6 +2986,8 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - > > These bitstream parameters are defined according to :ref:`hevc`. > > They are described in section 7.4.7 "General slice segment header > > semantics" of the specification. > > + This control is a dynamically sized 1-dimensional array, > > + V4L2_CTRL_FLAG_DYNAMIC_ARRAY flag must be set when using it. > > =20 > > .. c:type:: v4l2_ctrl_hevc_slice_params > > =20 > > diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/ v4l2- > core/v4l2-ctrls-defs.c > > index 9f55503cd3d6..d594efbcbb93 100644 > > --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c > > +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c > > @@ -1510,6 +1510,7 @@ void v4l2_ctrl_fill(u32 id, const char **name, en= um=20 > v4l2_ctrl_type *type, > > break; > > case V4L2_CID_STATELESS_HEVC_SLICE_PARAMS: > > *type =3D V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS; > > + *flags |=3D V4L2_CTRL_FLAG_DYNAMIC_ARRAY; >=20 > This change breaks Cedrus. I'll check what needs to be changed. Please include the change bellow to keep Cedrus working. I'll expand suppor= t=20 for more slices later. Best regards, Jernej =2D-- a/drivers/staging/media/sunxi/cedrus/cedrus.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c @@ -178,6 +178,7 @@ static const struct cedrus_control cedrus_controls[] = =3D { { .cfg =3D { .id =3D V4L2_CID_STATELESS_HEVC_SLICE_PARAMS, + .dims =3D { 1 }, }, .codec =3D CEDRUS_CODEC_H265, }, =20 > > break; > > case V4L2_CID_STATELESS_HEVC_SCALING_MATRIX: > > *type =3D V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX; > > diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h > > index 0dbd5d681c28..140151609c96 100644 > > --- a/include/media/hevc-ctrls.h > > +++ b/include/media/hevc-ctrls.h > > @@ -311,9 +311,14 @@ struct v4l2_hevc_pred_weight_table { > > #define=20 V4L2_HEVC_SLICE_PARAMS_FLAG_SLICE_LOOP_FILTER_ACROSS_SLICES_ENABLED=20 > (1ULL << 8) > > #define V4L2_HEVC_SLICE_PARAMS_FLAG_DEPENDENT_SLICE_SEGMENT (1ULL <<=20 > 9) > > =20 > > +#define V4L2_HEVC_SLICE_MAX_COUNT 600 > > + > > /** > > * v4l2_ctrl_hevc_slice_params - HEVC slice parameters > > * > > + * This control is a dynamically sized 1-dimensional array, > > + * V4L2_CTRL_FLAG_DYNAMIC_ARRAY flag must be set when using it. > > + * > > * @bit_size: size (in bits) of the current slice data > > * @data_bit_offset: offset (in bits) to the video data in the current= =20 slice=20 > data > > * @nal_unit_type: specifies the coding type of the slice (B, P or I) > > --=20 > > 2.32.0 > >=20 > >=20 >=20 >=20 >=20