Make LOCAL_ALIGNED macro fully C99 compatible

[ffmpeg] / libavcodec / ac3.c

diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c
index f0f14e360c2ef1770b898c2de1603c4ca2e7c818..4ab77b84a1661c5958335496382ac332da6c4083 100644 (file)
--- a/libavcodec/ac3.c
+++ b/libavcodec/ac3.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file libavcodec/ac3.c
+ * @file
  * Common code between the AC-3 encoder and decoder.
  */
 
@@ -33,7 +33,7 @@
 /**
  * Starting frequency coefficient bin for each critical band.
  */
-static const uint8_t band_start_tab[51] = {
+static const uint8_t band_start_tab[AC3_CRITICAL_BANDS+1] = {
       0,  1,   2,   3,   4,   5,   6,   7,   8,   9,
      10,  11, 12,  13,  14,  15,  16,  17,  18,  19,
      20,  21, 22,  23,  24,  25,  26,  27,  28,  31,
@@ -42,7 +42,7 @@ static const uint8_t band_start_tab[51] = {
 };
 
 /**
- * Maps each frequency coefficient bin to the critical band that contains it.
+ * Map each frequency coefficient bin to the critical band that contains it.
  */
 static const uint8_t bin_to_band_tab[253] = {
      0,
@@ -112,9 +112,10 @@ void ff_ac3_bit_alloc_calc_psd(int8_t *exp, int start, int end, int16_t *psd,
         int v = psd[bin++];
         int band_end = FFMIN(band_start_tab[band+1], end);
         for (; bin < band_end; bin++) {
+            int max = FFMAX(v, psd[bin]);
             /* logadd */
-            int adr = FFMIN(FFABS(v - psd[bin]) >> 1, 255);
-            v = FFMAX(v, psd[bin]) + ff_ac3_log_add_tab[adr];
+            int adr = FFMIN(max - ((v + psd[bin] + 1) >> 1), 255);
+            v = max + ff_ac3_log_add_tab[adr];
         }
         band_psd[band++] = v;
     } while (end > band_start_tab[band]);
@@ -126,7 +127,7 @@ int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd,
                                uint8_t *dba_lengths, uint8_t *dba_values,
                                int16_t *mask)
 {
-    int16_t excite[50]; /* excitation */
+    int16_t excite[AC3_CRITICAL_BANDS]; /* excitation */
     int band;
     int band_start, band_end, begin, end1;
     int lowcomp, fastleak, slowleak;
@@ -197,7 +198,7 @@ int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd,
         band = 0;
         for (seg = 0; seg < dba_nsegs; seg++) {
             band += dba_offsets[seg];
-            if (band >= 50 || dba_lengths[seg] > 50-band)
+            if (band >= AC3_CRITICAL_BANDS || dba_lengths[seg] > AC3_CRITICAL_BANDS-band)
                 return -1;
             if (dba_values[seg] >= 4) {
                 delta = (dba_values[seg] - 3) << 7;
@@ -220,7 +221,7 @@ void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end,
 
     /* special case, if snr offset is -960, set all bap's to zero */
     if (snr_offset == -960) {
-        memset(bap, 0, 256);
+        memset(bap, 0, AC3_MAX_COEFS);
         return;
     }
 
@@ -228,7 +229,7 @@ void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end,
     band = bin_to_band_tab[start];
     do {
         int m = (FFMAX(mask[band] - snr_offset - floor, 0) & 0x1FE0) + floor;
-        int band_end = FFMIN(bin + ff_ac3_critical_band_size_tab[band], end);
+        int band_end = FFMIN(band_start_tab[band+1], end);
         for (; bin < band_end; bin++) {
             int address = av_clip((psd[bin] - m) >> 5, 0, 63);
             bap[bin] = bap_tab[address];
@@ -245,9 +246,9 @@ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
                                    uint8_t *dba_offsets, uint8_t *dba_lengths,
                                    uint8_t *dba_values)
 {
-    int16_t psd[256];   /* scaled exponents */
-    int16_t band_psd[50]; /* interpolated exponents */
-    int16_t mask[50];   /* masking value */
+    int16_t psd[AC3_MAX_COEFS];           /* scaled exponents */
+    int16_t band_psd[AC3_CRITICAL_BANDS]; /* interpolated exponents */
+    int16_t mask[AC3_CRITICAL_BANDS];   /* masking value */
 
     ff_ac3_bit_alloc_calc_psd(exp, start, end, psd, band_psd);
 
@@ -260,7 +261,7 @@ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
 }
 
 /**
- * Initializes some tables.
+ * Initialize some tables.
  * note: This function must remain thread safe because it is called by the
  *       AVParser init code.
  */
@@ -269,12 +270,12 @@ av_cold void ac3_common_init(void)
 #if !CONFIG_HARDCODED_TABLES
     /* compute bndtab and masktab from bandsz */
     int bin = 0, band;
-    for (band = 0; band < 50; band++) {
+    for (band = 0; band < AC3_CRITICAL_BANDS; band++) {
         int band_end = bin + ff_ac3_critical_band_size_tab[band];
         band_start_tab[band] = bin;
         while (bin < band_end)
             bin_to_band_tab[bin++] = band;
     }
-    band_start_tab[50] = bin;
+    band_start_tab[AC3_CRITICAL_BANDS] = bin;
 #endif /* !CONFIG_HARDCODED_TABLES */
 }