The branch, master has been updated
via 873a173328195d93010e27f5aa826665b63a707b (commit)
from 632958d2bfbd863a21f75ee8f25abe76a824e295 (commit)
- Log -----------------------------------------------------------------
commit 873a173328195d93010e27f5aa826665b63a707b
Author: Lynne <[email protected]>
AuthorDate: Tue Nov 4 11:38:56 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Wed Nov 5 16:31:59 2025 +0000
aacpsy: fix whitespace and code style
The last merged patch contained garbage.
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;
-----------------------------------------------------------------------
Summary of changes:
libavcodec/aacpsy.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
