Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1053374iob; Fri, 13 May 2022 21:15:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEFCXpm41097bX3qzixyL63Bolt7G2wg+atc/EvKSzwS+0U9gwfHDEnzQASox2wYTCae/t X-Received: by 2002:a5d:498d:0:b0:20a:dc6b:35c9 with SMTP id r13-20020a5d498d000000b0020adc6b35c9mr6297312wrq.176.1652501723783; Fri, 13 May 2022 21:15:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652501723; cv=none; d=google.com; s=arc-20160816; b=Hp/IBBQTy5gfFudhj8ZCDrunkhUn3D2XiD8lEo2NFrrxDssqacZ1DnYppbSQUd2LRD MNndBc2jw3a8+ZiT503u1EYigOGwvyk4boORM6cm0MztcYDj51RcX7K/xqWtNhWkkJYb ELt3U+DE7HPO7n8rld0BR2ebMq2PdLgFiYk96Kf4JGg1EAPf99cM96nFDhmUBuHwMenI 9EQo9hSSoZlvlIIalO2NXBnRb3/owRLSf3ITs97WcixWBJ8vSQi0kVWMqiBeNbNcPCaC q80gAHC+Yov7zB8oeM+6x6ff/rflhwBIbz0hgKqWfNbmoMYxmD8pzTAdwmK3XxFJRNca Aw6Q== 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=wnQEfJXuD+2yBzO0ahV6ajobvTo2mRdd/hhVGluRohk=; b=xIaDohyz1SVqexrwyccpnq+Lbt3+4uRw/uwLgUYKIUFhaP6G0chzmSZ7ETf1+TU3vS 9HDrww5Xcp3/GupKe5uDHasqfqlzNmQD4MywiSzbLhvJBRMDICyb3I/A0my4rJ08KpyR fuEkeuJkxUoT6/DMlRED/bn9igu37r1AWN4e0d2i7FrxuPFONke5STucLb9AHqOPgmg9 Y+P4d7WmwznV7SrmUufYk8nZHp8Ma1wI/UVupUZUUg4yf/dLGZptXis62l++KHQbcyOc sXUjVc+QrmO2CNuilQp8HURqZPuBhUqy0I9AdX0QetoXjs87EXnPolomci/qWDO1jW2P O0mQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="f7/OJULv"; 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 t10-20020a05600c41ca00b003945f66cc79si3632584wmh.96.2022.05.13.21.15.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 May 2022 21:15:23 -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="f7/OJULv"; 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E7CCF4E7EAE; Fri, 13 May 2022 17:46:26 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1384447AbiEMUcM (ORCPT + 99 others); Fri, 13 May 2022 16:32:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1384503AbiEMUav (ORCPT ); Fri, 13 May 2022 16:30:51 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1346E81996; Fri, 13 May 2022 13:30:19 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: nicolas) with ESMTPSA id 20D1E1F46491 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652473803; bh=alVT6vQf62mKVLIbN1ZQcw7iCvLKw2erGbicRcgWoFw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f7/OJULvIcqwg6BCOeOzihRiWBBA1N2k0JlV3VV3gUA558pAkZH8uMs+dxR8TK/VU xTGC9GVIWPX0ODnx0xEGeIkXJLKjC2A/97uQDSuJugCBBppKZ7h836g8QkzCynZyvP OZPhu2DMF2q7J/6QVvRsEBR/nOeCZW4D08LnKQDSLbHG4ZwjV/c+VFxTz1a/+y/B0v YsbXrHTOvLjBgHEclouJ/bKS2men49VFmZgjpDh8ACltoaV9xfN6ZKxfohlar+2BCs VjDItssViDl5W3DrGQpLkg8iBaoGzcoLiuWELrzejuOww1qVCOr/nvqsmK1JMfQEhy y3xub2XUcvCEA== From: Nicolas Dufresne To: Ezequiel Garcia , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman Cc: nicolas@ndufresne.ca, linux-media@vger.kernel.org, Sebastian Fricke , Hans Verkuil , linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v5 17/20] media: hantro: Stop using H.264 parameter pic_num Date: Fri, 13 May 2022 16:29:19 -0400 Message-Id: <20220513202922.13846-18-nicolas.dufresne@collabora.com> X-Mailer: git-send-email 2.34.3 In-Reply-To: <20220513202922.13846-1-nicolas.dufresne@collabora.com> References: <20220513202922.13846-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,T_SCC_BODY_TEXT_LINE, 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 The hardware expects FrameNumWrap or long_term_frame_idx. Picture numbers are per field, and are mostly used during the memory management process, which is done in userland. This fixes two ITU conformance tests: - MR6_BT_B - MR8_BT_B Signed-off-by: Nicolas Dufresne Reviewed-by: Sebastian Fricke Signed-off-by: Hans Verkuil --- drivers/staging/media/hantro/hantro_h264.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/media/hantro/hantro_h264.c b/drivers/staging/media/hantro/hantro_h264.c index 0b4d2491be3b..228629fb3cdf 100644 --- a/drivers/staging/media/hantro/hantro_h264.c +++ b/drivers/staging/media/hantro/hantro_h264.c @@ -354,8 +354,6 @@ u16 hantro_h264_get_ref_nbr(struct hantro_ctx *ctx, unsigned int dpb_idx) if (!(dpb->flags & V4L2_H264_DPB_ENTRY_FLAG_ACTIVE)) return 0; - if (dpb->flags & V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM) - return dpb->pic_num; return dpb->frame_num; } -- 2.34.3