Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp3685450ioa; Tue, 26 Apr 2022 08:13:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJye0bV5tIKwwG6zeI4IO61RQrYQWe2W0JU0OEczRS8SWXflUI5/KC/SdhlqIO97vusGD98+ X-Received: by 2002:a17:90a:e7c3:b0:1d4:9d67:4938 with SMTP id kb3-20020a17090ae7c300b001d49d674938mr36442861pjb.10.1650985986801; Tue, 26 Apr 2022 08:13:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650985986; cv=none; d=google.com; s=arc-20160816; b=NCiTp3xkc88TtHapJnWnHp4vgnCVZQAlGRcwxYVThbk4AuNzFWQ/neOu6GJPDHDxiP S7eM15ASHRtrpJ4luNXV1uMJ3t23Z8mQlraU0J6J0pfYuZmiLPNM+yZzZgqojJyBUucp s4MTTrn1L7XCJOLBLmsAAHliS1+ZBfjmDBihOpotkCmWlzWXfAPA1OyyqFWc296xtMJy TMpRGKt8a4P2+l78ElDKmvba3fwbUAKaNt2TgAWfT8k4f6raU45g6bNGmvzN70eUypy1 u3jEBWJXIRNCBJ8QeiZB53FnUQAbqIus+vEujXgNlmXOxiMG6GsrcZQTsVYjSJN8yj2+ mOeQ== 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=qVpMsbOZ/yVYyN+wsidawHf2AM2VZjDcJ3DsVkgeFS4=; b=reEb+lG5TgxWSARHzaSS6yqT3x0CWqvQTSHXYz2+h0mvZefzelgpuLDycAiwxyVQiA duueC/nBOLGxa1xJPzc3fhkhRPLezqVoxJyPWAO56cF82csaWFYBGBWClDl3NH9vEoK1 bfB3wYgWwsThrqXAm+TfEF9ckhNAfNCXxBMZToSqjukc2JHiP9M3gi5pcHSrRoMowgH0 aYl5zJ9aYBfzD0BEUpeGv9F1pVowdO2tCZ2G/ub6MNhO7YdiczcO5Svo3apYRTJvkBj8 DB/rRIqwSSO2sgmCBs4+MqKiv9oidFlOG0JAf5FANOFgTHsJuPBfQwpoIEtJEloQ8CI5 ruIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="M/Su31vK"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q12-20020a170902b10c00b00158205c7f9bsi6548118plr.46.2022.04.26.08.12.46; Tue, 26 Apr 2022 08:13:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="M/Su31vK"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350458AbiDZNCE (ORCPT + 99 others); Tue, 26 Apr 2022 09:02:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350394AbiDZNBh (ORCPT ); Tue, 26 Apr 2022 09:01:37 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8727017B98D; Tue, 26 Apr 2022 05:58:30 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: nicolas) with ESMTPSA id 1C6751F43996 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1650977909; bh=Obrg+kliljhQBVbkjHH9eqyMF1KK1PscTQElBfjHqLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M/Su31vKdsLjJViMlDV+oZDM2lWGxhUOrM0xafZj4XX9GRff9fgOXPSG4OMAc1QAs B5qSVl8w3PC38ceehO0XjfkGqsCHvh4k940A679PTb+LHLTOx3rrilS9Sp2Exzrkoq ij85Gh4X8ovJXGy0mCiByNyHOjNK0/xSni3J/R+PkETo4Hy0Yqi1agSZBU8bzvqRff gBE+vPFCxcz2wg3bZN0kte+59S6ty4xTRoc04YP6VwCQSuRwFbDEKWby7uO2+0SfCE OLgllG/q6s3WF7qFY103nMu47ObqYHVano4sby24zZQCO/SzPVbi64lxCNU86vSSC9 Hm2TfZqLLoO/w== From: Nicolas Dufresne To: Ezequiel Garcia , Mauro Carvalho Chehab , Greg Kroah-Hartman Cc: nicolas@ndufresne.ca, Jonas Karlman , linux-media@vger.kernel.org, Ezequiel Garcia , Sebastian Fricke , linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v4 17/24] media: rkvdec: h264: Fix reference frame_num wrap for second field Date: Tue, 26 Apr 2022 08:57:43 -0400 Message-Id: <20220426125751.108293-18-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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham 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 From: Jonas Karlman When decoding the second field in a complementary field pair the second field is sharing the same frame_num with the first field. Currently the frame_num for the first field is wrapped when it matches the field being decoded, this caused issues decoding the second field in a complementary field pair. Fix this by using inclusive comparison: 'less than or equal'. Signed-off-by: Jonas Karlman Signed-off-by: Nicolas Dufresne Reviewed-by: Ezequiel Garcia Reviewed-by: Sebastian Fricke --- drivers/staging/media/rkvdec/rkvdec-h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c index d5ac0285f36f..7011b66c1aab 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -782,7 +782,7 @@ static void assemble_hw_rps(struct rkvdec_ctx *ctx, continue; if (dpb[i].flags & V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM || - dpb[i].frame_num < dec_params->frame_num) { + dpb[i].frame_num <= dec_params->frame_num) { p[i] = dpb[i].frame_num; continue; } -- 2.34.1