From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ua1-f52.google.com (mail-ua1-f52.google.com [209.85.222.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93BFC7C for ; Tue, 5 Jul 2022 15:22:39 +0000 (UTC) Received: by mail-ua1-f52.google.com with SMTP id u41so2600250uau.8 for ; Tue, 05 Jul 2022 08:22:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=H/Bc/bJMHnC8mzLiX26E9yJXZ58JRgepqJ5GBKZIhIU=; b=FUu2PrOJcHfJzsPTGNQFGyVj7WroZoWbVSu8xerO75dS1A1hxzRlGdvouBnBFwSEqe PCc699FCk2IEmsopsLfinplJ3DwZIkZ5cIqeJx8v4tL8ZkvcZSBX2f4m1GO/XauIpHTI 1wVdONerVllsWdipFeEmDJBNSX7RZbiy9b/Lmr0sFYsbgodT+F67jjkhcZAWbNAkPNTo UdK6q17Lu32ZInqcxOE0jgo5I1vOUISlBBxQTGJFgqrjCr9XCZAofjxLIR9K10j08aly gAQSHHC8RJJPqtGBtB+jK6GoYocJ3Wt00zSElHsyqBm98rYtSY0gzTk44ZqMqGkRjJig Dbiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=H/Bc/bJMHnC8mzLiX26E9yJXZ58JRgepqJ5GBKZIhIU=; b=FPChOIgktCtfxce/om/l+Wyw3OIn1bd8ppFbZd3wjfAl+XU/JHP9DgFl1SL0MM3d/z Coe7erWqzMvbXZ7c11LUJCIm8Mrn7GRUI5gA79rp1GKUKm5r/p9obEOwcpupwCmu3YVx i12V+kaLRINKvuiOLK7XSlIn3EgHVfgG5Dobrv3pOmwtBfWrI0sHjOHtPLqUKIcU1aKM XnGduz4XBjr/3oVTaiBIhRhJtkqNiRjPdEonUKOeuNKF0Ul/tf6psIS1qU/pKhGSeOKV 1wCtGF280pBLp63Kcto/R+2yr3msJrFsmcnKUusB2RIjUK2UHfGT9/JXCl0jHvnLoLUJ kxOg== X-Gm-Message-State: AJIora8mzGt9mEIwHjimvmrBQTQws0a92GSwMHI4MSvBKiGX1bKGDP9P WaMubfcoA75YlaOS81XCxpDILg== X-Google-Smtp-Source: AGRyM1sib/Rl8zTG8OOfQq2RftxdlE1mO6TAX2MJwRY06PgFNm4cje0JTXSroOCahYX2r6A6k5wYIw== X-Received: by 2002:ab0:2093:0:b0:382:935c:aaf8 with SMTP id r19-20020ab02093000000b00382935caaf8mr4927068uak.90.1657034558560; Tue, 05 Jul 2022 08:22:38 -0700 (PDT) Received: from eze-laptop ([190.190.187.68]) by smtp.gmail.com with ESMTPSA id j10-20020a05610202ea00b00356f933b161sm1251842vsj.9.2022.07.05.08.22.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jul 2022 08:22:38 -0700 (PDT) Date: Tue, 5 Jul 2022 12:22:32 -0300 From: Ezequiel Garcia To: Benjamin Gaignard Cc: mchehab@kernel.org, hverkuil@xs4all.nl, 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, 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 Subject: Re: [PATCH v10 07/17] media: uapi: HEVC: Add SEI pic struct flags Message-ID: References: <20220705085420.272912-1-benjamin.gaignard@collabora.com> <20220705085420.272912-8-benjamin.gaignard@collabora.com> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220705085420.272912-8-benjamin.gaignard@collabora.com> On Tue, Jul 05, 2022 at 10:54:10AM +0200, Benjamin Gaignard wrote: > The possible values for the field_pic field in the v4l2_hevc_dpb_entry > structure are defined in the table D.2 in HEVC specification section D.3.3. > Add flags and documentation for each of them. > > Signed-off-by: Benjamin Gaignard > Acked-by: Nicolas Dufresne > Tested-by: Jernej Skrabec Reviewed-by: Ezequiel Garcia > --- > .../media/v4l/ext-ctrls-codec.rst | 54 +++++++++++++++++++ > include/media/hevc-ctrls.h | 14 +++++ > 2 files changed, 68 insertions(+) > > diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst > index 3dfb81a93935..8ba16e8742f3 100644 > --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst > +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst > @@ -3218,6 +3218,7 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - > * - __u8 > - ``field_pic`` > - Whether the reference is a field picture or a frame. > + See :ref:`HEVC dpb field pic Flags ` > * - __u16 > - ``pic_order_cnt[2]`` > - The picture order count of the reference. Only the first element of the > @@ -3231,6 +3232,59 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - > > \normalsize > > +.. _hevc_dpb_field_pic_flags: > + > +``HEVC dpb field pic Flags`` > + > +.. raw:: latex > + > + \scriptsize > + > +.. flat-table:: > + :header-rows: 0 > + :stub-columns: 0 > + :widths: 1 1 2 > + > + * - ``V4L2_HEVC_SEI_PIC_STRUCT_FRAME`` > + - 0 > + - (progressive) Frame > + * - ``V4L2_HEVC_SEI_PIC_STRUCT_TOP_FIELD`` > + - 1 > + - Top field > + * - ``V4L2_HEVC_SEI_PIC_STRUCT_BOTTOM_FIELD`` > + - 2 > + - Bottom field > + * - ``V4L2_HEVC_SEI_PIC_STRUCT_TOP_BOTTOM`` > + - 3 > + - Top field, bottom field, in that order > + * - ``V4L2_HEVC_SEI_PIC_STRUCT_BOTTOM_TOP`` > + - 4 > + - Bottom field, top field, in that order > + * - ``V4L2_HEVC_SEI_PIC_STRUCT_TOP_BOTTOM_TOP`` > + - 5 > + - Top field, bottom field, top field repeated, in that order > + * - ``V4L2_HEVC_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM`` > + - 6 > + - Bottom field, top field, bottom field repeated, in that order > + * - ``V4L2_HEVC_SEI_PIC_STRUCT_FRAME_DOUBLING`` > + - 7 > + - Frame doubling > + * - ``V4L2_HEVC_SEI_PIC_STRUCT_FRAME_TRIPLING`` > + - 8 > + - Frame tripling > + * - ``V4L2_HEVC_SEI_PIC_STRUCT_TOP_PAIRED_PREVIOUS_BOTTOM`` > + - 9 > + - Top field paired with previous bottom field in output order > + * - ``V4L2_HEVC_SEI_PIC_STRUCT_BOTTOM_PAIRED_PREVIOUS_TOP`` > + - 10 > + - Bottom field paired with previous top field in output order > + * - ``V4L2_HEVC_SEI_PIC_STRUCT_TOP_PAIRED_NEXT_BOTTOM`` > + - 11 > + - Top field paired with next bottom field in output order > + * - ``V4L2_HEVC_SEI_PIC_STRUCT_BOTTOM_PAIRED_NEXT_TOP`` > + - 12 > + - Bottom field paired with next top field in output order > + > .. c:type:: v4l2_hevc_pred_weight_table > > .. raw:: latex > diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h > index 01c1795c57a9..f3695ab44389 100644 > --- a/include/media/hevc-ctrls.h > +++ b/include/media/hevc-ctrls.h > @@ -132,6 +132,20 @@ struct v4l2_ctrl_hevc_pps { > > #define V4L2_HEVC_DPB_ENTRY_LONG_TERM_REFERENCE 0x01 > > +#define V4L2_HEVC_SEI_PIC_STRUCT_FRAME 0 > +#define V4L2_HEVC_SEI_PIC_STRUCT_TOP_FIELD 1 > +#define V4L2_HEVC_SEI_PIC_STRUCT_BOTTOM_FIELD 2 > +#define V4L2_HEVC_SEI_PIC_STRUCT_TOP_BOTTOM 3 > +#define V4L2_HEVC_SEI_PIC_STRUCT_BOTTOM_TOP 4 > +#define V4L2_HEVC_SEI_PIC_STRUCT_TOP_BOTTOM_TOP 5 > +#define V4L2_HEVC_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM 6 > +#define V4L2_HEVC_SEI_PIC_STRUCT_FRAME_DOUBLING 7 > +#define V4L2_HEVC_SEI_PIC_STRUCT_FRAME_TRIPLING 8 > +#define V4L2_HEVC_SEI_PIC_STRUCT_TOP_PAIRED_PREVIOUS_BOTTOM 9 > +#define V4L2_HEVC_SEI_PIC_STRUCT_BOTTOM_PAIRED_PREVIOUS_TOP 10 > +#define V4L2_HEVC_SEI_PIC_STRUCT_TOP_PAIRED_NEXT_BOTTOM 11 > +#define V4L2_HEVC_SEI_PIC_STRUCT_BOTTOM_PAIRED_NEXT_TOP 12 > + > #define V4L2_HEVC_DPB_ENTRIES_NUM_MAX 16 > > struct v4l2_hevc_dpb_entry { > -- > 2.32.0 >