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: 11637393 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 2C4EC17C5 for ; Wed, 1 Jul 2020 22:01:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 05DA120853 for ; Wed, 1 Jul 2020 22:01:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kwiboo.se header.i=@kwiboo.se header.b="oXom7lgf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727811AbgGAWBZ (ORCPT ); Wed, 1 Jul 2020 18:01:25 -0400 Received: from o1.b.az.sendgrid.net ([208.117.55.133]:30188 "EHLO o1.b.az.sendgrid.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726419AbgGAWBY (ORCPT ); Wed, 1 Jul 2020 18:01:24 -0400 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/Gwg1C9DE3BApMARs1CnrX9cGaf43OSrd8PLLwJlXRO0ap7C5B5giIaYiw3f7T0amvyH0/dhtEQzWNRJW33aO5vV/1K0lAFG1Xz+2aEzQOMzTjIVjUTeCgGej8dLsQ== To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Jonas Karlman , Ezequiel Garcia , Hans Verkuil , Nicolas Dufresne , Tomasz Figa , Alexandre Courbot Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.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; }