Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47D282F38 for ; Mon, 30 May 2022 13:37:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93623C3411E; Mon, 30 May 2022 13:37:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653917847; bh=lyG/J14veE4PPv7P93S7wmHZ8PtfDwL4ePf9On8nxYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bDjXLFF3b9ceSuQ34IdFVWnrlZ9O7/xnKQROKweiXn+06XvkmEKKYZz/HzIrb/bnt 6lWuhiU+20HsX1tfEUclydHFDl8RgW8ouVZUthWwXUnrfOH7vHMsak1EqCGtLTPW9X vK/pDrGV0rDP8lYlAtzqXUfk3Uyw5Oyikp3zF9nhNps5r5l97ycvFvwZn549beZnCz RXMvtXun8Mtl1atKhPoZqPTrZQhZhpqnwItQWfvf7TZrQxSMwczWP03g9XtXAVGi+U 8rJ26/l9nHeDJTe1xrgHsilN6rnpSfxOPKt5oNtwAKXV29faxNKO/lDoXgKWaX+m1X TWUTNggGCSPPQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nicolas Dufresne , Sebastian Fricke , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , ezequiel@vanguardiasur.com.ar, p.zabel@pengutronix.de, gregkh@linuxfoundation.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev Subject: [PATCH AUTOSEL 5.17 114/135] media: hantro: Stop using H.264 parameter pic_num Date: Mon, 30 May 2022 09:31:12 -0400 Message-Id: <20220530133133.1931716-114-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530133133.1931716-1-sashal@kernel.org> References: <20220530133133.1931716-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Nicolas Dufresne [ Upstream commit 831410700909f4e29d5af1ef26b8c59fc2d1988e ] 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 Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- 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.35.1