Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp4412151ioa; Wed, 27 Apr 2022 03:20:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxo/Wor4Na/w9eIhxYSInymhm2zdzqzs7vk6+9Tkx/ojmYS/bzuhukXNvX712PkzM8yrnl X-Received: by 2002:a17:90b:2247:b0:1da:433a:900f with SMTP id hk7-20020a17090b224700b001da433a900fmr1570674pjb.24.1651054856573; Wed, 27 Apr 2022 03:20:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651054856; cv=none; d=google.com; s=arc-20160816; b=c4Zs9fnPkZe4M59x2qxwu0szYCP9+fHEMSFquhKE/FAwhe83QVHVsCBGn4HSdTDCH0 yNOr8Q9flVJIHaGC3j2eYRh73Nxj1bRbH+X9bqS0CjOfPEahx5K967lVGPz8mC0QjT4F VC43Hh7/yZ7uUMN7Lcs1I6Yhcq8UjffeGdGyIDY9UCfUOzzYZilfoU31sC3rGBi9KYsB RqNYc2ESyMIa1ortGd38s8Cbmfz79VwZek9L/s6TPAy6Cvs4EQQfTYqAgNti55N4UN8E J4XMN9t1qRtRbB88cuwducA/H/27xpG4sVqKq9JxzdpFxxUbBrYNbSGIqlkwm5aopRBg ywRg== 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=cylwUm99GztU4B7OvcO9b0GF7mkMkQG+J1J/hWkpnUw=; b=dCLz/QmtZA3I95BcqSqErgWa2OWVtdSm8n6wV+SahHGbotA9ixJHgYdkOtWCVv+ZcP fJlgsq9+Dy73vyeS2b1LsaL3bXAlfYMeclyEPodgpTwOHPIBngpNyhtUhkZTor2sypL7 qvvMax8mNIZ40uWItc8m5mPb6HIQOczvKXEyBOwH48LClcx7nxs22qnkkxDSIkrr0AGr yKIhBP9w+7onZMHdAMmxjcujXw+/htauvWPoZb5o6gVsO7gUVtgiL8/7kmlAXM3eDE+I H6yxRKYdDfM7U2iYZ4WZ5WZX+s0ae6eoxvKvfwwnLjszhL2nL6UWeFgNU06Wi0fW7EQL x+BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Fkv6n+WV; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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. [23.128.96.19]) by mx.google.com with ESMTPS id lw4-20020a17090b180400b001cba43173ebsi5563132pjb.94.2022.04.27.03.20.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 03:20:56 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Fkv6n+WV; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 654B436251E; Wed, 27 Apr 2022 02:40:20 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350372AbiDZNB2 (ORCPT + 99 others); Tue, 26 Apr 2022 09:01:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350325AbiDZNBP (ORCPT ); Tue, 26 Apr 2022 09:01:15 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E8B5177D47; Tue, 26 Apr 2022 05:58:06 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: nicolas) with ESMTPSA id 335911F43982 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1650977885; bh=fNRZoSK/0DILeV16LVHwTQzonwtkLN2LiUy6JGrnOQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fkv6n+WV8+Zvr4P0dEKD5P40Rzhb7kMRK/4rDVPQKGKHqJsnpzsyEMzxwq8KktH1z wwQHVcadl8QyVax+00Cu2Rl+wRQfeNxeXCY8uZ8zZwNp+PmhuXG9TGmFklOLFRPe0L S1bhRAvjg8j1ffbRifxo9SwaQBCE1XFBT7ShUuppUVgU1SJRtsnn+hr1SNEu11jHPr uRcPq0ko3CuNfFIDnsmCVkt47n/126jrtqZEOgQ6vxQjJXjeIUOhESata2ickcrjKa TM+Fka8HxR3fe4l85obJmuvMCSIVAZloo1pncuTTiyhwuJwWK3s9c03sbYsSsvBRaH +UTgKxu7t5CHg== From: Nicolas Dufresne To: Mauro Carvalho Chehab Cc: nicolas@ndufresne.ca, linux-media@vger.kernel.org, Sebastian Fricke , Ezequiel Garcia , linux-kernel@vger.kernel.org Subject: [PATCH v4 04/24] media: h264: Avoid wrapping long_term_frame_idx Date: Tue, 26 Apr 2022 08:57:30 -0400 Message-Id: <20220426125751.108293-5-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 For long term references, frame_num is set to long_term_frame_idx which does not require wrapping. This is fixed by observation, no directly related issue have been found yet. Signed-off-by: Nicolas Dufresne Reviewed-by: Sebastian Fricke Reviewed-by: Ezequiel Garcia --- drivers/media/v4l2-core/v4l2-h264.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/v4l2-h264.c b/drivers/media/v4l2-core/v4l2-h264.c index 5633a242520a..ac47519a9fbe 100644 --- a/drivers/media/v4l2-core/v4l2-h264.c +++ b/drivers/media/v4l2-core/v4l2-h264.c @@ -57,8 +57,10 @@ v4l2_h264_init_reflist_builder(struct v4l2_h264_reflist_builder *b, * '8.2.4.1 Decoding process for picture numbers' of the spec. * TODO: This logic will have to be adjusted when we start * supporting interlaced content. + * For long term references, frame_num is set to + * long_term_frame_idx which requires no wrapping. */ - if (dpb[i].frame_num > cur_frame_num) + if (!b->refs[i].longterm && dpb[i].frame_num > cur_frame_num) b->refs[i].frame_num = (int)dpb[i].frame_num - max_frame_num; else -- 2.34.1