[FFmpeg-soc] [soc]: r2504 - aac/aac.c

[superdump]

Author: superdump
Date: Sat Jun 21 15:37:36 2008
New Revision: 2504

Log:
Remove _minus1 suffix from num_pulse variable to be consistent with spec


Modified:
   aac/aac.c

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Sat Jun 21 15:37:36 2008
@@ -259,7 +259,7 @@ typedef struct {
  */
 typedef struct {
     int present;
-    int num_pulse_minus1;
+    int num_pulse;
     int start;
     int offset[4];
     int amp[4];
@@ -1065,9 +1065,9 @@ static int decode_scale_factor_data(AACC
 
 static void decode_pulse_data(AACContext * ac, GetBitContext * gb, pulse_struct * pulse) {
     int i;
-    pulse->num_pulse_minus1 = get_bits(gb, 2);
+    pulse->num_pulse = get_bits(gb, 2);
     pulse->start = get_bits(gb, 6);
-    for (i = 0; i <= pulse->num_pulse_minus1; i++) {
+    for (i = 0; i <= pulse->num_pulse; i++) {
         pulse->offset[i] = get_bits(gb, 5);
         pulse->amp[i] = get_bits(gb, 4);
     }
@@ -1205,7 +1205,7 @@ static int decode_spectral_data(AACConte
 
 static void pulse_tool(AACContext * ac, const ics_struct * ics, const pulse_struct * pulse, int * icoef) {
     int i, off = ics->swb_offset[pulse->start];
-    for (i = 0; i <= pulse->num_pulse_minus1; i++) {
+    for (i = 0; i <= pulse->num_pulse; i++) {
         off += pulse->offset[i];
         if (icoef[off] > 0)
             icoef[off] += pulse->amp[i];