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

[andoma]

Author: andoma
Date: Wed Apr  9 09:10:49 2008
New Revision: 2105

Log:
Check pulse.preset in caller instead of pulse_tool(),
also remove memset(&pulse, 0, ...) in favour if just clearing pulse.present.



Modified:
   aac/aac.c

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Wed Apr  9 09:10:49 2008
@@ -1293,7 +1293,6 @@ static int decode_spectral_data(AACConte
 
 static int pulse_tool(AACContext * ac, const ics_struct * ics, const pulse_struct * pulse, int * icoef) {
     int i, off;
-    if (pulse->present) {
         if (ics->window_sequence == EIGHT_SHORT_SEQUENCE) {
             av_log(ac->avccontext, AV_LOG_ERROR, "Pulse tool not allowed in EIGHT SHORT SEUQUENCE\n");
             return -1;
@@ -1306,7 +1305,6 @@ static int pulse_tool(AACContext * ac, c
             else
                 icoef[off] -= pulse->amp[i];
         }
-    }
     return 0;
 }
 
@@ -1358,7 +1356,7 @@ static int decode_ics(AACContext * ac, G
     float * out = sce->coeffs;
     int global_gain;
 
-    memset(&pulse, 0, sizeof(pulse));
+    pulse.present = 0;
     global_gain = get_bits(gb, 8);
 
     if (!common_window && !scale_flag) {
@@ -1388,7 +1386,7 @@ static int decode_ics(AACContext * ac, G
 
     if (decode_spectral_data(ac, gb, ics, sce->cb, icoeffs) < 0)
         return -1;
-    if (pulse_tool(ac, ics, &pulse, icoeffs) < 0)
+    if (pulse.present && pulse_tool(ac, ics, &pulse, icoeffs) < 0)
         return -1;
     quant_to_spec_tool(ac, ics, icoeffs, sce->cb, sce->sf, out);
     return 0;