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 3E448C3F2D1 for ; Thu, 5 Mar 2020 19:42:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0A7882073B for ; Thu, 5 Mar 2020 19:42:42 +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="fjeRQagf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726129AbgCETml (ORCPT ); Thu, 5 Mar 2020 14:42:41 -0500 Received: from mail-qt1-f195.google.com ([209.85.160.195]:45909 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725948AbgCETml (ORCPT ); Thu, 5 Mar 2020 14:42:41 -0500 Received: by mail-qt1-f195.google.com with SMTP id a4so5073432qto.12 for ; Thu, 05 Mar 2020 11:42:40 -0800 (PST) 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=w9aoQTL/UgB1vjS1g1BNCEFf726wH1IBTlgPdnlXI/U=; b=fjeRQagfXdDHJ9tX9UzUCHDLIRYnroBruHmgIET5qMJijpIVvgC0ui4ms8zm4UzETx qp3y6SeLtxy4vuSto/2bfD5iqzG09QLY+omDnutMsTl9P42zubJINW1U3+uygzUfqRcX rCBsRIoX7fr5DnA0zv4f0LKuY6LRaVQLxey8rncYou16dO6d8X1zdniHR/7BuER9ibfr FjTz/WmRRZnhn2FLNpaFU1yD2E8pulQoGO4ZRwXe8XnU11dUJoenN/h+dYZpVj+JiVmr fNLWNPv4kBYbx0VaGKTo6HoMSO8wsLZcmMJeM4fKUd4CmKNI6XMBOe3gWXCc6yoNH5KY wdYQ== 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=w9aoQTL/UgB1vjS1g1BNCEFf726wH1IBTlgPdnlXI/U=; b=OWB3QUG8vzNLCT7s4w0yq9gLuqTVQvo1DFuv7/bYQzie0nRHhRUppkbM8YukOUqRd+ pNHAuwTsIK18eJjI/G7xSsU5RYV929LjF3j7esO/r+b4Df6RJniq3pQOr/xdm/nUpLl/ 0IGVa49FRfDtjTWt4dBMxLOc9WFla6ylNy0ciVOccFW2E4nZPWUCD5aYF8AusPowih+b r55M51vRE5KePjAMwMBs24et4mtkkNlpq2+OqVjmj5Cbilnhpqbf/lNWep6ca6PPUPuy 0asC8u5prwQwwScnZY6D0sv7FtCnBAKjejRnQLYaUBRDmhBw8W6GuWzDF3ne4OA7EvQk rzaA== X-Gm-Message-State: ANhLgQ354G/odXu/jQ++sLpDoZZIbJJRAt5/fhkcJuk+SDoDpeMCElvi oCTsaDn/eRX1bLwTEm2tAtIugcnJt69lUg== X-Google-Smtp-Source: ADFU+vvWoq0qrg/FJ5my9DoTUbwc8qrtj5pyQOQnMQmrnKcEjOkZ19Er1lI2KcCU/OZ1arc+wQFMBg== X-Received: by 2002:ac8:530b:: with SMTP id t11mr274730qtn.277.1583437359636; Thu, 05 Mar 2020 11:42:39 -0800 (PST) Received: from nicolas-tpx395.localdomain ([2610:98:8005::527]) by smtp.gmail.com with ESMTPSA id o16sm16335143qke.35.2020.03.05.11.42.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2020 11:42:38 -0800 (PST) Message-ID: Subject: Re: [PATCH v6 2/6] media: v4l2-core: Add helpers to build the H264 P/B0/B1 reflists From: Nicolas Dufresne To: Boris Brezillon , Mauro Carvalho Chehab Cc: Ezequiel Garcia , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Laurent Pinchart , Rob Herring , Tomasz Figa , kernel@collabora.com, Paul Kocialkowski , Jonas Karlman , Heiko Stuebner , Sakari Ailus , Hans Verkuil Date: Thu, 05 Mar 2020 14:42:34 -0500 In-Reply-To: <20200302154426.5fb09f91@collabora.com> References: <20200220163016.21708-1-ezequiel@collabora.com> <20200220163016.21708-3-ezequiel@collabora.com> <20200302142433.0ad1b383@coco.lan> <20200302154426.5fb09f91@collabora.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.4 (3.34.4-1.fc31) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Le lundi 02 mars 2020 à 15:44 +0100, Boris Brezillon a écrit : > On Mon, 2 Mar 2020 14:24:33 +0100 > Mauro Carvalho Chehab wrote: > > > Em Thu, 20 Feb 2020 13:30:12 -0300 > > Ezequiel Garcia escreveu: > > > > > From: Boris Brezillon > > > > > > Building those list is a standard procedure described in section > > > '8.2.4 Decoding process for reference picture lists construction' of > > > the H264 specification. > > > > > > We already have 2 drivers needing the same logic (hantro and rkvdec) and > > > I suspect we will soon have more. > > > > > > Let's provide generic helpers to create those lists. > > > > > > Signed-off-by: Boris Brezillon > > > Signed-off-by: Ezequiel Garcia > > > --- > > > drivers/media/v4l2-core/Kconfig | 4 + > > > drivers/media/v4l2-core/Makefile | 1 + > > > drivers/media/v4l2-core/v4l2-h264.c | 258 ++++++++++++++++++++++++++++ > > > include/media/v4l2-h264.h | 85 +++++++++ > > > 4 files changed, 348 insertions(+) > > > create mode 100644 drivers/media/v4l2-core/v4l2-h264.c > > > create mode 100644 include/media/v4l2-h264.h > > > > > > diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2- > > > core/Kconfig > > > index 39e3fb30ba0b..8a4ccfbca8cf 100644 > > > --- a/drivers/media/v4l2-core/Kconfig > > > +++ b/drivers/media/v4l2-core/Kconfig > > > @@ -45,6 +45,10 @@ config VIDEO_PCI_SKELETON > > > config VIDEO_TUNER > > > tristate > > > > > > +# Used by drivers that need v4l2-h264.ko > > > +config V4L2_H264 > > > + tristate > > > + > > > # Used by drivers that need v4l2-mem2mem.ko > > > config V4L2_MEM2MEM_DEV > > > tristate > > > diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2- > > > core/Makefile > > > index 786bd1ec4d1b..c5c53e0941ad 100644 > > > --- a/drivers/media/v4l2-core/Makefile > > > +++ b/drivers/media/v4l2-core/Makefile > > > @@ -21,6 +21,7 @@ obj-$(CONFIG_VIDEO_V4L2) += v4l2-dv-timings.o > > > obj-$(CONFIG_VIDEO_TUNER) += tuner.o > > > > > > obj-$(CONFIG_V4L2_MEM2MEM_DEV) += v4l2-mem2mem.o > > > +obj-$(CONFIG_V4L2_H264) += v4l2-h264.o > > > > > > obj-$(CONFIG_V4L2_FLASH_LED_CLASS) += v4l2-flash-led-class.o > > > > > > diff --git a/drivers/media/v4l2-core/v4l2-h264.c b/drivers/media/v4l2- > > > core/v4l2-h264.c > > > new file mode 100644 > > > index 000000000000..4f68c27ec7fd > > > --- /dev/null > > > +++ b/drivers/media/v4l2-core/v4l2-h264.c > > > @@ -0,0 +1,258 @@ > > > +// SPDX-License-Identifier: GPL-2.0 > > > +/* > > > + * V4L2 H264 helpers. > > > + * > > > + * Copyright (C) 2019 Collabora, Ltd. > > > + * > > > + * Author: Boris Brezillon > > > + */ > > > + > > > +#include > > > +#include > > > + > > > +#include > > > + > > > +/** > > > + * v4l2_h264_init_reflist_builder() - Initialize a P/B0/B1 reference list > > > + * builder > > > + * > > > + * @b: the builder context to initialize > > > + * @dec_params: decode parameters control > > > + * @slice_params: first slice parameters control > > > + * @sps: SPS control > > > + * @dpb: DPB to use when creating the reference list > > > + */ > > > +void > > > +v4l2_h264_init_reflist_builder(struct v4l2_h264_reflist_builder *b, > > > + const struct v4l2_ctrl_h264_decode_params *dec_params, > > > + const struct v4l2_ctrl_h264_slice_params *slice_params, > > > + const struct v4l2_ctrl_h264_sps *sps, > > > + const struct v4l2_h264_dpb_entry *dpb) > > > > The prototype here is not nice... > > > > > +{ > > > + int cur_frame_num, max_frame_num; > > > + unsigned int i; > > > + > > > + max_frame_num = 1 << (sps->log2_max_frame_num_minus4 + 4); > > > + cur_frame_num = slice_params->frame_num; > > > + > > > + memset(b, 0, sizeof(*b)); > > > + if (!(slice_params->flags & V4L2_H264_SLICE_FLAG_FIELD_PIC)) > > > + b->cur_pic_order_count = min(dec_params->bottom_field_order_cnt, > > > + dec_params->top_field_order_cnt); > > > + else if (slice_params->flags & V4L2_H264_SLICE_FLAG_BOTTOM_FIELD) > > > + b->cur_pic_order_count = dec_params->bottom_field_order_cnt; > > > + else > > > + b->cur_pic_order_count = dec_params->top_field_order_cnt; > > > + > > > + for (i = 0; i < 16; i++) { > > > + u32 pic_order_count; > > > + > > > + if (!(dpb[i].flags & V4L2_H264_DPB_ENTRY_FLAG_ACTIVE)) > > > + continue; > > > + > > > + b->refs[i].pic_num = dpb[i].pic_num; > > > > ... as you're expecting a fixed number of elements at DPB array, and using > > a magic number (16) inside the for loop. > > I used to have a '#define V4L2_H264_NUM_DPB_ENTRIES 16' but have been > told that this is an arbitrary limitation (the spec does not explicitly > limit the DPB size, even if all the HW we've seen seem to limit it to > 16). Maybe we can pass the DPB array size as an argument so it stays > HW-specific. it's formalized in A.31 h), to quote it: max_dec_frame_buffering <= MaxDpbFrames, where MaxDpbFrames is equal to Min( MaxDpbMbs / ( PicWidthInMbs * FrameHeightInMbs ), 16 ) So a DPB larger then this is not an H.24 DPB. > > > > + > > > + /* > > > + * Handle frame_num wraparound as described in section > > > + * '8.2.4.1 Decoding process for picture numbers' of the spec. > > > + * TODO: This logic will have to be adjusted when we start > > > + * supporting interlaced content. > > > + */ > > > + if (dpb[i].frame_num > cur_frame_num) > > > + b->refs[i].frame_num = (int)dpb[i].frame_num - > > > + max_frame_num; > > > + else > > > + b->refs[i].frame_num = dpb[i].frame_num; > > > + > > > + if (!(dpb[i].flags & V4L2_H264_DPB_ENTRY_FLAG_FIELD)) > > > + pic_order_count = min(dpb[i].top_field_order_cnt, > > > + dpb[i].bottom_field_order_cnt); > > > + else if (dpb[i].flags & V4L2_H264_DPB_ENTRY_FLAG_BOTTOM_FIELD) > > > + pic_order_count = dpb[i].bottom_field_order_cnt; > > > + else > > > + pic_order_count = dpb[i].top_field_order_cnt; > > > + > > > + b->refs[i].pic_order_count = pic_order_count; > > > + b->unordered_reflist[b->num_valid] = i; > > > + b->num_valid++; > > > + } > > > + > > > + for (i = b->num_valid; i < ARRAY_SIZE(b->unordered_reflist); i++) > > > + b->unordered_reflist[i] = i; > > > +} > > > +EXPORT_SYMBOL_GPL(v4l2_h264_init_reflist_builder); > > > + > > > +static int v4l2_h264_p_ref_list_cmp(const void *ptra, const void *ptrb, > > > + const void *data) > > > +{ > > > + const struct v4l2_h264_reflist_builder *builder = data; > > > + u8 idxa, idxb; > > > + > > > + idxa = *((u8 *)ptra); > > > + idxb = *((u8 *)ptrb); > > > + > > > + if (builder->refs[idxa].longterm != builder->refs[idxb].longterm) { > > > > Where do you ensure that idxa and idxb won't be bigger than NUM_DPB_ENTRIES? > > If it does that means something went wrong in the init func. I can add > a WARN_ON() and bail out if you want, but I can't return an error here > (that's not what the caller of the callback expects).