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; From patchwork Thu Jun 20 19:35:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50023 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp103444vqz; Thu, 20 Jun 2024 12:35:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU93/WGD7Uk7gQsnc9K6VhQWQraAw0eujXv+3JAYaH98clxj4e45rlm2HOpN26Ku0cMYeu5zBuwcKWOBiTlGdyn1wyH16IQ8Y0Sew== X-Google-Smtp-Source: AGHT+IHC5JWTuzSXqeyU2SWrKrNLW2l3kL/c+NPfGPdYr5GelXuXRt66UBpvgkBozRVYvtzsC7+c X-Received: by 2002:a05:6000:184a:b0:364:8215:7142 with SMTP id ffacd0b85a97d-36482157208mr2529181f8f.1.1718912131348; Thu, 20 Jun 2024 12:35:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718912131; cv=none; d=google.com; s=arc-20160816; b=zLJ+rP4SWzduszS/ufwrtJPrfZiMHbTqy6c+Rlr7/15HHtrTZKdx9+MZNAje6WJqUJ sP4qYC2pyGugTiTWt8DIDxLFmOoSY9WIi9k4C1nQ1Ygvrgc9ST2+NlWj+yhNtTPiByNj B1f0YpK/E3XxszL+P9Hy+Z2z4sRJuaosUqL6lyZhOW/SdfwodnQ/R6dez4+A6fWsCG2a ZkYTzwgqQDwtdwVa9Wvw6iWbgFsAJVUkl8eomJLcrsxdHYK+uNFar8dXuS/8P9EtnYVo 3G2VARxv9TKNh/WMktAbYfPnT9oalC2ibBR/M8+qatf3tvB/Jj0tEpfRs3FqYcyegjhO 8CYw== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=uNeSPTCxI9ykqNxQj22Ras9RlE+q+qnJwjpiJVZl0C4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=tClAW4SerWQxbngBU6loPjfjlR6TNCCLFk4RMmds/KdCMT+BhQ0GgY863eQucu5OUy R/AaFhtLCOJ695MeWKO19UtFwsoV9cWdOF2qpo7dNAPW3gkW3j4XmaKfh2mES9DMcJ8f n4glfSG1lsHd93Bn4EDVGG4tC9QMwo1RWNByNymFc2AhAFxRiBmm00jCvguihYQ+8BRo kGwwPsSpspB4d++1Wb1NtFNyDOBQYRNcbW55rnZOgtikMGxhdDk4wJwdRHoiIvvqlqvN mLXd+6tbjKF4XCbgRgY7BxlTEddv3xPTStqqMemtqWUx3JhPWeETq2eJQbS1are/q/36 u+9Q==; 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=OQZgLyzW; 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-a6fcf460bdesi3608066b.66.2024.06.20.12.35.29; Thu, 20 Jun 2024 12:35:31 -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=OQZgLyzW; 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 A2C0A68D88B; Thu, 20 Jun 2024 22:35:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 42E3068D80A for ; Thu, 20 Jun 2024 22:35:07 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 7DE5D40003 for ; Thu, 20 Jun 2024 19:35:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718912106; 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: in-reply-to:in-reply-to:references:references; bh=sHk+8e/G5QxQ+8PHPhIzbrVuIzbAqYrvv7JtgYR2kLU=; b=OQZgLyzWq+rRsvOBB+ab1ggAqYHJy9ZBJQihkLsc44oATBdCqB92icIqjP6K0SUagBn9/f mO3XG9PgH3rS7enxLXrj9RLILrsejRkk1Z6ePG9+KnFleVCsI/SwB1TS7ZXE/0dLMask+F F5Hac3XiRlgOndUfqcduX/Dq8/zZom1rEBDcas5rulzcMygn8Y4zxHHidwRaEdi3vX77d6 WZUDMnEvEu3lHp9mJuUzJnVp6Qgq0dZEvUCChIrsaShhGS7zuZloXjZeuqH3IeoZ9+vT4X dyGQpLUCebatp/Nbc6vWT0ABH/wdCDVILrlYSyRCi8S+B96JCaiTGkm51TdYGA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 20 Jun 2024 21:35:02 +0200 Message-ID: <20240620193504.2310780-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240620193504.2310780-1-michael@niedermayer.cc> References: <20240620193504.2310780-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/utvideoenc: Use unsigned shift to build flags 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: KPDrwmRzAcAa Fixes: left shift of 255 by 24 places cannot be represented in type 'int' Fixes: 69083/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_UTVIDEO_fuzzer-5608202363273216 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/utvideoenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 59e198458b0..b35b34d5a1b 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -239,7 +239,7 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx) * - Compression mode (none/huff) * And write the flags. */ - c->flags = (c->slices - 1) << 24; + c->flags = (c->slices - 1U) << 24; c->flags |= 0 << 11; // bit field to signal interlaced encoding mode c->flags |= c->compression; From patchwork Thu Jun 20 19:35:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50024 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp103507vqz; Thu, 20 Jun 2024 12:35:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVTtcAaqael+8KK7ni6Kit57xHGNrZkAYUmMGjq6nMHC9ESDlQZ0L+jY1dZTk7IRwmo7fCLZjxfaFFIrOWX8MOexKZReisrsWNk+A== X-Google-Smtp-Source: AGHT+IFwSZho++H77ow5Pdzx444+m8fGszmoJUr8g76ye7uTGurV1N1yjH2T0NZHyRyIozMqolfo X-Received: by 2002:a05:6402:791:b0:57d:455:d395 with SMTP id 4fb4d7f45d1cf-57d0455d5d4mr4831046a12.7.1718912139886; Thu, 20 Jun 2024 12:35:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718912139; cv=none; d=google.com; s=arc-20160816; b=OQW6Sf7fKW4owWq5M+64z5IU18VO7ZWXm79MDq9Q/d4wtlzzMTY5ttvSRAbwQAQIMf 4QG5bHpdZtM81aazOl+SvIUu8Vlq/8npP0NjJVyqzSxHO+V1x35dGF0XZvbOqGj3qP4n YBg4FUyspcTwP1V7KsfiilJEox9HBewqVevWEiMVBalBL+nyZKhWf1ASm6Z4zTisQ9/7 GTscyv1EvszSosvPLtCXGBvR1msITWyYt6g+k9FPBsIyV+iNWumMDrAF1tvxbb/Y3mSY zuaDbX3d8NzSA/KkT2mOHcUoGWrL2hf/DDWWx8Ne70IZ+T69i0Iml4ObN2W02Ytpzb5W /Ybw== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=ILsv7nt09VtHXxZN4U62Y/usVc+nSTrtmR36Bffih+E=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=S/8O7+CRj71GfmYJNrb5Mn3J1OsgLPaOOyb4u6ftky9FSSOEIlWpRXE+ietLjvQSRn K/m/I4nImJpMT8uZ3vdymnPPL5xLdCMZuAo0SPg+vj7BTQUyUVK3/CkqdV4Vtwje0293 5dR/dNCKF6NVylRH5PvuldODP2FgsxxYow/1rtgNQIF1DWcYRTbjlXCMMFiBN60QFJBS yxuKh9NoACtveK8C/N8VbK+OFPiye4qxfr+vYHe4EmNXFtmN6L61JacsU6qM1Rh6pRL7 Qzi+beEOTBkXjgFFS8w1b2b9KOcr5PG06MbAGJmZQVx1eSU8my9Ve1HmwRPKessaRq84 1lMw==; 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=oaNOpjjS; 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 4fb4d7f45d1cf-57cb745fb62si7683828a12.532.2024.06.20.12.35.39; Thu, 20 Jun 2024 12:35:39 -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=oaNOpjjS; 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 E7F6868D89C; Thu, 20 Jun 2024 22:35:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5900368D80F for ; Thu, 20 Jun 2024 22:35:08 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 8381360002 for ; Thu, 20 Jun 2024 19:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718912107; 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: in-reply-to:in-reply-to:references:references; bh=YeeW4mAP1jFFnllfSEW1E62N94JmY3J3+ttRebxdKH0=; b=oaNOpjjSz1c4Ktwx9peu0T3Lh3eXHhjuIteS81tOnkCEUQ7Ae91/RCvNdO01AleY1zX9Z0 uQmymUzw2Qnpo1QFBpEWzZqz5Et7AoEzgDyUQHAnnU+BWBTxC8UGrduYo0hKdiI2NfCnNP NdnfY0yVDaJv88G8O/BT9SirHyoFg6jtntGMPu2YxKR4zgzkswZRKYXkiucp5RfVFOG3MS hHXbW+hifw7waahWdYBLLKbtgm68kgh30rlcbrDPlMXMvxz8vzJYE191/duVj9Z321D3FE i4dU9Rr/6NnvsKWp8/VIWNvuwrPzZOYXE4a/JmJy1PAgigy/gy+Da15cZ0RiQA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 20 Jun 2024 21:35:03 +0200 Message-ID: <20240620193504.2310780-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240620193504.2310780-1-michael@niedermayer.cc> References: <20240620193504.2310780-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/mpeg12enc: Use av_rescale() in vbv_buffer_size computation 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: MyaZF9YTYnvb Fixes: signed integer overflow: 20 * 2314885530818453759 cannot be represented in type 'long' Fixes: 69098/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG2VIDEO_fuzzer-6107989688778752 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mpeg12enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 140fda4bc23..f22ca8a19f7 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -332,7 +332,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) else /* VBV calculation: Scaled so that a VCD has the proper * VBV size of 40 kilobytes */ - vbv_buffer_size = ((20 * s->bit_rate) / (1151929 / 2)) * 8 * 1024; + vbv_buffer_size = av_rescale_rnd(s->bit_rate, 20, 1151929 / 2, AV_ROUND_ZERO) * 8 * 1024; vbv_buffer_size = (vbv_buffer_size + 16383) / 16384; put_sbits(&s->pb, 18, v); From patchwork Thu Jun 20 19:35:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50025 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp103579vqz; Thu, 20 Jun 2024 12:35:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWeWD1eA8V2bxe+PQ4IeL9RsZFTKhMpfJK3RiLksV7hi6uu+eb1inXmaTPFTLMsDyP5GqnYLn+Vt7EaA14rzHGF+5ZzBpcQB8GHfQ== X-Google-Smtp-Source: AGHT+IFpk/i9Rte3lFIzLaQ7O5UmSm7s/E+HJRC5PNYBfUGfSDCQjK7ZFwOOMhjiM8q+MjgHg3zP X-Received: by 2002:a05:651c:1057:b0:2eb:fcd0:5192 with SMTP id 38308e7fff4ca-2ec3cea1063mr43626251fa.23.1718912149794; Thu, 20 Jun 2024 12:35:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718912149; cv=none; d=google.com; s=arc-20160816; b=gPUt7U68C/2lgBnTwcpUkSyKTqS3m2w/xhChZaZRXE7f0vtZ9/+fYPUxJZ01p10Fgr i4PiIf5t4Fg/azLmDnfjiAGCdJCR8AjTgeqOJ3+3I3p6Rui6Ja+hjsaIejFsfOfhwa7A d7OlmJrMBci5Pap99OdnPo7ZlBQy4ngNHWxgw+4cgY8ejbVtmNwReVoR1m/VcYF7m1U3 UL05ESOAKROzt7+WCCkA4lxIciUOITQOfTGCyc32SGo5oTEIR2b89eR5MCgFs+xl5gKe lnDPDCNJeorCIgiNzDyN0e3e+/JCpmRl/N0VDXahvIyvRBSLlT9T9zQw1JKOb5dFCz50 gIiw== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=EGvFL8xgqfAD3EMvvpInhXk6H4v4oowuGLl5MfLGndA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=CzdcCNsHK/Wr2gAN8zZj2T0ra44fx/y3QrfMa56fJawdusqGyFc54tJHWdYcHsF5QO JB+3wAtz5dIgQilIycCAtyYtI8BcEKzrziPGO1WABxFhq9CCc3SlVTvqD7Q6y+6/VB5v BcMe7Es8S5DExJRcziyKCeYtJv9w6jYFW/cbac+iOrOUPmxQyc8xmVS13R31IogLG3OK YyGQ6VL4H0dZp8gIfB8XP0mgM+cWt8bhuFp3tQwgaLpvHSRsO31HuufIVMOqQswBRd8Z TLBNMO1QXunU8c5/j2B3+KfsuN7GVcKqXc2wYWB87CBgW4YHzQz94ANcip9R/gDL5qgm fQAg==; 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=eDYNVhR7; 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 4fb4d7f45d1cf-57d0781ed69si2017498a12.343.2024.06.20.12.35.48; Thu, 20 Jun 2024 12:35:49 -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=eDYNVhR7; 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 925D468D8A6; Thu, 20 Jun 2024 22:35:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5DDBD68D88B for ; Thu, 20 Jun 2024 22:35:09 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 98CB2240002 for ; Thu, 20 Jun 2024 19:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718912108; 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: in-reply-to:in-reply-to:references:references; bh=tRo22XWi7HkvzLPqkQdUMtcuenh6914M8KbqR6VkX+s=; b=eDYNVhR7aOVVg0IMIvmpRers2VdMoPwb0/098/4o4WNGP5kpTm9cI9mbRKcQc6AkY/LvgQ JazvLa7Qh4H5m7cf0ca3VSwZcBtrkpUUXjkhAStbrs/dbwxdnd+pH+d0E3zRQVsjk2I1WH h1xBv8YUBFo4JTPlAI2Hvw+qz/R7P1U5aGz7HX5PmQFJiSOzNRPeiMeWqWU8GW2Atf8gIi mWIyEqhhznYkvihBZ53t7TRe//ZqJh7NVUfDOm1xIqFOKvl05PS0qA95ZfXUf7Lby+ys/1 OPC5NoyZOlp4Hd2OAp4eb3o7cCow1J0m9UGqlCjNMs4EShll1Slpl9OY176PLA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 20 Jun 2024 21:35:04 +0200 Message-ID: <20240620193504.2310780-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240620193504.2310780-1-michael@niedermayer.cc> References: <20240620193504.2310780-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/mpegvideo_enc: Do not duplicate pictures on shifting 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: /AJDMLKpOaFr Fixes: out of array access Fixes: 69098/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG2VIDEO_fuzzer-6107989688778752 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mpegvideo_enc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index eda23056301..dc9a0009f53 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1266,6 +1266,8 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) /* shift buffer entries */ for (int i = flush_offset; i <= MAX_B_FRAMES; i++) s->input_picture[i - flush_offset] = s->input_picture[i]; + for (int i = MAX_B_FRAMES + 1 - flush_offset; i <= MAX_B_FRAMES; i++) + s->input_picture[i] = NULL; s->input_picture[encoding_delay] = pic;