From patchwork Thu Jun 20 19:35:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50022 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp103367vqz; Thu, 20 Jun 2024 12:35:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXtn9iVFN6EdHyM2MZ8wPGNWeyS8wRA23UAYCAD6q5DkvSItBgrQ81C93l6pZ/a4HNiLY5TQfLgadKeMO+wV/E8Ni4A3yBsYDrxxg== X-Google-Smtp-Source: AGHT+IFmrzOdtXIPQqEAMYBxL8n/vLmLwklNsh3WZKmM2oqFftj6m286ncl6uUs/c0jTMBqsMJ6C X-Received: by 2002:a05:6512:281:b0:52c:993d:b462 with SMTP id 2adb3069b0e04-52ccaa369c2mr4390247e87.29.1718912119423; Thu, 20 Jun 2024 12:35:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718912119; cv=none; d=google.com; s=arc-20160816; b=jttQazrgqxVcm1OyLK7MVS/4ECT4TMnZJY+fmIWq219FlxMwpiGQIlez8AStXyRoWj mtuN9XJEeoCV3fb5BYo7gOM1CldfvdIsjCcZ4v52KkwkOSvLIxE0+x1Lk2FiBuahaNUg nR/bD2X5DG7U8H5ZGl4A8ugKegF61yTLE0j0ILNRKJ3c8OZ3NOoFWNM/2cTUYLb1FxN7 DVRGUHt3pn+ybtjiHqSLECFKJswgre1ieSKMn80g+7F5Kubb4eKrCxVF0s7x1/ib1IVj gen8qppyvtyP3MSy5SjgufvFY9Cx+popgMo5dJjPqKQfoAf5UlQvxNBE/R6daVP1ZqMd o5vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=E6vd94IfAEPoCDIeVPbNASqhuNbg9Pby0MdJqSCa3uk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=mGYlZrFnesXw85szK1KThGR54X9B/m9onkn8/MdP71EqJgnRYCNUgxurc1XThjD4X+ wZG3dZgecY4kXisCmTFOnO7RriBjaJgxlZjarLJz8JhWA7na65Pi98o/42Xyd7HAwqlv NP50eIY8YMnm1psuwzlc8qYDpZ+VmVqVg78KfPFQAOgCRRCEKH/cmkvByTZXFya6IXBu dbYrJ/vlbRp6eIkXvit1TecuEkUazd9iEeEA6NzOMWvfqJ+DMjpogLycaznwEm3EWI83 eGZqiAVD2c7IIQ4274sbvDR/GqyglWoOOA8vj6sHQxV5A+Z48ZrMCqVgJ/e756Y+i2XW N3yg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="Yke4m/0J"; 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 a640c23a62f3a-a6fcf54d73dsi3215666b.278.2024.06.20.12.35.17; Thu, 20 Jun 2024 12:35:19 -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=@niedermayer.cc header.s=gm1 header.b="Yke4m/0J"; 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 859CB68D81A; Thu, 20 Jun 2024 22:35:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3BC6F68D80F for ; Thu, 20 Jun 2024 22:35:06 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 4DFB31BF205 for ; Thu, 20 Jun 2024 19:35:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718912105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=xdANjW3G7SOdx2TrfRV81hS0Z0k4KJcFdvBMBxS5pRU=; b=Yke4m/0J0vySGDCmyqU27+8N7WJV/Sq1F5UKal8II914dNTdFzgFLfkGsb3mVSSw+QS93p Q7fcZypRY8isA4JMuZtz2LmXNbyUPPF9+gNxJCsjyfaghLJl6jHHvLnMQKCqTQRQo0ztJD W74n3aFxtLxqn9L0L8/iidGTohzArZRRaILpXs/uGb5r72FztppfdkJ+JDu+RqE06wdyNY sQJWrdPNrJR2VpGGSvDKiRuwNgwvTZ4fYPztCyOJ/+KnMngAD3xtBhxSP/iGwyOcwozNCR 7t/NzhdHWbN3clnwtFXdppjpmhZ6m2PKNOU48hX728gFZIAE5H6DCWsAcuBWNw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 20 Jun 2024 21:35:01 +0200 Message-ID: <20240620193504.2310780-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/j2kenc: Merge dwt_norm into lambda 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rMH4hfP1QVoe This moves computations out of a loop Fixes: signed integer overflow: 31665934879948800 * 9998 cannot be represented in type 'long' Fixes: 69024/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5949662967169024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/j2kenc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 8cf82f7216c..91e66d81048 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1349,7 +1349,7 @@ static void makelayers(Jpeg2000EncoderContext *s, Jpeg2000Tile *tile) } } -static int getcut(Jpeg2000Cblk *cblk, uint64_t lambda, int dwt_norm) +static int getcut(Jpeg2000Cblk *cblk, uint64_t lambda) { int passno, res = 0; for (passno = 0; passno < cblk->npasses; passno++){ @@ -1361,7 +1361,7 @@ static int getcut(Jpeg2000Cblk *cblk, uint64_t lambda, int dwt_norm) dd = cblk->passes[passno].disto - (res ? cblk->passes[res-1].disto : 0); - if (((dd * dwt_norm) >> WMSEDEC_SHIFT) * dwt_norm >= dr * lambda) + if (dd >= dr * lambda) res = passno+1; } return res; @@ -1384,11 +1384,12 @@ static void truncpasses(Jpeg2000EncoderContext *s, Jpeg2000Tile *tile) Jpeg2000Band *band = reslevel->band + bandno; Jpeg2000Prec *prec = band->prec + precno; + int64_t dwt_norm = dwt_norms[codsty->transform == FF_DWT53][bandpos][lev] * (int64_t)band->i_stepsize >> 15; + int64_t lambda_prime = av_rescale(s->lambda, 1 << WMSEDEC_SHIFT, dwt_norm * dwt_norm); for (cblkno = 0; cblkno < prec->nb_codeblocks_height * prec->nb_codeblocks_width; cblkno++){ Jpeg2000Cblk *cblk = prec->cblk + cblkno; - cblk->ninclpasses = getcut(cblk, s->lambda, - (int64_t)dwt_norms[codsty->transform == FF_DWT53][bandpos][lev] * (int64_t)band->i_stepsize >> 15); + cblk->ninclpasses = getcut(cblk, lambda_prime); cblk->layers[0].data_start = cblk->data; cblk->layers[0].cum_passes = cblk->ninclpasses; cblk->layers[0].npasses = cblk->ninclpasses;