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=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 CF07DC433E0 for ; Fri, 5 Jun 2020 17:13:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A54AF207D3 for ; Fri, 5 Jun 2020 17:13:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ndufresne-ca.20150623.gappssmtp.com header.i=@ndufresne-ca.20150623.gappssmtp.com header.b="sutPteYa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727098AbgFERN1 (ORCPT ); Fri, 5 Jun 2020 13:13:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726614AbgFERN1 (ORCPT ); Fri, 5 Jun 2020 13:13:27 -0400 Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF821C08C5C3 for ; Fri, 5 Jun 2020 10:13:26 -0700 (PDT) Received: by mail-qt1-x844.google.com with SMTP id z1so9111824qtn.2 for ; Fri, 05 Jun 2020 10:13:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ndufresne-ca.20150623.gappssmtp.com; s=20150623; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=rHr7itMwj0PiPq9H+uXZajLfSOPoVtswSHCJ/uAQsm4=; b=sutPteYahxMet7Xu1/aGxvidF5fpONwql8J9iaHQeTBhuSlG6v0mzZ38XXiXamKUoM Q9bjjpMV6iFJF9aLhwAP1sQftb9ptsoD6ZFjHfMAc7Xhz6URLpNoU+aaKYk4Cx1QGn5W j5Y8rBcBDZvHhS1yGy1wXscJ5DawiiDp8glqEZph6kV145YTe2IzWnhm8sn1rbOiKhTJ ZiqMiNwkH4ivokp+lmARtcPH3HKz4yTg7J6FpDU0ZZ+vQ855hoT4gDcC4GGI4RlbGnAk piGBT5IG1Rt14Y1jV+wovSEk4uf1hnTfg34ZfceQu8ZDGMkECSQVk36/X2F5A8+5ccep SEWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=rHr7itMwj0PiPq9H+uXZajLfSOPoVtswSHCJ/uAQsm4=; b=hI+6n5LdP5sboNFcIbhbPJptRUudPV91yKYxTmbaIVLeFy0O+v95bbYIFVuywwmGeb +aC2LzBy6fz2Mm+ljKQB9bGLbxjhP317ypLd2nkLHNTgup073YZMwrcTn5Qr9sj0R8Vf 7XvIMsL/phv/1eYthFM74/iVTUdYx5hLV2xQP1+HEnGesN+iNXUDramdf/7PWC2qi/iQ Kp1WVQy3vQ5QQ8uOD/h3fRv6OGp5gZbYiqZPolXqypQlvsKdd/1P7K0VZp1DcJwgGrST Tg72gkaj3div7hoJQEE7AmhYZd71ZfPazYH10iT/nKP7fWFtd/zhvTzgOuxFdeaUGQnk BOfw== X-Gm-Message-State: AOAM531YZhpmKxcdlXlnwBtj9ENkqE5fxWElsCpNtp889/2zPnn0jf0c oxawpfpPM8fhbbdYmQYBM0YrlQ== X-Google-Smtp-Source: ABdhPJzAo611o2M6HhEIIa1EkNwa7ONj9dewqWnD6aH1w0/QGIFAoQ8zEpfQ6p9WGA14HQA4Cqr5bQ== X-Received: by 2002:ac8:4542:: with SMTP id z2mr10524331qtn.90.1591377205955; Fri, 05 Jun 2020 10:13:25 -0700 (PDT) Received: from skullcanyon ([192.222.193.21]) by smtp.gmail.com with ESMTPSA id o6sm289276qtd.59.2020.06.05.10.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 10:13:25 -0700 (PDT) Message-ID: <981458bfa639bbb9dbc7577256fde0a4c6259d53.camel@ndufresne.ca> Subject: Re: [PATCH 1/3] media: uapi: h264: update reference lists From: Nicolas Dufresne To: Jernej Skrabec , paul.kocialkowski@bootlin.com, mripard@kernel.org Cc: mchehab@kernel.org, wens@csie.org, hverkuil-cisco@xs4all.nl, gregkh@linuxfoundation.org, jonas@kwiboo.se, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, linux-arm-kernel@lists.infradead.org Date: Fri, 05 Jun 2020 13:13:24 -0400 In-Reply-To: <21efb826506f23d348fa58ca8b29eaca8c9dae55.camel@ndufresne.ca> References: <20200604185745.23568-1-jernej.skrabec@siol.net> <20200604185745.23568-2-jernej.skrabec@siol.net> <21efb826506f23d348fa58ca8b29eaca8c9dae55.camel@ndufresne.ca> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.2 (3.36.2-1.fc32) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Sorry, missed one thing. Le vendredi 05 juin 2020 à 13:08 -0400, Nicolas Dufresne a écrit : > Le jeudi 04 juin 2020 à 20:57 +0200, Jernej Skrabec a écrit : > > 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 = 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 = ref_list[i]; > > + dpb_idx = ref_list[i].index; > > dpb = &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. > > - __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; > > };