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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C77ACC433E1 for ; Fri, 5 Jun 2020 17:27:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 83A99206F0 for ; Fri, 5 Jun 2020 17:27:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="b58ZAUQp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 83A99206F0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=siol.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OIqaFd3ibVWUqBHSD07+yuU69xSDwyRQQyzpze+aSYc=; b=b58ZAUQp2olpI3 2bbSIZHvQsbsq0yuXC0o3DMxzqFamj7N09R/oCzuOrYvAQGoe9TKHdUWTiO7VQNTVqAYc7/Fh0CjI 6C0ELUa9Zq/2YLebc5ij+5bocUR/ECGIccIC6itdFH06nmPe1olsI0jEhDAgf8GuohCyMCirV/ZDy 2RedBAFo945lfhgYwbG9qWFsfnHoANycIMGMC9i+t8/1tybm9VLuvIQ2d9l0Ntrg258o3wAhfe2Ye RhE1EHGW+LjKyAEjtExoWVqKuhY53fF8NBx9Xql8NiUrtgsSPaMZLqwNRlbS4DcPaSQEX5AXAqQX/ XBkKHXu+Kb1tkBCnTR0g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jhG7P-0001L3-KQ; Fri, 05 Jun 2020 17:26:59 +0000 Received: from mailoutvs62.siol.net ([185.57.226.253] helo=mail.siol.net) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jhG7K-0001Ih-8N for linux-arm-kernel@lists.infradead.org; Fri, 05 Jun 2020 17:26:55 +0000 Received: from localhost (localhost [127.0.0.1]) by mail.siol.net (Postfix) with ESMTP id BCFFB521CD6; Fri, 5 Jun 2020 19:26:51 +0200 (CEST) X-Virus-Scanned: amavisd-new at psrvmta09.zcs-production.pri Received: from mail.siol.net ([127.0.0.1]) by localhost (psrvmta09.zcs-production.pri [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id NZgFuvn6mVwb; Fri, 5 Jun 2020 19:26:51 +0200 (CEST) Received: from mail.siol.net (localhost [127.0.0.1]) by mail.siol.net (Postfix) with ESMTPS id 2610A521CDC; Fri, 5 Jun 2020 19:26:51 +0200 (CEST) Received: from jernej-laptop.localnet (cpe-194-152-20-232.static.triera.net [194.152.20.232]) (Authenticated sender: jernej.skrabec@siol.net) by mail.siol.net (Postfix) with ESMTPA id B67AB521CD6; Fri, 5 Jun 2020 19:26:50 +0200 (CEST) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: paul.kocialkowski@bootlin.com, mripard@kernel.org, Nicolas Dufresne Subject: Re: [PATCH 1/3] media: uapi: h264: update reference lists Date: Fri, 05 Jun 2020 19:26:50 +0200 Message-ID: <5432050.H6LSVPVxsP@jernej-laptop> In-Reply-To: <981458bfa639bbb9dbc7577256fde0a4c6259d53.camel@ndufresne.ca> References: <20200604185745.23568-1-jernej.skrabec@siol.net> <21efb826506f23d348fa58ca8b29eaca8c9dae55.camel@ndufresne.ca> <981458bfa639bbb9dbc7577256fde0a4c6259d53.camel@ndufresne.ca> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200605_102654_454057_DC684C5C X-CRM114-Status: GOOD ( 18.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, jonas@kwiboo.se, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, wens@csie.org, hverkuil-cisco@xs4all.nl, mchehab@kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Dne petek, 05. junij 2020 ob 19:13:24 CEST je Nicolas Dufresne napisal(a): > Sorry, missed one thing. > = > Le vendredi 05 juin 2020 =E0 13:08 -0400, Nicolas Dufresne a =E9crit : > > Le jeudi 04 juin 2020 =E0 20:57 +0200, Jernej Skrabec a =E9crit : > > > When dealing with with interlaced frames, reference lists must tell if > > > each particular reference is meant for top or bottom field. This info > > > is currently not provided at all in the H264 related controls. > > > = > > > Make reference lists hold a structure which will also hold flags along > > > index into DPB array. Flags will tell if reference is meant for top or > > > bottom field. > > > = > > > Currently the only user of these lists is Cedrus which is just compile > > > fixed here. Actual usage of newly introduced flags will come in > > > following commit. > > > = > > > Signed-off-by: Jernej Skrabec > > = > > This looks like the right approach to me and is extensible if anything > > else is needed for MVC and SVC special referencing (at least will be > > enough for what H.264 actually supports in this regard). > > = > > Reviewed-by: Nicolas Dufresne > > = > > > --- > > > = > > > .../media/v4l/ext-ctrls-codec.rst | 40 +++++++++++++++++= +- > > > .../staging/media/sunxi/cedrus/cedrus_h264.c | 6 +-- > > > include/media/h264-ctrls.h | 12 +++++- > > > 3 files changed, 51 insertions(+), 7 deletions(-) > > > = > > > diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst > > > b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst index > > > d0d506a444b1..6c36d298db20 100644 > > > --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst > > > +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst > > > @@ -1843,10 +1843,10 @@ enum > > > v4l2_mpeg_video_h264_hierarchical_coding_type -> > = > > > * - __u32 > > > = > > > - ``slice_group_change_cycle`` > > > - > > > = > > > - * - __u8 > > > + * - struct :c:type:`v4l2_h264_reference` > > > = > > > - ``ref_pic_list0[32]`` > > > - Reference picture list after applying the per-slice > > > modifications > > > = > > > - * - __u8 > > > + * - struct :c:type:`v4l2_h264_reference` > > > = > > > - ``ref_pic_list1[32]`` > > > - Reference picture list after applying the per-slice > > > modifications > > > = > > > * - __u32 > > > = > > > @@ -1926,6 +1926,42 @@ enum > > > v4l2_mpeg_video_h264_hierarchical_coding_type - > > > = > > > - ``chroma_offset[32][2]`` > > > - > > > = > > > +``Picture Reference`` > > > + > > > +.. c:type:: v4l2_h264_reference > > > + > > > +.. cssclass:: longtable > > > + > > > +.. flat-table:: struct v4l2_h264_reference > > > + :header-rows: 0 > > > + :stub-columns: 0 > > > + :widths: 1 1 2 > > > + > > > + * - __u16 > > > + - ``flags`` > > > + - See :ref:`Picture Reference Flags ` > > > + * - __u8 > > > + - ``index`` > > > + - > > > + > > > +.. _h264_reference_flags: > > > + > > > +``Picture Reference Flags`` > > > + > > > +.. cssclass:: longtable > > > + > > > +.. flat-table:: > > > + :header-rows: 0 > > > + :stub-columns: 0 > > > + :widths: 1 1 2 > > > + > > > + * - ``V4L2_H264_REFERENCE_FLAG_TOP_FIELD`` > > > + - 0x00000001 > > > + - > > > + * - ``V4L2_H264_REFERENCE_FLAG_BOTTOM_FIELD`` > > > + - 0x00000002 > > > + - > > > + > > > = > > > ``V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS (struct)`` > > > = > > > Specifies the decode parameters (as extracted from the bitstream) > > > for the associated H264 slice data. This includes the necessary > > > = > > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c > > > b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c index > > > 54ee2aa423e2..cce527bbdf86 100644 > > > --- a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c > > > +++ b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c > > > @@ -166,8 +166,8 @@ static void cedrus_write_frame_list(struct > > > cedrus_ctx *ctx,> > = > > > static void _cedrus_write_ref_list(struct cedrus_ctx *ctx, > > > = > > > struct cedrus_run *run, > > > = > > > - const u8 *ref_list, u8 = num_ref, > > > - enum cedrus_h264_sram_off = sram) > > > + const struct = v4l2_h264_reference *ref_list, > > > + u8 num_ref, enum = cedrus_h264_sram_off sram) > > > = > > > { > > > = > > > const struct v4l2_ctrl_h264_decode_params *decode =3D > > > run->h264.decode_params; struct vb2_queue *cap_q; > > > = > > > @@ -188,7 +188,7 @@ static void _cedrus_write_ref_list(struct cedrus_= ctx > > > *ctx,> > = > > > int buf_idx; > > > u8 dpb_idx; > > > = > > > - dpb_idx =3D ref_list[i]; > > > + dpb_idx =3D ref_list[i].index; > > > = > > > dpb =3D &decode->dpb[dpb_idx]; > > > = > > > if (!(dpb->flags & V4L2_H264_DPB_ENTRY_FLAG_ACTIVE)) > > > = > > > diff --git a/include/media/h264-ctrls.h b/include/media/h264-ctrls.h > > > index 080fd1293c42..9b1cbc9bc38e 100644 > > > --- a/include/media/h264-ctrls.h > > > +++ b/include/media/h264-ctrls.h > > > @@ -140,6 +140,14 @@ struct v4l2_h264_pred_weight_table { > > > = > > > #define V4L2_H264_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED 0x04 > > > #define V4L2_H264_SLICE_FLAG_SP_FOR_SWITCH 0x08 > > > = > > > +#define V4L2_H264_REFERENCE_FLAG_TOP_FIELD 0x01 > > > +#define V4L2_H264_REFERENCE_FLAG_BOTTOM_FIELD 0x02 > > > + > > > +struct v4l2_h264_reference { > > > + __u8 flags; > > > + __u8 index; > > > +}; > > > + > > > = > > > struct v4l2_ctrl_h264_slice_params { > > > = > > > /* Size in bytes, including header */ > > > __u32 size; > > > = > > > @@ -182,8 +190,8 @@ struct v4l2_ctrl_h264_slice_params { > > > = > > > * Entries on each list are indices into > > > * v4l2_ctrl_h264_decode_params.dpb[]. > > > */ > = > This comment needs to be updated or moved inside the structure. I'll move it in v2. Best regards, Jernej > = > > > - __u8 ref_pic_list0[32]; > > > - __u8 ref_pic_list1[32]; > > > + struct v4l2_h264_reference ref_pic_list0[32]; > > > + struct v4l2_h264_reference ref_pic_list1[32]; > > > = > > > __u32 flags; > > > = > > > }; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel