From patchwork Sun Jun 30 23:12:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50225 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1459883vqv; Sun, 30 Jun 2024 16:13:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVF35iLzX91t/B6/4Rysg7cWRvGBxHYf0QacG0hUBrEQaOCfx33owNb43Y/b6WViA3bQOA1BfDiPyOXHnFNiesfK/w5TGYICVlxug== X-Google-Smtp-Source: AGHT+IG28UJOwSrgrlBv1L8kxFqSbsthMkZ7+KrRUK9dwFHLRWl7vVcI1QCZTrlSflpbAYHd/Igr X-Received: by 2002:a2e:b534:0:b0:2eb:fcd0:5192 with SMTP id 38308e7fff4ca-2ee5e3bbd3fmr22996761fa.23.1719789200762; Sun, 30 Jun 2024 16:13:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789200; cv=none; d=google.com; s=arc-20160816; b=khn+2cUoakcYAr2etKU64Ppn3fixDHkahTEcnJ9iZ2Qja1pkHe12XeuicyGf/ChnB9 Y3OT9KBne1qFV+jULzTFuVnk/csugd6AF38zreB+l2gr8FIUHnHF5znQZvdyXZkcfQLu u/agEx6rkyggYGnIX+dkUfjqm1LP+eYlMAKm6iuH+3JjV0pSvm8VDZlatfuElouJoAYs w28/aNGgUKaN8IlJcemKt0VBbgpCrji/0BA/B9jHush95Pe+K3FORpzLcrHbofE/YzVI LwdR20Ap3oDoeevdmuaFjnDC4KF4BRfy56Uv6kvWAKXI0SEecHesC6zdqtrbm5PCHw6Z oEXg== 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=IRKtvnyuxkFTZ1Zlm/cHRtScyddza9UWIiMgdSPe/XE=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=yLJ4vXtdMG4phxFqBD94dvcpqZP/iotfZ6+259yr3LZ8AiLTlqRPL9BX48rpZUhqsz rymTlBk8TAIhLoRaiHzODbp361ecVsgG5JFl0JFQlS8YRfx47c+bD+bw8rgT5K9DUObI wg6BWMBLMZdlxlogvZsp2db206m4+dNpk+IPeQ0bNJGKTVtqtoajiJ6t3dnJ90n8/pU7 Ncw3UI6SgmOIDXXscXxYtaHjWVReNmRfaj8FBWMDFBAE76fTwMhZyHOCcPxtS4LooFaq mt+8K6Ts08DOP0DnRZRF9/gWrGRWbt8AW4Wh9r+mUWd+/rCqxuCN9mWKaHGa1aqItUAW ma4w==; 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=mDzVJXeK; 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 38308e7fff4ca-2ee514bffbbsi16498581fa.120.2024.06.30.16.13.20; Sun, 30 Jun 2024 16:13:20 -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=mDzVJXeK; 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 2985C68D653; Mon, 1 Jul 2024 02:13:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E13668C73D for ; Mon, 1 Jul 2024 02:13:08 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id B7EA41C0003 for ; Sun, 30 Jun 2024 23:13:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A693sFTv9jznrX2CHTnUzgIKtT4lW9FAbKhQC4ipYVE=; b=mDzVJXeKsp4mE/vN3pxcwxzS56JGu6dDYeyVWfNJ8qFpXnqpBTtHvz2oxNgElQffRhv6F5 4VRos1DUwp5bCrDZ3KaHP2udTfiq3XAR6/TFoz3wb3to8QD4klDQ9RVnc/bbmUOaDY4gcN TQj/WoUwOrlBM6iJzyyvpCN8VALv43ca0t/4+f8XyFgDNib9jATatHxqTX66ciD3IeXOno JfVOFdtX8Xv2qvPlC7DmcdsgSeKpNLjtPHBTQqf1idgwjlxE5Z9WfnZIQBY6BSdH4Q24oF wTqM+zyWgzZknOHdaRs9rnCjeT7E4L96ih9ZXs/RhxxsLkqXQ5DhCBzPSFwjMQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:40 +0200 Message-ID: <20240630231306.3779027-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 01/11] MAINTAINERS: Add Timo Rothenpieler to server admins 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: UFXZiHfAOMCS Signed-off-by: Michael Niedermayer --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a82fa58c69f..57f437cd40e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -34,8 +34,8 @@ Miscellaneous Areas =================== documentation Stefano Sabatini, Mike Melanson, Timothy Gu, Gyan Doshi -project server day to day operations Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov -project server emergencies Árpád Gereöffy, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov +project server day to day operations Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler +project server emergencies Árpád Gereöffy, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler presets Robert Swain metadata subsystem Aurelien Jacobs release management Michael Niedermayer From patchwork Sun Jun 30 23:12:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50226 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1459928vqv; Sun, 30 Jun 2024 16:13:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXbHu8y0HKgOaZNVf1jVg6Z0mRXDn3Sben7uPKoHsLK1topGICTrqHsCcD4iQoh4aNhyb08NqB3m281Yzt74J7v+/embvdyIMiscg== X-Google-Smtp-Source: AGHT+IFQiB2D+bzBBLcmGberA3PAmjW+KUa+Nt4prikv3ANUJQzg9ucF1k/ibgAb4yQZ7m9+2zlh X-Received: by 2002:a05:6512:31c8:b0:52c:e0bc:ca3a with SMTP id 2adb3069b0e04-52e8273cc4dmr2813393e87.64.1719789211504; Sun, 30 Jun 2024 16:13:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789211; cv=none; d=google.com; s=arc-20160816; b=lKr/5jRIdK2XBjx1j59yy3edrnyCLpTCqizZ57UrrSu1n/LMidsmwyLT/IiLFzeWse dTstHR+weQJAEHQcGAyEWSNFfUyuceO6JAOVvT62dLYa029YEz2SvBBdhBqCZg0Fb4JC /R2u9pGaOrFTIoWGeupb1DP0+hHUHO+tTDXX1AhBAwZcicVCXcyz+Bgt5VPHFLxurf5a GeZBU2vRaV3KX7RvshWh6E7rmLVUzzifNsIdNL94nY1qAon5VjdoTdTGvbybmAqGYCM7 Ydd8UuKtqnrC5lqonbxUm2DOzzBf4bs1Nci+A1aDtvuk/cZlcA7BmXhxeThlUfh9tpVn du+A== 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=foojpt0fGi2sBaoUI4g9OJVw/CnfnqHFbU1eVqh4wFA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=SRizaCuYmvmuoOkv90fxqfSdVfo5X5EIIN0kK5Y1L6EGZAr1BVap0SDaL80QB332Ma E8vU5OcJL77zm0P9W3FL91XYBgDW+gieaVW1PTGH23gyqKwqY4FuzMRvGlvU2XiEfDMO sH248BeoRqZy8eE1kZG4+KnuVpuhUoCnTXGCYZNKcbpewoIDQ4Q+czSRwitGF1ZfBOUW 4BK4QCxmGHwQYcVrFTHvyiOXSwgfMf8sPscazWEfJ5OIKfX1/5joFDDh+ZqnPwsurVg2 BEGPeTsPlEKxW61Icbi6k4gAwvrI4dvNiQpvb9KIgz7Wr1FLIyAbwwGpw+04Nsv+fhJl PleQ==; 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="oR/jNLCP"; 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 2adb3069b0e04-52e7ab31f64si1870487e87.545.2024.06.30.16.13.31; Sun, 30 Jun 2024 16:13: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="oR/jNLCP"; 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 74F2768D673; Mon, 1 Jul 2024 02:13:19 +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 79F9468D31F for ; Mon, 1 Jul 2024 02:13:09 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id BF0C540004 for ; Sun, 30 Jun 2024 23:13:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789188; 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=v2LGrp4Wq//p+qhVuN0IqOGOZYd61/iTLAncVt7lgaE=; b=oR/jNLCPmjwnv/TQ4pcNkAPQTIt09SVlcYEJ5XZnJzc0p47rbf8OnUSoXCtsjfnuwbJhI1 jt+gtI+8Pm3lnaupJ9gAWRVsvZPDUSlbyOjK/T1FVRxuDwpxwrFvZMx7vHaBSGnxkC3GUo /5pIuE0T8D6GOPYRr6NXePYU0cooEEFCx9EXWXtGBEJhtukUUsZTrKr/k5P9eWpFr494Yj pQZuDj7eBlRzhujAB3guyTuYG/HlPq6PXL3JwTeB1df+DZKSpG3v1NmLUJmNgoz+n7Ij41 9bRd24RcPXi0zlzX3Z/sJuZ5NZAtClvBwJRnAH2TC91BqQeXcn0j7JLWx9xmLg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:41 +0200 Message-ID: <20240630231306.3779027-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 02/11] avcodec/vvc/dec: Check ff_init_cabac_decoder() for failure 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: qh8mW/+QZL99 Fixes: signed integer overflow: 1107820800 + 1107820800 cannot be represented in type 'int' Fixes: left shift of 1091059712 by 6 places cannot be represented in type 'int' Fixes: 69910/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-5162839971528704 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vvc/dec.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index a6b601b778c..563f6fcf082 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -476,13 +476,14 @@ static int slices_realloc(VVCFrameContext *fc) return 0; } -static void ep_init_cabac_decoder(SliceContext *sc, const int index, +static int ep_init_cabac_decoder(SliceContext *sc, const int index, const H2645NAL *nal, GetBitContext *gb, const CodedBitstreamUnit *unit) { const H266RawSlice *slice = unit->content_ref; const H266RawSliceHeader *rsh = sc->sh.r; EntryPoint *ep = sc->eps + index; int size; + int ret; if (index < rsh->num_entry_points) { int skipped = 0; @@ -501,8 +502,11 @@ static void ep_init_cabac_decoder(SliceContext *sc, const int index, size = get_bits_left(gb) / 8; } av_assert0(gb->buffer + get_bits_count(gb) / 8 + size <= gb->buffer_end); - ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8, size); + ret = ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8, size); + if (ret < 0) + return ret; skip_bits(gb, size * 8); + return 0; } static int slice_init_entry_points(SliceContext *sc, @@ -538,7 +542,9 @@ static int slice_init_entry_points(SliceContext *sc, fc->tab.slice_idx[rs] = sc->slice_idx; } - ep_init_cabac_decoder(sc, i, nal, &gb, unit); + ret = ep_init_cabac_decoder(sc, i, nal, &gb, unit); + if (ret < 0) + return ret; if (i + 1 < sc->nb_eps) ctu_addr = sh->entry_point_start_ctu[i]; From patchwork Sun Jun 30 23:12:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50227 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1459990vqv; Sun, 30 Jun 2024 16:13:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVyYHrC4geXNVfUtF/JpjJP58qbT/FHssshO2YEbfHWDb77zBTOCZ6tuwvBrO6JMMoypt/EPT+4BK39p0x8/m8/aJCVUuJvg63vVw== X-Google-Smtp-Source: AGHT+IFwvyEsCXNTP0YiJnffcTd5C0biMv93TEDOn8er+v8Ue+xZRQ880cIzJxYb6olGB6RE7rop X-Received: by 2002:a17:907:86a4:b0:a6f:1872:4e1f with SMTP id a640c23a62f3a-a75144bae25mr243721266b.77.1719789220560; Sun, 30 Jun 2024 16:13:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789220; cv=none; d=google.com; s=arc-20160816; b=SQiDoSvwa0NAQVWOGCwKPCLkWESAb7+vvMRWoG0+3zJckIcOm8vXa0utoy4L0TujdR BfC798XZn+X2p9/Im7U1FN5HaTQeaCHVa42/vHzcFlgFOcFVipTVjTVW6Q5HGbW0Y5dg +2tnB+kGKLKKIQYvRJ6y0q82E7kvKpsjlAkjBIIaY58QtsVgXqyhVbf4Oi3j6qnhv6ff 8CwKGnLoISs1U6Fdq7Q4Sv9uAFfuPzckG8BEScLuegIiJSk6Ax5DmEodJdP31esBuh+q 5eYoI5vvesIxr4B7+Yrr8PXVUWa5LWwabSzGRlgfN5GxxFvOmHoC4n5ZpgcMQ0f9dU0g o0ag== 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=YBFrAXQsiuPtVpHKM4FAe+2a0dWo1I0voDcRU2lnqg0=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=1Jd5Cgj1PVTsO+Is36T/zVluPuU/QxsmOMr+MyNnnr6x2iWVKbASnfTswdBAKQm/qr lv6GvsUxrdCquTRaxnyS78GOwFJB2y/HTNDUgIlM/XROReViGAqAV94PyHwaI36lcsAe J8i4S8oathcEmCb2JugGLz+OXdlb62yZ8rU8kcfJyb0rXr71SJI9nQijT1EaT/dxNvrd mlFl8xZCknjpnZJ3AvgmMZg4hsXl7esteY7Hs9XiDHoUJvHH307KtR2p5fAULaI9aSZr MXvd2CVKdqWHDx55Yo7V4pVxUzi33Oie1SdIQK7D6eM+80kWTopS3nmLZznLTlmBzngb agsg==; 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=cEKYR6tp; 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-a72aaef63e1si305963366b.71.2024.06.30.16.13.40; Sun, 30 Jun 2024 16:13:40 -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=cEKYR6tp; 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 259D968D6C0; Mon, 1 Jul 2024 02:13:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1F9768D653 for ; Mon, 1 Jul 2024 02:13:10 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 02254FF802 for ; Sun, 30 Jun 2024 23:13:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789190; 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=QhOQaOZ9Qcz22nnvJDfDhArxUNO+9U9egyo6HeeVDEQ=; b=cEKYR6tpUVycK6UUskPp1DGtHhKaRJ0aID77ifRIAGc/UmAfrRBn0+JQVATwXqOREfwOrI tRDB9bIPNnh97VthZ2Cw/jktinzHel6ykApaAxBaex4xHUojSnuXtSNVP/FYp3Oj2h18VL viynQOOaf8NSxwc/1LnMyG/1bAx5sYG0cUlbIVGF9zj6yJizv+3smLvUY/Xx7OcyiocjX1 L729KesVtAVAqqy9GKQ5edNkM2HmgWGDDGO4MqdJOnXV0/2/HD665kBMe6cs/BhV5mYLuG CuXsS+GlGhtCxEkYhvO0FFL4MoI3X58mOZc+aZKXBceg/rrnc7HG9KPVj55yWg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:42 +0200 Message-ID: <20240630231306.3779027-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 03/11] avcodec/aac/aacdec: Check if frame is allocated in frame_configure_elements() 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: 51w8SN4rUNy/ I did not investigate exactly why frame is NULL, happy to provide the sample if someone wants to investigate further Fixes: NULL pointer dereference Fixes: 69893/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-4965255361396736 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/aac/aacdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index ea2ba84a80c..6a70c69034c 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -186,6 +186,9 @@ static int frame_configure_elements(AVCodecContext *avctx) } } + if (!ac->frame) + return AVERROR_INVALIDDATA; + /* get output buffer */ av_frame_unref(ac->frame); if (!avctx->ch_layout.nb_channels) From patchwork Sun Jun 30 23:12:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50232 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1460034vqv; Sun, 30 Jun 2024 16:13:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVSn8NWVR+o0yjcxlA1r8PYILR97GjGNcVsTiprj6CkquvGTZzo3HVKox43siI++MZ91cwojKerjgK+2LesQFA5yLO18e0vDayzNQ== X-Google-Smtp-Source: AGHT+IEEQvKfxy8ddPKAiporZYOOBjud4gyBws9i4rJB2i6YUtW5T5GRtLgd66CC47VeoaP3HeiW X-Received: by 2002:a17:906:5ce:b0:a73:e52c:2aa4 with SMTP id a640c23a62f3a-a75144fb3afmr226525366b.1.1719789229659; Sun, 30 Jun 2024 16:13:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789229; cv=none; d=google.com; s=arc-20160816; b=m6FMThWa6gWb8lbNCFCKGgTZ+FPGCzvrWfBlFrejTBqdeEhocXkEmnFb/9RDLmWi6y JCiAWTkgY/wx7dHB/eJM8D1N8s7CznZDY2SaIsUwyZvK6gvLL8RQk56BWeBTNdSInrnw 5m7Ufgd/ryyAttdV3h8v+Qa+kGrSSwDFGOQqBJNWjO/BNirMBllY/ohPq8pkxWlq9n6R Xh+o2r0Y05PL54v2wu3wH8wZYXZqtcbztpPmP8q5m2qwyI9cR8Ca7HzSOLQ1xKwy45OP 5joueklF1W8SM/5ZG2vJl0p8kKkqvLAPcWNUKBg/EKoQttV8cir0tyV1lX2XiL/da2/l tG7A== 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=AjLSaTbPuOpv5/LC3hrjifuNWVwsYwg28+Y4o1ipoGc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=l1fdQmkYsiQ4lYOnWpVMgK7cGCB2Nw7g1eS+uB9q34DyGa5StAXk9rpSPIWY6u0R5p nPTOlSwwrpnLSbBde7adgOaNmPgY5z28wYIhDbn2r+ZJBYUuDBlwLp5OydOk6hSBZXlk cwyFt0yplIID3JQLu3qlwPrHLGbZZMotyqsUKqgFvJVjb0R45vU6INyPE3ndapAe4+yS JMeoNET98IsXp5m+Gr1Wtnxqq2GNop+Ab5LA/IF3xhxosy0OuU9Xopyf4ZmYeGNJXGRK OSgDuX0IX50z+EJz/YLD6diUpjMFte5OBYk8H2sd2XqUh9aoDfAoILfkkidTzaGrdR1o yxyw==; 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="NaDofCP/"; 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-a72ab04b87dsi309173266b.393.2024.06.30.16.13.49; Sun, 30 Jun 2024 16:13: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="NaDofCP/"; 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 3D5B868D6CC; Mon, 1 Jul 2024 02:13:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BA0368CC21 for ; Mon, 1 Jul 2024 02:13:11 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id D71541C0005 for ; Sun, 30 Jun 2024 23:13:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789191; 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=Crcvpofb7cyXHsZaQtK1eGXgTUQB/0Ba0iKanjJN6BU=; b=NaDofCP/Bs9gzIkdeOORoVDDowBGhHaDRuxuR9EEJKE5pD4cA4NcGk+tlcOQHS/7ltumF/ eKA9eElSnwNPSP2Hwpn7F3OHvbCYOoiSpTQ7A+9/JFgS2/7I7MnrISdRoQeFCrvGIKKCYQ pmiu4twhW2S3CHRzunH5F5ieeUcmF+JO+f+lozy/SF1imatocpZkUHn+RT95D/XMXx3Q4G 91yboUGiWeQfJDhAZrLrrCPkqF1cLUvjX9+K1yRuwM7oQ0u8TQAm/yeX77z6AW9IhXc59v 0JhKLkGY2Rdj1i2Xaso/ZSY8KhT1z9/3QDEx3Ut5yIYeoRG3L41WAGXb4207NA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:43 +0200 Message-ID: <20240630231306.3779027-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 04/11] tools/target_enc_fuzzer: A64MULTI encoder is very slow, check and adjust threshold 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: xOntajivDM8i Fixes: Timeout Fixes: 69097/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_A64MULTI_fuzzer-5062757287264256 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_enc_fuzzer.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/target_enc_fuzzer.c b/tools/target_enc_fuzzer.c index 0345595ada7..c4c2df93a9b 100644 --- a/tools/target_enc_fuzzer.c +++ b/tools/target_enc_fuzzer.c @@ -78,6 +78,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { uint32_t it = 0; uint64_t nb_samples = 0; AVDictionary *opts = NULL; + uint64_t ec_pixels = 0; if (!c) { #define ENCODER_SYMBOL0(CODEC) ff_##CODEC##_encoder @@ -93,6 +94,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { return 0; maxpixels = maxpixels_per_frame * maxiteration; + switch (c->p.id) { + case AV_CODEC_ID_A64_MULTI: maxpixels /= 65536; break; + } maxpixels_per_frame = FFMIN(maxpixels_per_frame , maxpixels); @@ -168,6 +172,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { frame->height = ctx->height; while (data < end && it < maxiteration) { + ec_pixels += (ctx->width + 32LL) * (ctx->height + 32LL); + if (ec_pixels > maxpixels) + goto maximums_reached; + res = av_frame_get_buffer(frame, 0); if (res < 0) error("Failed av_frame_get_buffer"); @@ -192,7 +200,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { av_packet_unref(avpkt); } - +maximums_reached: encode(ctx, NULL, avpkt); av_packet_unref(avpkt); From patchwork Sun Jun 30 23:12:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50228 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1465205vqv; Sun, 30 Jun 2024 16:32:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX1/SUceSGkfnwJw7dEUNU/AWt6SphpAbdonHi65eOxRSj8YlmQb9JiSyKEjWhRVWinMRLhiyiqKPeg/8V6p/8Mo3emyRbd1cVopw== X-Google-Smtp-Source: AGHT+IHbfQUUjZ7IybpxYcRwdbra9rkuh/MvPvkSU0jQ2lPP/JI+msCgm3FtZ7Xj2Gi04JcQl/+x X-Received: by 2002:a05:6512:1251:b0:52c:cda0:18bf with SMTP id 2adb3069b0e04-52e8264e643mr3186135e87.4.1719790372342; Sun, 30 Jun 2024 16:32:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719790372; cv=none; d=google.com; s=arc-20160816; b=WWhop6uv2QYmGA2hF8xGvMaBsnZdpm+xkq2jKwKSlGkFf/0r20h66T0SXHG1vGpUwF aXom9CVK12DQsF4YWAobP4GV/00ErwpcxdLjj2PcQUVgri4z79284c7/XWJB0thkxDqg dFA8vO2W0yeoJJZT0nsm7tqg/IPye5oPiZiEd5+jDc6UoxiFFYsEyNFNAupGbMgm4VeM grzrNU2p+y7mC1F0OsW4by5o64A90djD3KseJNOXjRE4ZshFDEST4sCpzTLHlXrb8nqn gcfohvu1gz7BWJUvoP/2BycoDnZq6Qm4e5jyHcGapcfap07/TYW6Pi7OJYp7OlbfaMP1 Vc+g== 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=ZD1ggBQpKTRv46tBLsPTgRUbLxr+66f/WTYrx+cmfEY=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=TozrDZ03JpTzsMs1GMAr+xFZT/BoXLJGPN660Ctt31Ep/uaX+N6/O1+o49tto6Ayp4 8P/XZSKsjMDL7X5DJwu1c2wfpGl9vjO9SEt8s1pMmQGn6UHZXFV39Gfd03GGrHyjMzpf JZOfCdRfZJplmInAySoRrKqvNVB7DMT805m2gE3EKMJgvjUSRcwTeHXYbaltUW5K5WhD e3YPm/XZnxQvHKuBn2i7/25fCOOcmA5w3J3jG8G2Pd4PYjPTRenvkmaso0AX81Hs//i2 QyZdcD9VCthP4p1Itm6sseXBTSixl55ktwJ9bbGDxrvhIhXvOvpCCyKqnc8temKirr1P zxWA==; 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=IODwECMv; 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 2adb3069b0e04-52e7ab31c7csi1951511e87.515.2024.06.30.16.32.51; Sun, 30 Jun 2024 16:32:52 -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=IODwECMv; 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 6756E68C73D; Mon, 1 Jul 2024 02:13:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE2DF68D688 for ; Mon, 1 Jul 2024 02:13:12 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 454F0E0004 for ; Sun, 30 Jun 2024 23:13:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789192; 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=tIozvnd5hMacNKW9u/60XN3/w0QISmVJkqXi+liEoUA=; b=IODwECMvY35dZI+pX/170iSKjA/HoEqXhXH+KwGnOj7GYqQ4XzMzdOV3Q6hLAQvL/pJP3D 5NCNsXShEm95G+iSD81lnwLC4ZbwYZvwAex0NSwET/WzK0scOKWUofmE2NP9stDySXSOFl sWXdzGgtCsrZh2EfT88YobUBchCbMOFKxovfOhDy/mjw1b/fPPdfgsNgN/GOLhxSyikr75 oaFUBPgqI7VZxjhCJjIfKKCWjcmL9To6gf03OJxGUADfpW0rZLV6DaxadAtPg6dQkBlFQE ykubHKX7bjNIpdSByUfk5vNJbYjbJ0tY+sH8WBzNZemObjJ8t4S1fhaYviwl5w== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:44 +0200 Message-ID: <20240630231306.3779027-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 05/11] tools/target_enc_fuzzer: A64MULTI5 encoder is very slow, check and adjust threshold 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: YAB3+7y35TPj Fixes: Timeout Fixes: 68999/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_A64MULTI5_fuzzer-5078418784845824 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_enc_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_enc_fuzzer.c b/tools/target_enc_fuzzer.c index c4c2df93a9b..059d7830710 100644 --- a/tools/target_enc_fuzzer.c +++ b/tools/target_enc_fuzzer.c @@ -96,6 +96,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { maxpixels = maxpixels_per_frame * maxiteration; switch (c->p.id) { case AV_CODEC_ID_A64_MULTI: maxpixels /= 65536; break; + case AV_CODEC_ID_A64_MULTI5: maxpixels /= 65536; break; } maxpixels_per_frame = FFMIN(maxpixels_per_frame , maxpixels); From patchwork Sun Jun 30 23:12:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50233 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1460140vqv; Sun, 30 Jun 2024 16:14:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUVEljz1s8Mj4Gr5EyriDciJxWwMXatMVcgq946hrLSkyTiB3ko/c44h7upFguF9tckVcgaqItUq14a/sw1rdveMUS6JX2I1CNfow== X-Google-Smtp-Source: AGHT+IHMLN46Z+fjD+gNE1weSR6OWA6gkxE4uUkm9JP/YyiboOgJu/kdPARiHiYHb2B+Zdmdin8i X-Received: by 2002:a2e:a80c:0:b0:2ee:6254:f9f1 with SMTP id 38308e7fff4ca-2ee6254fb37mr28331641fa.6.1719789248144; Sun, 30 Jun 2024 16:14:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789248; cv=none; d=google.com; s=arc-20160816; b=C74ohDdPSqeffw/DDSH0NrIWX8J8p+TuTNPhd7TZyem6lPbGXtjdZKIulLME8LUNTA 49tw0GzXI+T7KDO7V4iPi4GYO6Ows7dcLO9Dn6KxsFDp/Ep/DYTn1BWoWZzjdFS2wWoz QP2nvcjZe3NijHiYLma8YeGhustb19WX8+bTOh4IChCY1+S0ErRPbqmUNZaAtsxC6poz KUkciBgbgKxnau+QqQ3uyizOEMzi0RCooQVqsTbI0wkkmeKfVVHmtXb2DzyhwZhr6CP8 +SpJswKetbaLt3/b2L6Ern4qlPnt5/eJ5K19MDV9eQk/vrUlK8NthhmWqJAcDgg5i0iw FaBw== 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=1p9yEFoXIAiuJIN6L+OmZrUbS84toSE3MpvKntJ4f7U=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=qqFGy0u+4BLwd6+nI+NHA35vdzt6ypcczYson95NzXGhPRsHJ9jqgv1Idcon8hlAcV l+yoivCdG0ORE7FTLzwO0KZWrkroG9pEHrW6UkhyPkfMh4lPUXteWk6EtO0Q4Z0M7bZQ 4MZ2d1ZOpbYGrn4laEv2XgOEwAB+WHd0Tbnu+QfT9e77jMA096j1uDWp1eNwzL1MWDa5 8EnVIpa3q6e/KrHr8KEkBLxqQduuviwTFDYQAJF3FxbV5WYg7uTvI80d2zsSFGMTWTKd L04rYs+0tGUOdk+4eIvUQxJv1iiO1B574YdIxScWH1L0bmK3b/E9xe4bOBrOO2hcNVyz axow==; 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=LBDolNIa; 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-586150337c2si3024296a12.263.2024.06.30.16.14.07; Sun, 30 Jun 2024 16:14:08 -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=LBDolNIa; 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 34D2768D67A; Mon, 1 Jul 2024 02:13:33 +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 F037A68D673 for ; Mon, 1 Jul 2024 02:13:13 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 5014C1BF203 for ; Sun, 30 Jun 2024 23:13:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789193; 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=09UNeqBxm//UqWrkoO77h3qlsHbuumHrNNbqD087mUQ=; b=LBDolNIaVygUB/gjaR/JNCXcYRphNrjNLqmqboN+N/wqD89n5n+R+X8vbKY/5/gK8H3PYA /gb5bsNZS66EDEUAnNtBzFJATFOBYF7wSULwZWe0WEbJ/ycqTc60RqZ3DA2dQEz/uVN2Mj 9PJ5/LA/PG3S/7Cr7yAXc6TteQMP0oAAbwRmoSKLZvMBn51hiKrzD3uH+shrm7CP89hhLQ zJw96ue294vQCK8MDefTEmp5R5zPD8XCFJeTiCN3gQcXRfFvl+qACPACIxg/hRE9HUHh16 4AoT73acrbo45XZ2S1mH38GklRPx6ttLTrwnPjsQv2yeQsOGlYMoMw18cRBzdA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:45 +0200 Message-ID: <20240630231306.3779027-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 06/11] doc/examples/mux: remove nop 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: 5r0IUEztpQ18 Found through code review related to CID1604493 Overflowed constant Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- doc/examples/mux.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/examples/mux.c b/doc/examples/mux.c index b034aad56f7..0f3a2bb125f 100644 --- a/doc/examples/mux.c +++ b/doc/examples/mux.c @@ -347,8 +347,7 @@ static int write_audio_frame(AVFormatContext *oc, OutputStream *ost) if (frame) { /* convert samples from native format to destination codec format, using the resampler */ /* compute destination number of samples */ - dst_nb_samples = av_rescale_rnd(swr_get_delay(ost->swr_ctx, c->sample_rate) + frame->nb_samples, - c->sample_rate, c->sample_rate, AV_ROUND_UP); + dst_nb_samples = swr_get_delay(ost->swr_ctx, c->sample_rate) + frame->nb_samples; av_assert0(dst_nb_samples == frame->nb_samples); /* when we pass a frame to the encoder, it may keep a reference to it From patchwork Sun Jun 30 23:12:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50231 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1462574vqv; Sun, 30 Jun 2024 16:22:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVsOnlOfszmzyliw9o+TEnhH5BuhS/sHc/bQM+i5eZBwxboCOqX8R8V3qRpRF6D5/MNGOm8thT4hRHRYZSYTkbpM9sCBwtKw8v6mA== X-Google-Smtp-Source: AGHT+IEo/JHjnjxp2fOtX7F6rB5JJwXm/kyaKGgjW8WjN+S3VOMrs0S5AgO8b8ovXzIYjJq08g1H X-Received: by 2002:aa7:cd78:0:b0:57d:10d2:23ef with SMTP id 4fb4d7f45d1cf-587a0fdc8c9mr2103833a12.42.1719789773305; Sun, 30 Jun 2024 16:22:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789773; cv=none; d=google.com; s=arc-20160816; b=IqOk6p1FFpkeLNX8eT02K8BuY9Yv4oJrAeeUDf/6q9FmVF0FI1gG/PAlTbMvgEMUD2 bhts7oskou9CMNj2M37nshGfSbvnqs3QmUG2j9r8AXhXAMQscceF22/OxSptnn+FCYER mzULa5jAT2HSIlKiQa2Tq0cWKqDk6hUV5w9WNFUWmJS9CfBRvs2VORid7EUb3BDduWl0 MWNsMKtIoZuD/FXlfGHNgBg1j39EgGVwq6p8mJkuMumWyYYg70lMffK5QecpoGGdDGs1 GBBaX11/hAFORF+pzbZymXxKLUwjGnvcPHgjrkzba7Tv3zcDEA7vROvOLjajtx/TKUE6 T1Lg== 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=Jebs/zAykXvYcDMxngbrWVc4ccMgGhUubePEZZr1U1E=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=gBGEyt9cmVo5BWcQg1V/DVEEuDv6CnoJlW/LZ3bFfHw2spygMbfwKE/PDr7GirniA4 KuOwcWJ9S2IiiSEAad0EpvgPP0GaipHEEurBzzHMtwFDC8gZpRs79BJZcGURAvcBYaIP mHp7NEXpdtGUc84OUiNX15nsw0kOT9Dg2mhhJoouPMg3S0+MPDtUZkyf7dKSqzapm7lU 1sTc0bSsQDZgaupkYc67N5cBhy0pT/tSJQFOblGLjSZOgok44H7luvbn3U6tWSMqx2+M 19gnVe/KpQlh9maHDZ5BvERas9fiioJqNk2FtQU8nGw+aPiozgnNgvhwCDrC/xDC66jQ g19Q==; 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=M0isdomG; 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-58615035d10si2942122a12.336.2024.06.30.16.22.53; Sun, 30 Jun 2024 16:22:53 -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=M0isdomG; 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 B660068D681; Mon, 1 Jul 2024 02:13:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49DE568D6BC for ; Mon, 1 Jul 2024 02:13:15 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 8D81BC0002 for ; Sun, 30 Jun 2024 23:13:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789194; 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=T7Sa+at4QSBzHnh7bcI5Hwp6bs0MnThomcfx1DcI5kw=; b=M0isdomGsWQ9HoMwXd7yjUx9VPCHEEcKSXFAjpYKADdK534FnSBUiAkVjNgQcAn+GOPxym 8RYmm4xZnw/8ZL0Wi+EVtK1NoxRXV6sOrfEvoRTicPHUqjv9hjm52OT8YWwH6Bw88A8as4 z/AtsQix6Pw1xpx9bQ1aN9JMPAegxUw35Bq8+Rb+zKasnY3uwtazgueDEP6AmpnOIvgrdI ROB54xSCE4sY1x458hFoylQ+ztwtQD0IDvNFw/dWadk3HyEh9n2PRSpDBxX2VwMX7RRPvW 6MwS8LcgbyAjpLQHC8RU6w79vm0RcuqWB09cUCb/Y3ZojYW8MBP9CHOjXBUbbQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:46 +0200 Message-ID: <20240630231306.3779027-7-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 07/11] doc/examples/vaapi_encode: Try to check fwrite() for failure 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: ySc5HYXasaDW Fixes: CID1604548 Unused value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- doc/examples/vaapi_encode.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/examples/vaapi_encode.c b/doc/examples/vaapi_encode.c index d5f472f6dd8..805db7e5fd8 100644 --- a/doc/examples/vaapi_encode.c +++ b/doc/examples/vaapi_encode.c @@ -88,6 +88,10 @@ static int encode_write(AVCodecContext *avctx, AVFrame *frame, FILE *fout) enc_pkt->stream_index = 0; ret = fwrite(enc_pkt->data, enc_pkt->size, 1, fout); av_packet_unref(enc_pkt); + if (ret != enc_pkt->size) { + ret = AVERROR(EIO); + break; + } } end: From patchwork Sun Jun 30 23:12:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50234 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1460258vqv; Sun, 30 Jun 2024 16:14:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU/5I7qmSQWfDSN5cLuvLFOVzQw62bzSGuklE1bODwXa+lKm3LiHNtjDk3CjuaWZ7ZwXKgcb744vImVNqXNeVuL77+UUUtJfuvfsw== X-Google-Smtp-Source: AGHT+IH6xko8lfO5KtJYBU/4k0nUoGwwDG7tjjYjEtGYX4Q0ZEH7V7aNFcIAsfcEpZaSZUd4rOUa X-Received: by 2002:a17:906:130c:b0:a6e:f997:7d91 with SMTP id a640c23a62f3a-a7514498aa7mr255619266b.38.1719789267782; Sun, 30 Jun 2024 16:14:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789267; cv=none; d=google.com; s=arc-20160816; b=JRAyCwIO84CMNZ00BKdNBM+i7zHBF3NK+eYbsqVMEcqOmz6uPMy8LP/X0yiFwhJ6yC ovlVg6I5TozJ9coB8sSCnmP2NPMnYW25IlFXBH+kABkUFL2lx7rgcVPzXBuwfQuBUPeN RMsT6ccPhmNpxVCBKte0l2GTozSulbmusrw2Itt0M/+bAbksxjwR4D8EHx+AYSAaU/Cd yyA2/Y9sNLZ2yaWDqwHWrdO9Pg8cNXVOStOjgR1h4/yvAPvNuZ9founz1OiJLNfUlzpy +7pBBhNsClso2tEL9tTzPCd49yntqTCw4H/WD5F38lLXbKTfo9JMnXg+zGd7C3QAQUh4 DKXw== 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=HjDpDwEQtewQeCYSD3vYUcwD3O2JRrncojw1JrmtABc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=0OSpdDtim+C7dy0+s7C18kZ86/oUamJy7aefMGN2sF1jVAe493qNYdG98AGe9BGc5p NQTwbAL6lqFJTlrMSLYJ2dvAT8UxETlGd4LyWoB0dPEKr+HzGJy+MWIsg2XiLYWizvkK fiMUxkE0Uz2E+TGCOE34zyqwPCPPUZBAg7AKTCz00nRMs5fSJwzn83FOTzOjll/Hsjgn VR4YJ7AivM/adSnnEgTi9JnPriBNwgRbXePaJBa0q83xuV1U1QG0bGM/3sxOyQA/sKLX ueb4SeyxJbTH3YgWnDMBTRNF+zWVqR1/SSuli3Tzty2hEv0iJPMfABjAWMLgGK+sC5Jt msUA==; 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=I7vARJwq; 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-a72ab07427csi293908066b.493.2024.06.30.16.14.27; Sun, 30 Jun 2024 16:14:27 -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=I7vARJwq; 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 E13F868D72C; Mon, 1 Jul 2024 02:13:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B47B68D6C3 for ; Mon, 1 Jul 2024 02:13:16 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 9658B20003 for ; Sun, 30 Jun 2024 23:13:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789195; 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=H+D0dMe9ytpr/veOVsNyk4uwf+llvcM57ulKkcFP5ek=; b=I7vARJwqzRvEOgfpbW0JHf28Q0kuoyxNBHKeHLcdae86M9U9CMqMBHJGgn6BrmfmJlATBS HrLwifAkfcGHVRp8KVapGx/9skECAcuclejg0oNLD5hHx1PjyzkT6N0IlmcRJpnzOgdzxx yu38aWlN89u3gIbbynQjLU7DH4vFiNFpJixpApawK0niHaVdkCGG2coRwSwkN5nHdDIMQI GU4UURBponH4c+iWXhWxxNJPshJbqmFeGLaLnuM6UzzMRRIvf6r5C91jWt7uqjVhYYvueP r7y0wNXd+0gIGS6TlgaJoirY5G/OJAOW15EJRWAVr0XEYNLdJQ0kglWtgUtuXA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:47 +0200 Message-ID: <20240630231306.3779027-8-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 08/11] fftools/ffmpeg: Check read() for failure 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: BmJ8YV/veDaO Fixes: CID1591932 Ignoring number of bytes read Untested, this needs a windows machine Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- fftools/ffmpeg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 88ce3007e83..8674c4d2506 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -285,8 +285,9 @@ static int read_key(void) } //Read it if(nchars != 0) { - read(0, &ch, 1); - return ch; + if (read(0, &ch, 1) == 1) + return ch; + return 0; }else{ return -1; } From patchwork Sun Jun 30 23:12:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50235 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1462573vqv; Sun, 30 Jun 2024 16:22:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWIKfROJk5zVyLdfZtDFXEFiHvVnhmfIQVujapAziEwhWP7rviht2cTlZcF9QUjsrn3ZwNIpf5YJVFrvDoRaAAB3cRBm1jm45/YTg== X-Google-Smtp-Source: AGHT+IFtYSe4/3InLusvxllJqZ/mL6c5aR0Tvjb7bQEiAskOObPFo9L9BePDhxMPdOtxC3r8OE2F X-Received: by 2002:a05:6512:3054:b0:52b:8c88:2d6b with SMTP id 2adb3069b0e04-52e8264416bmr2694318e87.11.1719789773322; Sun, 30 Jun 2024 16:22:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789773; cv=none; d=google.com; s=arc-20160816; b=r9/4wF/X0R1xYVWREFhFNA1sZ6O2v7Ue8pw1zydGIK1x+89bOha6ZcvhcCVr84X0ex 1SP7vWk+YPJyEJbWZOjEfovBQcBEcq3QYFwPhtPqTkRlOLk/K46F7VIM1IUM8bjCKqzG /4zuhZwb2Er2WxdbMrjzrFLeMFuNxZLoeDbhN7egaEYHDxGqCyVrZ5Lf3uifXnn0W/1b K3neLz4p5zpVYWodJgRxo+2NHSUGd7IntPvbIDuuS1alyScLLLjwHenLxuj0jkcMmFi6 oilYzh2cFDKZliyA+r6kmNf0Uj+/BEr1fa7oDdr6CkSB/O3pk0JrZaiPkCH5iaZ4pZZX awBQ== 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=z+qGKKOttZaRxaw9GCu2lwxgRQPRsLILLtvz6h5h/RI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Hy8fCcrdSbvf+AYPDUxOgbl7AcjC5cJp3QMpXldP3n6trj0Z+/UJ5o2si1qUBGA3pZ Cy6D2fYllhRKr9/8o42P4GOE9DD/TbI9KaXpqV2lw5y9z4nJPmpvJymt3HzMxi0Ghah2 bTXA08goQYpwN6B1qCSgOYGXg5NAVtfgd0dN01nbXr8WVWzwgWh1GgefJ4+fcL46nb9b YJ8vs2n7FNsfzYal9pdJ5ECd7j7SHmHcQJUD6iLL6cOmiqeUi7uzkxoTLA+YyvI7b+Qq 9ru+g8/wIKBxrQOi5+Zr8U6SXJLnGbM7CIAOKC6uQw+B/V3VUCCige0Tl2OKGvFWYpoC nZCQ==; 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=PImGaZE6; 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 2adb3069b0e04-52e7ab3c710si1929059e87.603.2024.06.30.16.22.52; Sun, 30 Jun 2024 16:22:53 -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=PImGaZE6; 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 BB6B868D739; Mon, 1 Jul 2024 02:13:37 +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 06B3D68D6C5 for ; Mon, 1 Jul 2024 02:13:16 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 5EEC540003 for ; Sun, 30 Jun 2024 23:13:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789196; 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=toYahLZ9OpdG+PiHHx6UEegh0SBHaBjc4wNyIUkm8N8=; b=PImGaZE6n89P7zA382eIWfE16S/hqHIqI+yriszBjmLmanZDoJV+2u+jPsR/Duk/OGEVLV uH0tIFylVgAXibql9kOawkgx/UTJI/YODqSYstdIfnjcfz7lMceCcEGNBubnjVAPd6hZjN e5eZSxakVY5l+TdUNCl6kwNd3a7d24+CZ5vOTOYhHig5okNoUFs+3wsn4BO6CghwRxOj/z U/6OfPsq2XRj9qbU9kFbx1/kDurzvyMbiT3q62udJustwP3Xo/XROJNQMBiMmZukuzllc9 jbqPrp/Rl1HUSux2Zpj0fT5/bVoMI5cY25mMu5N6i9K021LbK0SsvPvd22kmNQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:48 +0200 Message-ID: <20240630231306.3779027-9-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 09/11] avcodec/aac/aacdec_lpd: Remove dead code 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: 5obBQwTitGjT I dont intend to apply this, this patch is just to show there is dead code that needs more work in case it has been forgotten I will mark this as intentional in coverity because obviously its work in progress code (CID1603198 Logically dead code) Signed-off-by: Michael Niedermayer --- libavcodec/aac/aacdec_lpd.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/libavcodec/aac/aacdec_lpd.c b/libavcodec/aac/aacdec_lpd.c index 91a32688895..1faaab852f9 100644 --- a/libavcodec/aac/aacdec_lpd.c +++ b/libavcodec/aac/aacdec_lpd.c @@ -142,7 +142,6 @@ int ff_aac_parse_fac_data(AACUsacElemData *ce, GetBitContext *gb, int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac, AACUsacElemData *ce, GetBitContext *gb) { - int k; const uint8_t *mod; int first_ldp_flag; @@ -159,26 +158,7 @@ int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac, if (first_ldp_flag) ce->ldp.last_lpd_mode = -1; /* last_ldp_mode is a **STATEFUL** value */ - k = 0; - while (k < 0) { - if (!k) { - if (ce->ldp.core_mode_last && ce->ldp.fac_data_present) - ff_aac_parse_fac_data(ce, gb, 0, usac->core_frame_len/8); - } else { - if (!ce->ldp.last_lpd_mode && mod[k] > 0 || - ce->ldp.last_lpd_mode && !mod[k]) - ff_aac_parse_fac_data(ce, gb, 0, usac->core_frame_len/8); - } - if (!mod[k]) { -// parse_acelp_coding(); - ce->ldp.last_lpd_mode = 0; - k++; - } else { -// parse_tcx_coding(); - ce->ldp.last_lpd_mode = mod[k]; - k += (1 << (mod[k] - 1)); - } - } + // parse_lpc_data(first_lpd_flag); From patchwork Sun Jun 30 23:12:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50229 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1462559vqv; Sun, 30 Jun 2024 16:22:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU9IXXe9bAmwPUMrYuwzCK3bOtCiX4nLEp7BKivf+DythrzLL6ita87i8BJp6VYpncsbnpEr3+PGilw1Hvbat4ElRhzm9hKY1B4pg== X-Google-Smtp-Source: AGHT+IGzsAJZFHdr8yleSRkqlUzy1sH5UerCfaZ2JQvoXOwJzPncYi2BxUuhl7cFEOCqMqkTbvQ3 X-Received: by 2002:a50:d518:0:b0:57d:432a:582f with SMTP id 4fb4d7f45d1cf-588e4fdf8a4mr1402752a12.1.1719789772457; Sun, 30 Jun 2024 16:22:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789772; cv=none; d=google.com; s=arc-20160816; b=zuKvMvTN3xfDRF/ic6Z/fUCpVXGZzya2sSR+nnTZfho8rzh6MZcoTtYQ6XMr78i5mM 06owOsZ6+nMub1qHPblqrNDPoH8nuMjAjvJnQTHr5wZLlTG5n2Bil/01FHbGwwafVuj/ +cKtJJ2mLCmxTG/qhHhVovXrwyzEr7+V4C9I5p37HbH5Nn39PjFbDG2CQq/rGqSFR2sx Zv3jwAq6nxhHXA2k4T2eDOUbyO82qnkDFT9+cM3as2zck+kSZKvViq+ykF09Y8rtizz8 TYwh3nbwLjlSMX5XJdxbfI4x57DJfj/QwZYXFDxDrvepM+dRmFCQwaptb46ubouX7Lb0 B0Pg== 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=dhgyrium4yiAqAI1EgUO95Z28qatc5a1ehVwZv4w46E=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=ziaSb7DrMr9aRIhNgAkqp5e2FPlSsQb4+wIPCEc/nbclbmcnKynj4cG7AD/6G/TlM3 nb7vG9N6uwGxdp0xx7TO3u6ZAwZrtSwK3v0Q5CPluD/QkrPglInEJ3t8XUUkqGHcUg8p MhzektBmjEtpyCxLCNFElmc0Gv8bK+HDx26rxcqJtDaR2DCeLqgzsXBnUfxpFGi4hZV/ fc3VkPeYjd8Z+irX/mw37VWNFuhongMzn7m2t3QWoeytJX1yd+dmndeoyDaIzi9ilLj7 gLY2YKgasG3oQjaaK7zu/+gnlnALK+SpueQo7QY8MTbFbK4dmcjBDW4GyRKl79ggdAql O7lg==; 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=fpdID7hS; 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-586150336c4si3399696a12.319.2024.06.30.16.22.52; Sun, 30 Jun 2024 16:22:52 -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=fpdID7hS; 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 3E6D568D753; Mon, 1 Jul 2024 02:13:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD53968D6CB for ; Mon, 1 Jul 2024 02:13:17 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3ED6EFF802 for ; Sun, 30 Jun 2024 23:13:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789197; 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=APG9JGxC9WXlY4qAxTm5y3VqL8MX5nQD65DCIwW0dyQ=; b=fpdID7hSYS9N5bWGMJlqq017VN3JiF0iYwHXo4ygi5hX/lgH0zQ984x6cZXQMJY56TE3/k gEikNPg8/s95zADnSErtFtM0ET7BOT0XWyww18bM0vH62nBj/03N3rKqJElxIatUC3KMy0 nxhI+guEWX2etN4W8GDoPIOZoAsfwVLlrMsWwpg0z2IkbpsELU6kfjYxxD2Bu3wMGs/Yau dD0KUDkI5KqCqet+lbD4XotoGzzeJoFG2rvHUZ2ZoAhB+NY1fne22c7EtnEG/YDueKf/6B I/9jPwNzY7J3ZP2wzr0mDatdfekCftZfw4oQFQh1NEQblZwPG3azrhyx4KpbAw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:49 +0200 Message-ID: <20240630231306.3779027-10-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 10/11] avcodec/aac/aacdec_usac: Avoid doing the same thing twice each iteration 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: DWR5SPxAzxCK This requires review by the author of the code, i have just changed this so it looks plausible, this needs to be checked against the spec Fixes: CID1603194 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/aac/aacdec_usac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 4856c1786b7..9587348021e 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -313,12 +313,12 @@ int ff_aac_usac_reset_state(AACDecContext *ac, OutputConfiguration *oc) ff_aac_sbr_config_usac(ac, che, e); for (int j = 0; j < ch; j++) { - SingleChannelElement *sce = &che->ch[ch]; + SingleChannelElement *sce = &che->ch[j]; AACUsacElemData *ue = &sce->ue; memset(ue, 0, sizeof(*ue)); - if (!ch) + if (!j) ue->noise.seed = 0x3039; else che->ch[1].ue.noise.seed = 0x10932; From patchwork Sun Jun 30 23:12:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50230 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1462564vqv; Sun, 30 Jun 2024 16:22:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVO/Mw5QGZsgwfYsPa6bNCtKvUJTFeN+sCmYZiU4L+LcMcRq19X8YLNevXbVSM2VxcIx7/k9YqZ5N4lWXaWyL1emJBynZ8H3dWcmg== X-Google-Smtp-Source: AGHT+IFQpKWLoFSM911mHctfhD2MpZ1imIJ4ie3z8g2BfW6K+kzpztqmUiOPQiqK5OF4xU+gCjeS X-Received: by 2002:a05:6512:230b:b0:52c:dff5:8087 with SMTP id 2adb3069b0e04-52e826fc218mr2538347e87.51.1719789772784; Sun, 30 Jun 2024 16:22:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789772; cv=none; d=google.com; s=arc-20160816; b=xeAmDyYIGVLaXs4Up0lj/fOk5tAKfpZuhaTLuPSNXvtseqKL0+Wp0P4HB70e/rC90J +eQOkoY2FC5OqRJ8a/yzpoQ/HwaC6U9ma2AIFrpB9ujQi0chwzEDmb2A/c1PkAdLZW+i PwQLAbdIBBz6NrxqC+mq0Nu7ddGwFd72zTxBACjBegdlWYWE/oEIdRCnbVbBVc5WYGpF rxsDdcduFNX13uk4VQjBxb5SAuVKJJWSSwZnytvxG9LtLkU89o8Q0Eet2Q5orRQXVDpv 3DeHapy6bhNkkIMQZypgWBX9IS+fR+0j9X+0F0Jtu97iSD18xu51TBTyASkghMExVJyH a/Uw== 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=zWlItbo3QSa59vu82qAixFNzN0UAG8+mHGEQmq62404=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=p//zrlzINQUsbV//z+KGWyk5asHgD4b8FvCRRMn8WOP/7cms4DBsqI9vm3gyaAP4i9 KUHpIlOJkk22dZ672C4R78A5x5O/vaCFhQK0WU54BXF3E8ApVa8qlk1o7NvDY/IFWlbo 2a0RfrkG2xGnrFSu3PbRteltoVNrulzumHMa1t5iJfZd5fZVU8iU+rpVBwePzQ+oB8sJ +ZC2Mf5xK6f/EEM7RoEy+G+iIKDsIYjsHWxdhqi0udGjihfbfNpNKtyjbC0CfKAHSEc6 vAFljyaIw/Jr/pQtZJsKyHyDpyFPyb+D9+xjEwTWjMBwHAfPprxM3FdfcjgfsbmTLqqt grAw==; 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=Ay9jGV3b; 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 2adb3069b0e04-52e7ab31651si1910003e87.461.2024.06.30.16.22.52; Sun, 30 Jun 2024 16:22:52 -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=Ay9jGV3b; 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 7023F68D766; Mon, 1 Jul 2024 02:13:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3B5B68D6E0 for ; Mon, 1 Jul 2024 02:13:18 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 084501C0005 for ; Sun, 30 Jun 2024 23:13:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789198; 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=9FOa4y7jmjVD0zgFR3mnnL5/n9r+8wkp4hsWvXAcp9o=; b=Ay9jGV3ba/jfXT9E3VGro3ekP6PD7Lw37V5EB7MHy1ofGlMxLEtVls89evp72tH+lC9Doo 0c2mXgO8M1jTw2dHmW1/9QJHuw7DP3X3jVei9mzzRTzXmvHajWpeDzuEwK7uEkam8dbYdM hga211qMN7p+8DpkCBOW/F1fJalVYwzHM2KYDAD+tsAOcLtmOGjHh39ubOv/pc/YPjMQF1 rlNuBWtjd+TPRVfUcRnl+nvYPcAU/h1agJ8PdHbcc9i1ZAJEB6ROe+2FSYq0Wq/RVkIaXr cyHCevYy5pAvw6LAlx7d29dybgfcvcqd9RbQstWrJkB1AMEGYIgYhyoO9FxclA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:50 +0200 Message-ID: <20240630231306.3779027-11-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 11/11] avcodec/aac/aacdec_usac: Remove check for impossible sbr_ratio 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: 7kBXxjw+ofpi Fixes: CID1605475 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/aac/aacdec_usac.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 9587348021e..10121dbc34f 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -1676,9 +1676,6 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac, } else if (sbr_ratio == 3) { ratio_mult = 2; ratio_dec = 1; - } else if (sbr_ratio == 4) { - ratio_mult = 4; - ratio_dec = 1; } else { ratio_mult = 1; ratio_dec = 1;