Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp4417924ioa; Wed, 27 Apr 2022 03:30:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZDb20kQx+BVdx9H87E8p96wdrGZtyLKwZYE7u3sSmac8uxeN5etDFM8sPhg1BlDiocvc7 X-Received: by 2002:a17:902:cf05:b0:156:2aa:6e13 with SMTP id i5-20020a170902cf0500b0015602aa6e13mr27896326plg.137.1651055433531; Wed, 27 Apr 2022 03:30:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651055433; cv=none; d=google.com; s=arc-20160816; b=PkagZTNm/ZNvH5DW/zcANr1B35NWehV5kLgl45+7FE2//g4tps2+V1OdcxBf6Jjhow 3FElKES+5g9dZNdSpBkDAxTJ/YTkFispGPQisGtmoJEbDU8HLJOC+Q6iND9Gj9i59Py3 rtPlonm8lwF90wksq7sT5nd1SDvvLP96WCfMm1oDK1i4H1t/XgpuAgtXQYihi9JN0zjQ CFPtXJxn0PhW1nrROq/haSsUvhp67MeOtGgeZ3/Hm7kxQEv7StzNK+xkt1siUN7jg9rK 0GKDk/jeh4ujVaZRclPYLjm2H+tcq1G1Bjttmg/Y1RjyHQMS7XoYWfv2mTtwiSr0Co8T xE2A== 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=Pz0qS/+GNU4VOgRHiHz43RI5LV+lJ/uanjzgzCK5sVg=; b=VEyaruu66p7zVmcTH+CPvmCMAoDjF2g7gbBmb8FfqPowOqnSzLTrWnD8ogBHLNZ24z /9j+UoMH4a+hIrf9bYZZStwydhylH7NZOKwumOtA7IvhIqjjCA10HeaLGVFQzqqSJ9Iu UHzHeDVnSzkfYqLaEyo5T0sYDzKbreiFTD1XV4tpQooit9XoWa4PSjPcYRBuNPEJgmPZ cPxmD9jNB9RGHC2zNLfbPlkxpJJvwmkBehgo7zE9S8fhSXYw2c9aVsnMOy3nANLaVVYA hKk8fp/XyBP1itPm0iS5lHAxapfVSvRXNXYMjZNGSLMirrICxPvuuEmTw7w0LSyCUKEt 9gAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=NN38d68d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id f13-20020a056a00238d00b0050a99acc9ecsi1114012pfc.45.2022.04.27.03.30.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 03:30:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=NN38d68d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 3F68B3A1A2F; Wed, 27 Apr 2022 02:45:04 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350522AbiDZNCf (ORCPT + 99 others); Tue, 26 Apr 2022 09:02:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350381AbiDZNBp (ORCPT ); Tue, 26 Apr 2022 09:01:45 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 982D117B3BB; Tue, 26 Apr 2022 05:58:37 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: nicolas) with ESMTPSA id 498941F43992 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1650977916; bh=rqMU1/6TJ46L9lH5r2+bP74ysDX3ywT+LO6k1I+k3Bg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NN38d68dmHTqhw4X0vJpCFONROr///7o0gkQVxpcwDpQj8Jz3KwUV+lRZ6Gi7dbRj gbmNVtVshNHarIw1F26EsLUgxGPzqHidqyagAW0FfA06AVfEwlcjDMef4Te3Kx/UDO eh5Xc4y3fhdtPBW2jrxfjzpBJWAwoJcc8lSliupb+DA0kRPI9sYJMvmxUycl4sQJkl ZnWY/7oUZxfN7qUeJYl5eBXwuZbozC0bufbyGQt6TaU8dAkNVTZ57fYuuL6gUsULQT GpPwN9luugkjVokP+4YYhj0OYebaC7hMtmTrcfPw+qmIGzhtpShgaq34Xea3VHQEbN hARecf+vWDilw== 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 , linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v4 21/24] media: hantro: Stop using H.264 parameter pic_num Date: Tue, 26 Apr 2022 08:57:47 -0400 Message-Id: <20220426125751.108293-22-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 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 --- 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