From patchwork Tue Apr 9 07:55:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Plowman X-Patchwork-Id: 47967 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9c8d:b0:1a7:a0dc:8de5 with SMTP id mj13csp198636pzb; Tue, 9 Apr 2024 00:56:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV7LL6cgk9iw+WRrk+pbzEGKhK1atlbhsbpQ8FOBHFcea+bQtVz4AWr99F46ws/PYQsAUke0QoCIMnOw8CSgjBYy/9obMypwx7NkA== X-Google-Smtp-Source: AGHT+IG2s6xRNkJhGskQe0rjRWb2vMbBpnhCEhLWiHp9h8UOV6OZiOv/5TcpvMtaz0aVHAYpqrhv X-Received: by 2002:a17:907:728e:b0:a51:d239:be0c with SMTP id dt14-20020a170907728e00b00a51d239be0cmr4693920ejc.32.1712649362212; Tue, 09 Apr 2024 00:56:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712649362; cv=none; d=google.com; s=arc-20160816; b=OnFWf8HiXAhrgub5GlfhCbma9ufHLao1YjhuUunxFhHr4wXy6+OWDzPI5zPO+Jtx7H Xjw3rSAhXpzODhvbqF/Be9zj1aCl2fUtAWu75eyQfG4G0frahZj0SKEC4NQ/sWe1S00c WMznYwJZUGRp7iteCZYnKqqTWkzecon8F/9/1f/ksEzKprUJ52f8kTQ7BM8BUQDP6Kcu 8OsVO6PmE7Lx/HusqVW+MyjE2jax/uHOIHTGJelzDiHbpwM9k282EhzyngzjadB3Lmck f3ISk052ypuuvJIBkCpw76uIW6Egus/qDWBbU5guNoX4fEwlfirORmW6iVgHvtwcdXoA iN0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:message-id:date:from :dkim-signature:delivered-to; bh=pyOz/yo/Zmwtr9pBuVMMBSdT4f9HmNLy0s2fROB88BU=; fh=GABYHefZpsCOOVRn8a1IgmYuOvaCu1oFlwEOjvaxWTE=; b=XJWZL/FtPyHCzcc9wCFszdVUmwV89lnQmICFfbaiSvQsAvkY82jGpn3zRSMZi55lVC SXDxLg3z2N0lJldBNUXvQwb7GJHWrIWpIuk9/Kaubo7d1pKsu3ntUGUUQJgZ5fpTPzFk plgY+4kgFhZXhk6w4MZFwVHstD3pS0bdF487ZqRegylhoDOpDnID+DvPK4PBpygzi16E Ubne5fcIpEacP6uTj7SHl62iBDdIvuKTY8PsRtTo8+YvO4DAsaOB/O7XDIzhDwhKEN3T /Y4kcSqyOwCnC6rerVhxjtuiTzqx734fTVgrciBgo3I/mel+qOvXzlvyAD67Qy3714iJ fJxA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@frankplowman.com header.s=s1 header.b=sS+70+Lo; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id um10-20020a170906cf8a00b00a51a9b05607si3883551ejb.411.2024.04.09.00.56.01; Tue, 09 Apr 2024 00:56:02 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@frankplowman.com header.s=s1 header.b=sS+70+Lo; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E591F68CFEC; Tue, 9 Apr 2024 10:55:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from wrqvffvh.outbound-mail.sendgrid.net (wrqvffvh.outbound-mail.sendgrid.net [149.72.255.128]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EED0768C8CC for ; Tue, 9 Apr 2024 10:55:53 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=frankplowman.com; h=from:subject:mime-version:to:cc:content-transfer-encoding: content-type:cc:content-type:from:subject:to; s=s1; bh=NbWw97kBqlboqP2P8gIHW6p5oHp8ytAPBpDNgdH3dNk=; b=sS+70+LovxROiuJeUDiXgMdf4qKSinjqSDbGN5Xjy9Tj7TaF41ZqMdKOR7XVAFMrdlET agc+Kh+o8ERRop5ZheDK3tLhU1rCmE38EM1sZ0mxoFKmTR14gfj4IbijfNIPuTkG2VALb+ hFTGGkYyBMdD9pKbucUJY2fHytLSlvr+/Cg2xYrJmvsvrFRtRswXgH6tu+82BHdYnzvIKF d3b6LAlibPTKjhnAa2xflzJovNPthDvxLg5O5inpqfAtdtaGpdajh/WUoplCGNTpgw5i+0 z0iQ0sjbjUE24g6RImC4tQtJwAH2tu7ErcktpxqkBg0vJXujBu43thCBusoQBpTw== Received: by recvd-7555548f4d-zxlph with SMTP id recvd-7555548f4d-zxlph-1-6614F488-2 2024-04-09 07:55:52.493966617 +0000 UTC m=+1853740.772154214 Received: from localhost.localdomain (unknown) by geopod-ismtpd-6 (SG) with ESMTP id Tb39VoK7R_6Ryb3Vs1WJbw Tue, 09 Apr 2024 07:55:52.262 +0000 (UTC) From: Frank Plowman Date: Tue, 09 Apr 2024 07:55:52 +0000 (UTC) Message-ID: <20240409075544.7985-1-post@frankplowman.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-SG-EID: u001.Z0KJCHpts8tvDq7PHgz5cpqJ+vJcSmdTtST/g91WT3qAbNxUpEMGIDQq91mXy3Yjvepp8fYsFUJzGsyhT1EwBX5VawAWcfhAGlmbPDuke+BXk5WjGkXv/D3h/s9rA4LIqINVgixK6YLHJw9aFDcg3udeAb4yfh6YAvQsIdwV35rwKEREHr0DKIEebOdPqu01IsDso30e0X22C28av3k7OGj7U/4ePTVDca7cYUlFoGLkWqj1aS+dLW75EHRwfbL/ To: ffmpeg-devel@ffmpeg.org X-Entity-ID: u001.qzljkbu34TNIX4NwfTiKWA== Subject: [FFmpeg-devel] [PATCH] lavc/vvc: Avoid overflow in coeff scale intermediate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Frank Plowman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2YbomN0f5VYO Make intermediate result 64-bits to avoid an overflow before the right shift. Signed-off-by: Frank Plowman --- libavcodec/vvc/intra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vvc/intra.c b/libavcodec/vvc/intra.c index e515fb9710..5ac7d02c80 100644 --- a/libavcodec/vvc/intra.c +++ b/libavcodec/vvc/intra.c @@ -416,7 +416,7 @@ static const uint8_t* derive_scale_m(const VVCLocalContext *lc, const TransformB static av_always_inline int scale_coeff(const TransformBlock *tb, int coeff, const int scale, const int scale_m, const int log2_transform_range) { - coeff = (coeff * scale * scale_m + tb->bd_offset) >> tb->bd_shift; + coeff = ((int64_t) coeff * scale * scale_m + tb->bd_offset) >> tb->bd_shift; coeff = av_clip_intp2(coeff, log2_transform_range); return coeff; }