[FFmpeg-cvslog] r20049 - trunk/libavcodec/ac3.c

[jbr]

Author: jbr
Date: Sun Sep 27 08:13:01 2009
New Revision: 20049

Log:
Cosmetics: Rename some variables to be more descriptive of their use.

Modified:
   trunk/libavcodec/ac3.c

Modified: trunk/libavcodec/ac3.c
==============================================================================
--- trunk/libavcodec/ac3.c	Sun Sep 27 08:10:36 2009	(r20048)
+++ trunk/libavcodec/ac3.c	Sun Sep 27 08:13:01 2009	(r20049)
@@ -216,7 +216,7 @@ void ff_ac3_bit_alloc_calc_bap(int16_t *
                                int snr_offset, int floor,
                                const uint8_t *bap_tab, uint8_t *bap)
 {
-    int i, j;
+    int bin, band;
 
     /* special case, if snr offset is -960, set all bap's to zero */
     if (snr_offset == -960) {
@@ -224,16 +224,16 @@ void ff_ac3_bit_alloc_calc_bap(int16_t *
         return;
     }
 
-    i = start;
-    j = bin_to_band_tab[start];
+    bin  = start;
+    band = bin_to_band_tab[start];
     do {
-        int v = (FFMAX(mask[j] - snr_offset - floor, 0) & 0x1FE0) + floor;
-        int end1 = FFMIN(band_start_tab[j] + ff_ac3_critical_band_size_tab[j], end);
-        for (; i < end1; i++) {
-            int address = av_clip((psd[i] - v) >> 5, 0, 63);
-            bap[i] = bap_tab[address];
+        int m = (FFMAX(mask[band] - snr_offset - floor, 0) & 0x1FE0) + floor;
+        int band_end = FFMIN(band_start_tab[band] + ff_ac3_critical_band_size_tab[band], end);
+        for (; bin < band_end; bin++) {
+            int address = av_clip((psd[bin] - m) >> 5, 0, 63);
+            bap[bin] = bap_tab[address];
         }
-    } while (end > band_start_tab[j++]);
+    } while (end > band_start_tab[band++]);
 }
 
 /* AC-3 bit allocation. The algorithm is the one described in the AC-3