From patchwork Wed Jul 1 21:56:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 11637373 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6010992A for ; Wed, 1 Jul 2020 21:56:34 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 367E52077D for ; Wed, 1 Jul 2020 21:56:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gaWmQH+Y"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b="oXom7lgf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 367E52077D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kwiboo.se Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:References:In-Reply-To:Message-Id:Date:Subject: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=WP3uCw+GXOls5RFCQI+t4MDgE6cx7jA2eYMa7ymcl/0=; b=gaWmQH+YWzASw9DNq0XA3MuXkr wJtRni+60qHrc/5IiEPVaOkldfjVpeAFvPn0f0hpCqggnE7O4uxP+/BRped59W48FuSy/gj3Kc7Wy 4pLory2gaOmjXbZfG6IyW6JlQHkBIbzhOFzTVhBArr8agfSzgS/vo4k46A/AAFAgbdKtXHcpJSElO 1J5HQdXmoDB+6+wU66PuRLMTz1xqxTO7Wp20U9wQ/Gk6+7NNdOsZpViWcgaQbvX2RjwdvMyX9J1PK tdTNMJg1O7wxANP7sAAOQYJv8/s1xY4ZcysdVOpe72O+oF+XE3PtZ2FTq4gxkLLLymq/i8/rUW1c/ lnMZpftQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqkiT-000848-90; Wed, 01 Jul 2020 21:56:29 +0000 Received: from o1.b.az.sendgrid.net ([208.117.55.133]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqkiN-0007yZ-PN for linux-rockchip@lists.infradead.org; Wed, 01 Jul 2020 21:56:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:to:cc:content-type: content-transfer-encoding; s=001; bh=x8pjW6TLR+SQF49vxCxwQlIssNxtmW5lEIJnRKN/noI=; b=oXom7lgfCZGjQ63fDwwXmq4xaXRbsvoZZyJYM2P6GGnMXTU3xV75c4tdnXANCddIhZCT FHTDS6trO47W9iqy0r7rWE99XCMZo+UUtCDUxkdxu9viutmB1EtdJrP/fJqR9lHjUmKWDA bhXU2qRcnQUTiz784xvnvh9R7k2yXfQnI= Received: by filterdrecv-p3iad2-5b55dcd864-d2lx7 with SMTP id filterdrecv-p3iad2-5b55dcd864-d2lx7-18-5EFD0685-18 2020-07-01 21:56:21.373950182 +0000 UTC m=+449219.026043672 Received: from bionic.localdomain (unknown) by ismtpd0001p1lon1.sendgrid.net (SG) with ESMTP id bim62XYeQrOv5R9hIYElFQ Wed, 01 Jul 2020 21:56:21.119 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 2/9] media: rkvdec: h264: Fix reference frame_num wrap for second field Date: Wed, 01 Jul 2020 21:56:21 +0000 (UTC) Message-Id: <20200701215616.30874-3-jonas@kwiboo.se> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200701215616.30874-1-jonas@kwiboo.se> References: <20200701215616.30874-1-jonas@kwiboo.se> X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h1783C2MVdgrW5Lqxp00UHjwcuImHPDqMe3RyKxPbQzLCwhuE5Qid432TRiZGHHQzwzQ/Gwg1C9DE3BApMARs1CVYBkMPqxWhFl72THiBJV1r0+gRHh/CWewbq5lFdkRHpU6OxK+56Px8jm9GOnuyfzs+TS/bEEpFSzCD1fnOVhrc7UQye1QumCDfZBOIig+WQ== To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200701_175624_119754_E56B01F0 X-CRM114-Status: GOOD ( 10.50 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [208.117.55.133 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [208.117.55.133 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Courbot , Jonas Karlman , Tomasz Figa , Hans Verkuil , Nicolas Dufresne , Ezequiel Garcia MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org 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 cause issues to decode the second field in a complementary field pair. Fix this by using inclusive comparison, less than or equal. Signed-off-by: Jonas Karlman Reviewed-by: Ezequiel Garcia --- 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 7b66e2743a4f..f0cfed84d60d 100644 --- a/drivers/staging/media/rkvdec/rkvdec-h264.c +++ b/drivers/staging/media/rkvdec/rkvdec-h264.c @@ -754,7 +754,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 < sl_params->frame_num) { + dpb[i].frame_num <= sl_params->frame_num) { p[i] = dpb[i].frame_num; continue; }