Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp4443965ioa; Wed, 27 Apr 2022 04:07:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0pcv5xNBFb7yzoRHTOhluIGQuZDwaHYAm9H4j+W+9INHQRYCacDs5CLEoho2gA95Rivw5 X-Received: by 2002:a63:48f:0:b0:3ab:3b1f:7e7f with SMTP id 137-20020a63048f000000b003ab3b1f7e7fmr12894402pge.164.1651057667012; Wed, 27 Apr 2022 04:07:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651057667; cv=none; d=google.com; s=arc-20160816; b=d/CTuKT+VCI2Wx3RBpdLOwLCqL78WQXLwahDvzanF8oiuqxWgcvXJbeWUpJPrjUH+o GwvExfI0Frdnik1ilhQPRbFFec6RSw1RjuRH+e7PxTqt8LbS/3FnyVkKuCBkbQPLGxs5 ZfT4+LNltjSkf2eurp98F1xFfrbTk0z/4kz4dac3yhZTLuSY8x87aIEfxu7I3NOz/1L1 S9qe/379YbOZtmWgJt/b9psR2T1In1oLeulfr+Q1vU7z5uT8E+iEQ1HsuUoSkrF4xaCh R3VIRvQFaEJOVCb0zH9RDyow0ra5HahQ11D/v4lpKDOP4nAb6b1ahraRY0AfX9f3TPUK KWzA== 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=MmNP28ohTrJnbo45P7P9H+E/zW40z5ZnnQlyb1wfWmY=; b=ms2NhDnZxjpx4KeQYnKV4PFg+foTsT8m1p9TzIYh/ebQmDRf6r+jcoju1xAc5L99Pr yB84AFoEs89cZPnaRcsUbrtBfoDmH6oRiexBs0w6vYvltCfGP9vlBzZom1IcF+MErK78 JNYUOS/R5oWzMfR3Wi0aTi4uZuZohwpjiug71Z6aPZEczDSfzoS2pmn9UcDCQdUXpETt ZGF7S9tSisbAtAuz45St3VW+gtotZogobLZeuFA/0XnvNzFGC8eyFnG9LeQA1RgXOjWi rDodb1Wae+NQadsKhoT/xxNfkNcta6dQvETma6gFMEg2b3EV+p8ikBGDb2Gd37gxRr4t +OPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=NSTisUst; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id oc4-20020a17090b1c0400b001cbbbaa19c2si5555658pjb.97.2022.04.27.04.07.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 04:07:47 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=NSTisUst; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B0E9C3D0C39; Wed, 27 Apr 2022 03:02:09 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350511AbiDZNCc (ORCPT + 99 others); Tue, 26 Apr 2022 09:02:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350359AbiDZNB0 (ORCPT ); Tue, 26 Apr 2022 09:01:26 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCC9217B98F; Tue, 26 Apr 2022 05:58:18 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: nicolas) with ESMTPSA id 07FAE1F43991 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1650977897; bh=wzijXmDhK09ZXKvIar9T0QlhLA6ISJRmeorKyXSGYdY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NSTisUst3NacQiRj7gch2pbnT2Re8cPYFzZPsrWHLHAJMmghZ0xh6ZeOOyPcwYSSl 7vz5nXSqO6Wg0p3D7JQWCu56zvaJLuo/7P0tux/xKckJPCVCQ0Io41jCyoQ41APkkb rS3xR7slfgdU1WBMIB/mm6PqBbrZLsa4giL1R30oWMBYEM+meffq9H3ZErU4GfcMDs ty/gAgP18LnJNRGnaX9ybWTf95jsPGcMPMRqvqikgZjMGi/2vDtVKp+FHa2W+8FehQ 5n4AwihlSlRk+pqq98w1cPiPkTYrNAFQiGwFv3C0bClyxwUknsDWtU/5wtiFoBAFYR znuy8LdVNhDSw== 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 11/24] media: v4l2: Reorder field reflist Date: Tue, 26 Apr 2022 08:57:37 -0400 Message-Id: <20220426125751.108293-12-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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,UNPARSEABLE_RELAY autolearn=no 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 As per spec, the field reflist requires interleaving top and bottom field in a specific way that does not fit inside the sort operation. The process consist of alternating references parity, starting with a reference of the same parity as the current picture. This processs is done twice, once for short term references and a second time for the long term references. Signed-off-by: Nicolas Dufresne Reviewed-by: Sebastian Fricke --- drivers/media/v4l2-core/v4l2-h264.c | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-h264.c b/drivers/media/v4l2-core/v4l2-h264.c index fe215035d9e8..72bd64f65198 100644 --- a/drivers/media/v4l2-core/v4l2-h264.c +++ b/drivers/media/v4l2-core/v4l2-h264.c @@ -250,6 +250,40 @@ static int v4l2_h264_b1_ref_list_cmp(const void *ptra, const void *ptrb, return poca < pocb ? -1 : 1; } +/* + * The references need to be reordered so that references are alternating + * between top and bottom field references starting with the current picture + * parity. This has to be done for short term and long term references + * separately. + */ +static void reorder_field_reflist(const struct v4l2_h264_reflist_builder *b, + struct v4l2_h264_reference *reflist) +{ + struct v4l2_h264_reference tmplist[V4L2_H264_REF_LIST_LEN]; + u8 lt, i = 0, j = 0, k = 0; + + memcpy(tmplist, reflist, sizeof(tmplist[0]) * b->num_valid); + + for (lt = 0; lt <= 1; lt++) { + do { + for (; i < b->num_valid && b->refs[tmplist[i].index].longterm == lt; i++) { + if (tmplist[i].fields == b->cur_pic_fields) { + reflist[k++] = tmplist[i++]; + break; + } + } + + for (; j < b->num_valid && b->refs[tmplist[j].index].longterm == lt; j++) { + if (tmplist[j].fields != b->cur_pic_fields) { + reflist[k++] = tmplist[j++]; + break; + } + } + } while ((i < b->num_valid && b->refs[tmplist[i].index].longterm == lt) || + (j < b->num_valid && b->refs[tmplist[j].index].longterm == lt)); + } +} + static char ref_type_to_char(u8 ref_type) { switch (ref_type) { @@ -360,6 +394,9 @@ v4l2_h264_build_p_ref_list(const struct v4l2_h264_reflist_builder *builder, sort_r(reflist, builder->num_valid, sizeof(*reflist), v4l2_h264_p_ref_list_cmp, NULL, builder); + if (builder->cur_pic_fields != V4L2_H264_FRAME_REF) + reorder_field_reflist(builder, reflist); + print_ref_list_p(builder, reflist); } EXPORT_SYMBOL_GPL(v4l2_h264_build_p_ref_list); @@ -393,6 +430,11 @@ v4l2_h264_build_b_ref_lists(const struct v4l2_h264_reflist_builder *builder, sort_r(b1_reflist, builder->num_valid, sizeof(*b1_reflist), v4l2_h264_b1_ref_list_cmp, NULL, builder); + if (builder->cur_pic_fields != V4L2_H264_FRAME_REF) { + reorder_field_reflist(builder, b0_reflist); + reorder_field_reflist(builder, b1_reflist); + } + if (builder->num_valid > 1 && !memcmp(b1_reflist, b0_reflist, builder->num_valid)) swap(b1_reflist[0], b1_reflist[1]); -- 2.34.1