Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp3980332ioa; Tue, 26 Apr 2022 14:00:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzC3qu5YvXOFXhmtIdK84gC6+tLYKTGUaCfFOSrpdw/EuWFSkrXNmBHrsxGaQ1NGixdjEQN X-Received: by 2002:a17:902:da87:b0:15d:2e44:c1a6 with SMTP id j7-20020a170902da8700b0015d2e44c1a6mr7687137plx.85.1651006840788; Tue, 26 Apr 2022 14:00:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651006840; cv=none; d=google.com; s=arc-20160816; b=HfmrQHF675skNiAeB9GaCAFVCpZYxFp01+LNt8S7zQfr51pSqk3aI5KoyWGEBbsyBW aFTzpyp2MxgaoVM29pcH493WY90kKunaAgfbdjxwkQhKM1q+Qyk3BLcZ7nZ4JafAuxFY o6XK8pxBtA+K+/mu7fBVraHdc7hgXnflneR39uzXN32XA0kPP3oBYHvMKnyWnpvmbTO5 n3pJ1bc5fVKWLnYl/EgGkJtyNr/D4A9WA0lIc0ptTqNDAojWkZicP9GfLNRF7vB0Gdwo 6BOEK4w5R6fLhfoIFndB6Ta3UvSdcVGYtB2gyfR/TVxGMVpt/K6dll5OYfr0SBx8adsP jWwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=z+9BvggZESyqPk3VCR9JjAd4xv+A08TuiKogcKcr6ug=; b=zT1mOtrFMtH7jJSYzd05dtDFT/rbohwykUN6n25jt5eArreWeatyeNT40N2q2hQKm1 KPasO9zHSVzhxGcLgIQjdkVff44d3R+bqt0OTeLjkXNDzpjXbzOJIZZcPkB49nEmt8tD HT8gXO33bLxVA6Qzr3N3JvsZqDYJNysaemnopivplm7SfBWHJGrIOurCEmA+rlebeDhJ B7FAkzLsdLbSys6KC8UAsbzU8XrHM2xPWUPMy6cZF1OkfUpEFpdlaA8fu8ow20882rP+ livr75f3tRrE2Xbn7xM9dyla8kfVu+DSAhwXYsHze54QfGurhEbacyNvrFfLv0T6iygS +Rzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=LclxaSjP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k9-20020a170902c40900b00153b2d165b3si8205244plk.443.2022.04.26.14.00.16; Tue, 26 Apr 2022 14:00:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=LclxaSjP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350356AbiDZNBo (ORCPT + 99 others); Tue, 26 Apr 2022 09:01:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350340AbiDZNBU (ORCPT ); Tue, 26 Apr 2022 09:01:20 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9190617E21D; Tue, 26 Apr 2022 05:58:13 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: nicolas) with ESMTPSA id 7DA501F4398F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1650977892; bh=TG6URAwoxuOMsxmElkXZN+3kr6++zE3/TmJ6jTIeCc0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LclxaSjPDfOpC1UByITD5g0TcRn93XHlXMEJxfu6eBw6NAIFotmhiFn865sKV37A2 BylfSgeLLOjvU7FE4GgWjZI4fw1BVHHEYqQE+Q9pQf4IxXdbe29xsHmNUZ0CIYG73W uaSH7XY7FZycGmEv2UScGuDjLhF5e40uFrm/lGBYsvC9Q+9sPUUogaMTT7fkdL2DQ7 gD0qR6bUJvCLxpDzLwXR0mo0Xid1GU/b4JM7nGbuaGnVxJD6gpQQBYjsp7tNRw8Wdb 8AZKC0WQmiCfyjTX/rjOS9PKUp1IKg4/btz4G5XS6279dHAIJj9qttd6rJ/Hi8Q2x1 koC8n4xkKSpGQ== From: Nicolas Dufresne To: Mauro Carvalho Chehab Cc: nicolas@ndufresne.ca, linux-media@vger.kernel.org, Sebastian Fricke , linux-kernel@vger.kernel.org Subject: [PATCH v4 07/24] media: h264: Store current picture fields Date: Tue, 26 Apr 2022 08:57:33 -0400 Message-Id: <20220426125751.108293-8-nicolas.dufresne@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220426125751.108293-1-nicolas.dufresne@collabora.com> References: <20220426125751.108293-1-nicolas.dufresne@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This information, also called picture structure, is required in field decoding mode to construct reference lists. Signed-off-by: Nicolas Dufresne Reviewed-by: Sebastian Fricke --- drivers/media/v4l2-core/v4l2-h264.c | 10 +++++++--- include/media/v4l2-h264.h | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-h264.c b/drivers/media/v4l2-core/v4l2-h264.c index 4b46b36526c0..58f18bb0afb6 100644 --- a/drivers/media/v4l2-core/v4l2-h264.c +++ b/drivers/media/v4l2-core/v4l2-h264.c @@ -34,13 +34,17 @@ v4l2_h264_init_reflist_builder(struct v4l2_h264_reflist_builder *b, cur_frame_num = dec_params->frame_num; memset(b, 0, sizeof(*b)); - if (!(dec_params->flags & V4L2_H264_DECODE_PARAM_FLAG_FIELD_PIC)) + if (!(dec_params->flags & V4L2_H264_DECODE_PARAM_FLAG_FIELD_PIC)) { b->cur_pic_order_count = min(dec_params->bottom_field_order_cnt, dec_params->top_field_order_cnt); - else if (dec_params->flags & V4L2_H264_DECODE_PARAM_FLAG_BOTTOM_FIELD) + b->cur_pic_fields = V4L2_H264_FRAME_REF; + } else if (dec_params->flags & V4L2_H264_DECODE_PARAM_FLAG_BOTTOM_FIELD) { b->cur_pic_order_count = dec_params->bottom_field_order_cnt; - else + b->cur_pic_fields = V4L2_H264_BOTTOM_FIELD_REF; + } else { b->cur_pic_order_count = dec_params->top_field_order_cnt; + b->cur_pic_fields = V4L2_H264_TOP_FIELD_REF; + } for (i = 0; i < V4L2_H264_NUM_DPB_ENTRIES; i++) { u32 pic_order_count; diff --git a/include/media/v4l2-h264.h b/include/media/v4l2-h264.h index e282fb16ac58..e165a54c68fa 100644 --- a/include/media/v4l2-h264.h +++ b/include/media/v4l2-h264.h @@ -21,6 +21,7 @@ * @refs.longterm: set to true for a long term reference * @refs: array of references * @cur_pic_order_count: picture order count of the frame being decoded + * @cur_pic_fields: fields present in the frame being decoded * @unordered_reflist: unordered list of references. Will be used to generate * ordered P/B0/B1 lists * @num_valid: number of valid references in the refs array @@ -36,7 +37,10 @@ struct v4l2_h264_reflist_builder { u32 pic_num; u16 longterm : 1; } refs[V4L2_H264_NUM_DPB_ENTRIES]; + s32 cur_pic_order_count; + u8 cur_pic_fields; + struct v4l2_h264_reference unordered_reflist[V4L2_H264_REF_LIST_LEN]; u8 num_valid; }; -- 2.34.1