[FFmpeg-cvslog] aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons
Nathan Caldwell
git at videolan.org
Tue Jan 24 03:04:44 CET 2012
ffmpeg | branch: master | Nathan Caldwell <saintdev at gmail.com> | Sat Jan 7 14:16:10 2012 -0700| [843cd4a3edf254c2a42663777c1633d67cbef238] | committer: Alex Converse
aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons
Also fix a typo.
Signed-off-by: Alex Converse <alex.converse at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=843cd4a3edf254c2a42663777c1633d67cbef238
---
libavcodec/aacpsy.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c
index 38d9d9f..04feea3 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];
More information about the ffmpeg-cvslog
mailing list