From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id CFAFE4CF86 for ; Tue, 4 Nov 2025 10:43:45 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'oGkrdpOCxfZ5FCn4xDtywbMl8PWaNPmyaQHOv3OON74=', expected b'WT2FZ2Bk18pQo0V8OwHLNWKLyURMifZYK0caSqhsX1U=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1762253018; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=oGkrdpOCxfZ5FCn4xDtywbMl8PWaNPmyaQHOv3OON74=; b=s1gUi2PYHqBt3JwlBoM2yo1JqlOF3Yszq1L/Z+3V6LIYKd0Y+y+263k0zLHbq9Y3eEL4f EzfTQFYTMJwv92D4gRwBmerDbB3c83EJQap/WZyjekcT0vr+IxUiHEGEPnWRuMHpKMZvqvK T9ez7O/yvyz8vLd8VgfjuG9a/W3weWOJCjhxYuUN/+/v0u7CUxecFwBSxd1KnQsy49RTvLI seR8mKt9db1zCa0MQN2/W6FdD4qcmKM/dezLM7qBaiyxMrs3s7GnfCzGYLGAZBcYx2RABic z28XJW4kd8uuRmI6AKUeR3xkL/emO+1WAo5OkET5WFD+rPsNdxNKbZqWN0Aw== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 29D3168FAA8; Tue, 4 Nov 2025 12:43:38 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1762253003; b=LnxsBu+Pv+xz5vftQNyejEG8DvFJXdQ8It5cqExz1sE5ccvg9yHHADHwrEMT0MyI8JtzE ECEBXo5XQY2OPMzDMlm7924S+U8QOY3LdZwtAIJZW9o0DF+4m+Dwz5J/bqNoAvmuFUV02QO PzY+vPHs1/E+wGsKya5eNCESG+fYITJT2Gi3k3G5q3BQJNObYn1Nd3D3jUZl5qAXaBnBnb5 QigQtX5rcO8x4VGZHw5y2/NfgRlHxIb1/duw+cNMlgS7kaPxOu2CtxsCsekO/Yuwy7urLHK zir1ZRgzdfuHQ34wR4X8V3ULDs/0ysL5MLkhSU8Cd6NgvZVzqnoBamt2xBdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1762253003; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=Aou2/LnNj98H6jpJJ/uVobctglX85oT3UFsI9vkOFDU=; b=HwBkJJha6OzyUyYqlux/NHkrf3+S8z1fHXWpQ993z3WPHCMFilmunpL5KRjOcnb+VBeoX hRN9EpASwaIgrBEdl4WTVB6/+HQU9pcjasIKKmrLziAgUoNgTCWmCIxV9EOyxrTyDy8bnqs d+ErDBW3QlSselqy/AbHqVbhXVIxFq1hKTPeELXWE7eq5x+iukGAr6o5KzGVGv3Eb/sCluk dQaHkLeZYDP+Cv1joZO4vqdc8P5JgPpbbw55DNEX2bFhC2vZF6YGmVSZ+TpnY7aGQuXleBm t5rzmsoIOrPT56F7ae8OuyvVhSF+WoUwMYVWgMKFc4VKgHDsTutcYE0+u4fQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1762252996; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=WT2FZ2Bk18pQo0V8OwHLNWKLyURMifZYK0caSqhsX1U=; b=pIbgvKbPjtO6qZRIB8hAwaDrnXRiB0NdUeQYpxPO5qBeslxCE01XYdZ4Ry6GXDjgdWqLn pgHMqKUSbmQFWEYdDFFoAsiqEcA+rIXFLQ0Tjc9UZsTCUFn9QGj7TLL/uMN1DByygr3TAtL A2jIG/9UdJlXFWql9XaQVgkUrJK9UGajC6vNTcmqfxEfHteGy1wfbhMfA+ft3gAJUUThjSq pZuXr6WwSnaDHqCTEAjvGQ+76qam7dpJTwxCje49blZFs3aRojw8nstcGh9QS09f0a/WDrr QtlzuS5/PNqTSu1DzMOQLznTaP3Aub8BBi0c1A4ik6K9VqjxGYRUArYeZQbg== Received: from 02c22a36bd31 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id B7A3268B353 for ; Tue, 4 Nov 2025 12:43:16 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Tue, 04 Nov 2025 10:43:16 -0000 Message-ID: <176225299689.25.7330695982907008875@2cb04c0e5124> Message-ID-Hash: A4OEVAWGWCXB5NUMFOFII6NSNYN3CT6C X-Message-ID-Hash: A4OEVAWGWCXB5NUMFOFII6NSNYN3CT6C X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] aacpsy: fix whitespace and code style (PR #20834) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Lynne via ffmpeg-devel Cc: Lynne Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20834 opened by Lynne URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20834 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20834.patch The last merged PR (#20815) contained garbage. >>From fe6cdacc50a33bdbe18bdc6165b84e409cb2e680 Mon Sep 17 00:00:00 2001 From: Lynne Date: Tue, 4 Nov 2025 11:38:56 +0100 Subject: [PATCH] aacpsy: fix whitespace and code style The last merged patch contained garbage. --- libavcodec/aacpsy.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index fb6ff75795..299a0a9f0a 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -913,6 +913,7 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio, p = FFMAX(p, fabsf(*pf)); pch->prev_energy_subshort[i] = energy_subshort[i + PSY_LAME_NUM_SUBBLOCKS] = p; energy_short[1 + i / PSY_LAME_NUM_SUBBLOCKS] += p; + /* NOTE: The indexes below are [i + 3 - 2] in the LAME source. Compare each sub-block to sub-block - 2 */ if (p > energy_subshort[i + PSY_LAME_NUM_SUBBLOCKS - 2]) p = p / energy_subshort[i + PSY_LAME_NUM_SUBBLOCKS - 2]; @@ -920,6 +921,7 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio, p = energy_subshort[i + PSY_LAME_NUM_SUBBLOCKS - 2] / (p * 10.0f); else p = 0.0; + attack_intensity[i + PSY_LAME_NUM_SUBBLOCKS] = p; } @@ -946,18 +948,18 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio, } att_sum += attacks[i]; } - if (pch->next_attack0_zero) + + if (pch->next_attack0_zero) attacks[0] = 0; - if (attacks[AAC_NUM_BLOCKS_SHORT] == 0) - pch->next_attack0_zero = 1; - else - pch->next_attack0_zero = 0; + pch->next_attack0_zero = !attacks[AAC_NUM_BLOCKS_SHORT]; if (attacks[0] <= pch->prev_attack) attacks[0] = 0; att_sum += attacks[0]; - /* If the previous attack happened in the last sub-block of the previous sequence, or if there's a new attack, use short window */ + + /* If the previous attack happened in the last sub-block of the previous sequence, + * or if there's a new attack, use short window */ if (pch->prev_attack == PSY_LAME_NUM_SUBBLOCKS || att_sum) { uselongblock = 0; -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org