From 843cd4a3edf254c2a42663777c1633d67cbef238 Mon Sep 17 00:00:00 2001 From: Nathan Caldwell Date: Sat, 7 Jan 2012 14:16:10 -0700 Subject: [PATCH] aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons Also fix a typo. Signed-off-by: Alex Converse --- libavcodec/aacpsy.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index 38d9d9f7d8..04feea388c 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -827,12 +827,12 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, 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; - /* FIXME: The indexes below are [i + 3 - 2] in the LAME source. - * Obviously the 3 and 2 have some significance, or this would be just [i + 1] - * (which is what we use here). What the 3 stands for is ambigious, as it is both - * number of short blocks, and the number of sub-short blocks. - * It seems that LAME is comparing each sub-block to sub-block + 1 in the - * previous block. + /* NOTE: The indexes below are [i + 3 - 2] in the LAME source. + * Obviously the 3 and 2 have some significance, or this would be just [i + 1] + * (which is what we use here). What the 3 stands for is ambiguous, as it is both + * number of short blocks, and the number of sub-short blocks. + * It seems that LAME is comparing each sub-block to sub-block + 1 in the + * previous block. */ if (p > energy_subshort[i + 1]) p = p / energy_subshort[i + 1];