Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp5636350pxb; Mon, 28 Mar 2022 15:17:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxb9qk8vaH41sGtTZa3agdtcLLbXRyLi4plnX0iB28mJIm2HGP34rAT4RzH4CP6QXvmHIy1 X-Received: by 2002:a05:6808:1204:b0:2d9:a01a:48d0 with SMTP id a4-20020a056808120400b002d9a01a48d0mr697959oil.283.1648505875687; Mon, 28 Mar 2022 15:17:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648505875; cv=none; d=google.com; s=arc-20160816; b=rvrzFOiLNf9YbE8ypk7PBDsrmICqUfBdUXN+5Qf/i8dqLatw1sbw6IQVojlF64n5mE tRZ34BW8qUdKrDKD59ucfMq457UvLyW1MVCz5LvBfE45cg3//J5qyRD08mFK8+MXC/aX PA1qQrc5oZ28pPPS3cC5EcaA5xj8QFGz4r6TeSnDFRRj83XiKJJ6TCHDHrnl371XpYAX MaQh0ixe/0p22SjALS53VteE9aw+yc1QE/Zq9o65D4FcjlYlZfGGWvShVz8ztZusNaR5 JoltQNKkJvTqtI8HQWJZI/zkucdDEUVF6ZSTKHYQYNti5itPc+Ud8ISXvfgkK8Sw/TsF i21g== 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=/qrRzzrBP31ab72spCBXr9hGtBMV5ge3AXSL3JwmEDs=; b=dwsIqq1sS6NgxrF5txQzRfjn4ggLquyCzTK/iU5S2N6yKMMsFhcu04NwuszkmvZK2Y +PGIZe9vvb9AE/9kYL/hUpgDyV4wCCkQ2sts5uIL/leoWqEdYkWvkw+N17MQcI8wBS+x +MFbchi+flqZtq06bZfUpPWcbOgic3KjdlL8+EUIuAUUHlcndbYqRo1QVfE+m/k3whQY SEFSPZxgpczTmwQJk2aG25aU7xUG/zuDuyCclsFir+9Iu4L3Crbls2MlSJSHGwNo+H2W aA0f6NyEZvuYoD5FFqZPIMI09E2Js1W2X3DcC0HjZuGTl8uGcdEYIEF4mBQbA7dvn5eG 54AA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=bSYBFsly; 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 t64-20020aca5f43000000b002ef8f86e9casi11327887oib.41.2022.03.28.15.17.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 15:17:55 -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=bSYBFsly; 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 440F5186898; Mon, 28 Mar 2022 14:35:23 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344478AbiC1UC5 (ORCPT + 99 others); Mon, 28 Mar 2022 16:02:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344319AbiC1UCV (ORCPT ); Mon, 28 Mar 2022 16:02:21 -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 DC9F53B3C2; Mon, 28 Mar 2022 13:00:22 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: nicolas) with ESMTPSA id 6107D1F438B3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1648497621; bh=qASp9j35h86HZHqACbW4hS8pRQcR68hjlS1LdUain6U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bSYBFsly9GrPfSwBI9lPzlksp9cEBsdRIyvQw2RwExw4t9cHPSfmpMTol+4t9Z2RU j3QxeXh0CDyalwcffVXx4lzqWFskW6LvhdiGU6/f/U6aoMhbw10J6KNiJlBMIt34Vf 6TdZjf7ouduq5K7Pt9Ycmpw/MAjAuQFQtlsOFIzIXiTU1unRooRT5vrlpMau3Wb9Q8 7gHQ9mYwOpa140DlGQVjpz00gfy8tTVhUXBHeGu0DK3mqncCtAmwzApZdFTOqn4dYC pfSbmR0rwINKx3pzQUCTmyLuYdhp2fXJrNk7QfryzTqKFzBp2uidnWwtBJTj42CSjg UM9DR4nZgn8GA== From: Nicolas Dufresne To: Ezequiel Garcia , Philipp Zabel , Mauro Carvalho Chehab , Greg Kroah-Hartman Cc: kernel@collabora.com, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v1 21/24] media: hantro: Stop using H.264 parameter pic_num Date: Mon, 28 Mar 2022 15:59:33 -0400 Message-Id: <20220328195936.82552-22-nicolas.dufresne@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220328195936.82552-1-nicolas.dufresne@collabora.com> References: <20220328195936.82552-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 --- 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.1