Change liba52 and libmad to the original 8-spaced tabbing.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24863 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 114 insertions, 114 deletions

diff --git a/apps/codecs/liba52/bit_allocate.c b/apps/codecs/liba52/bit_allocate.c
index 3f68c92..aaac245 100644
--- a/apps/codecs/liba52/bit_allocate.c
+++ b/apps/codecs/liba52/bit_allocate.c
@@ -68,12 +68,12 @@ static int8_t baptab[305] IDATA_ATTR = {
      0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
      0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
      0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-     0,  0,  0,  0                  /* 148 padding elems */
+     0,  0,  0,  0                                      /* 148 padding elems */
 };
 
 static int bndtab[30] IDATA_ATTR = {21, 22,  23,  24,  25,  26,  27,  28,  31,  34,
-             37, 40,  43,  46,  49,  55,  61,  67,  73,  79,
-             85, 97, 109, 121, 133, 157, 181, 205, 229, 253};
+                         37, 40,  43,  46,  49,  55,  61,  67,  73,  79,
+                         85, 97, 109, 121, 133, 157, 181, 205, 229, 253};
 
 static int8_t latab[256] IDATA_ATTR = {
     -64, -63, -62, -61, -60, -59, -58, -57, -56, -55, -54, -53,
@@ -100,35 +100,35 @@ static int8_t latab[256] IDATA_ATTR = {
       0,   0,   0,   0
 };
 
-#define UPDATE_LEAK()       \
-do {                \
-    fastleak += fdecay;     \
+#define UPDATE_LEAK()           \
+do {                            \
+    fastleak += fdecay;         \
     if (fastleak > psd + fgain) \
-    fastleak = psd + fgain; \
-    slowleak += sdecay;     \
+        fastleak = psd + fgain; \
+    slowleak += sdecay;         \
     if (slowleak > psd + sgain) \
-    slowleak = psd + sgain; \
+        slowleak = psd + sgain; \
 } while (0)
 
-#define COMPUTE_MASK()              \
-do {                        \
-    if (psd > dbknee)               \
-    mask -= (psd - dbknee) >> 2;        \
-    if (mask > hth [i >> halfrate])     \
-    mask = hth [i >> halfrate];     \
-    mask -= snroffset + 128 * deltba[i];    \
-    mask = (mask > 0) ? 0 : ((-mask) >> 5); \
-    mask -= floor;              \
+#define COMPUTE_MASK()                          \
+do {                                            \
+    if (psd > dbknee)                           \
+        mask -= (psd - dbknee) >> 2;            \
+    if (mask > hth [i >> halfrate])             \
+        mask = hth [i >> halfrate];             \
+    mask -= snroffset + 128 * deltba[i];        \
+    mask = (mask > 0) ? 0 : ((-mask) >> 5);     \
+    mask -= floor;                              \
 } while (0)
 
 void a52_bit_allocate (a52_state_t * state, ba_t * ba, int bndstart,
-               int start, int end, int fastleak, int slowleak,
-               expbap_t * expbap)
+                       int start, int end, int fastleak, int slowleak,
+                       expbap_t * expbap)
 {
     static int slowgain[4] = {0x540, 0x4d8, 0x478, 0x410};
     static int dbpbtab[4]  = {0xc00, 0x500, 0x300, 0x100};
     static int floortab[8] = {0x910, 0x950, 0x990, 0x9d0,
-                  0xa10, 0xa90, 0xb10, 0x1400};
+                              0xa10, 0xa90, 0xb10, 0x1400};
 
     int i, j;
     uint8_t * exp;
@@ -141,17 +141,17 @@ void a52_bit_allocate (a52_state_t * state, ba_t * ba, int bndstart,
 
     halfrate = state->halfrate;
     fdecay = (63 + 20 * ((state->bai >> 7) & 3)) >> halfrate;   /* fdcycod */
-    fgain = 128 + 128 * (ba->bai & 7);              /* fgaincod */
-    sdecay = (15 + 2 * (state->bai >> 9)) >> halfrate;      /* sdcycod */
-    sgain = slowgain[(state->bai >> 5) & 3];            /* sgaincod */
-    dbknee = dbpbtab[(state->bai >> 3) & 3];            /* dbpbcod */
+    fgain = 128 + 128 * (ba->bai & 7);                          /* fgaincod */
+    sdecay = (15 + 2 * (state->bai >> 9)) >> halfrate;          /* sdcycod */
+    sgain = slowgain[(state->bai >> 5) & 3];                    /* sgaincod */
+    dbknee = dbpbtab[(state->bai >> 3) & 3];                    /* dbpbcod */
     hth = hthtab[state->fscod];
     /*
      * if there is no delta bit allocation, make deltba point to an area
      * known to contain zeroes. baptab+156 here.
      */
     deltba = (ba->deltbae == DELTA_BIT_NONE) ? baptab + 156 : ba->deltba;
-    floor = floortab[state->bai & 7];               /* floorcod */
+    floor = floortab[state->bai & 7];                           /* floorcod */
     snroffset = 960 - 64 * state->csnroffst - 4 * (ba->bai >> 3) + floor;
     floor >>= 5;
 
@@ -161,105 +161,105 @@ void a52_bit_allocate (a52_state_t * state, ba_t * ba, int bndstart,
     i = bndstart;
     j = start;
     if (start == 0) {   /* not the coupling channel */
-    int lowcomp;
+        int lowcomp;
 
-    lowcomp = 0;
-    j = end - 1;
-    do {
-        if (i < j) {
-        if (exp[i+1] == exp[i] - 2)
-            lowcomp = 384;
-        else if (lowcomp && (exp[i+1] > exp[i]))
-            lowcomp -= 64;
-        }
-        psd = 128 * exp[i];
-        mask = psd + fgain + lowcomp;
-        COMPUTE_MASK ();
-        bap[i] = (baptab+156)[mask + 4 * exp[i]];
-        i++;
-    } while ((i < 3) || ((i < 7) && (exp[i] > exp[i-1])));
-    fastleak = psd + fgain;
-    slowleak = psd + sgain;
+        lowcomp = 0;
+        j = end - 1;
+        do {
+            if (i < j) {
+                if (exp[i+1] == exp[i] - 2)
+                    lowcomp = 384;
+                else if (lowcomp && (exp[i+1] > exp[i]))
+                    lowcomp -= 64;
+            }
+            psd = 128 * exp[i];
+            mask = psd + fgain + lowcomp;
+            COMPUTE_MASK ();
+            bap[i] = (baptab+156)[mask + 4 * exp[i]];
+            i++;
+        } while ((i < 3) || ((i < 7) && (exp[i] > exp[i-1])));
+        fastleak = psd + fgain;
+        slowleak = psd + sgain;
 
-    while (i < 7) {
-        if (i < j) {
-        if (exp[i+1] == exp[i] - 2)
-            lowcomp = 384;
-        else if (lowcomp && (exp[i+1] > exp[i]))
-            lowcomp -= 64;
+        while (i < 7) {
+            if (i < j) {
+                if (exp[i+1] == exp[i] - 2)
+                    lowcomp = 384;
+                else if (lowcomp && (exp[i+1] > exp[i]))
+                    lowcomp -= 64;
+            }
+            psd = 128 * exp[i];
+            UPDATE_LEAK ();
+            mask = ((fastleak + lowcomp < slowleak) ?
+                    fastleak + lowcomp : slowleak);
+            COMPUTE_MASK ();
+            bap[i] = (baptab+156)[mask + 4 * exp[i]];
+            i++;
         }
-        psd = 128 * exp[i];
-        UPDATE_LEAK ();
-        mask = ((fastleak + lowcomp < slowleak) ?
-            fastleak + lowcomp : slowleak);
-        COMPUTE_MASK ();
-        bap[i] = (baptab+156)[mask + 4 * exp[i]];
-        i++;
-    }
 
-    if (end == 7)   /* lfe channel */
-        return;
+        if (end == 7)   /* lfe channel */
+            return;
 
-    do {
-        if (exp[i+1] == exp[i] - 2)
-        lowcomp = 320;
-        else if (lowcomp && (exp[i+1] > exp[i]))
-        lowcomp -= 64;
-        psd = 128 * exp[i];
-        UPDATE_LEAK ();
-        mask = ((fastleak + lowcomp < slowleak) ?
-            fastleak + lowcomp : slowleak);
-        COMPUTE_MASK ();
-        bap[i] = (baptab+156)[mask + 4 * exp[i]];
-        i++;
-    } while (i < 20);
+        do {
+            if (exp[i+1] == exp[i] - 2)
+                lowcomp = 320;
+            else if (lowcomp && (exp[i+1] > exp[i]))
+                lowcomp -= 64;
+            psd = 128 * exp[i];
+            UPDATE_LEAK ();
+            mask = ((fastleak + lowcomp < slowleak) ?
+                    fastleak + lowcomp : slowleak);
+            COMPUTE_MASK ();
+            bap[i] = (baptab+156)[mask + 4 * exp[i]];
+            i++;
+        } while (i < 20);
 
-    while (lowcomp > 128) {     /* two iterations maximum */
-        lowcomp -= 128;
-        psd = 128 * exp[i];
-        UPDATE_LEAK ();
-        mask = ((fastleak + lowcomp < slowleak) ?
-            fastleak + lowcomp : slowleak);
-        COMPUTE_MASK ();
-        bap[i] = (baptab+156)[mask + 4 * exp[i]];
-        i++;
-    }
-    j = i;
+        while (lowcomp > 128) {         /* two iterations maximum */
+            lowcomp -= 128;
+            psd = 128 * exp[i];
+            UPDATE_LEAK ();
+            mask = ((fastleak + lowcomp < slowleak) ?
+                    fastleak + lowcomp : slowleak);
+            COMPUTE_MASK ();
+            bap[i] = (baptab+156)[mask + 4 * exp[i]];
+            i++;
+        }
+        j = i;
     }
 
     do {
-    int startband, endband;
+        int startband, endband;
 
-    startband = j;
-    endband = (bndtab[i-20] < end) ? bndtab[i-20] : end;
-    psd = 128 * exp[j++];
-    while (j < endband) {
-        int next, delta;
+        startband = j;
+        endband = (bndtab[i-20] < end) ? bndtab[i-20] : end;
+        psd = 128 * exp[j++];
+        while (j < endband) {
+            int next, delta;
 
-        next = 128 * exp[j++];
-        delta = next - psd;
-        switch (delta >> 9) {
-        case -6: case -5: case -4: case -3: case -2:
-        psd = next;
-        break;
-        case -1:
-        psd = next + latab[(-delta) >> 1];
-        break;
-        case 0:
-        psd += latab[delta >> 1];
-        break;
+            next = 128 * exp[j++];
+            delta = next - psd;
+            switch (delta >> 9) {
+            case -6: case -5: case -4: case -3: case -2:
+                psd = next;
+                break;
+            case -1:
+                psd = next + latab[(-delta) >> 1];
+                break;
+            case 0:
+                psd += latab[delta >> 1];
+                break;
+            }
         }
-    }
-    /* minpsd = -289 */
-    UPDATE_LEAK ();
-    mask = (fastleak < slowleak) ? fastleak : slowleak;
-    COMPUTE_MASK ();
-    i++;
-    j = startband;
-    do {
-        /* max(mask+4*exp)=147=-(minpsd+fgain-deltba-snroffset)>>5+4*exp */
-        /* min(mask+4*exp)=-156=-(sgain-deltba-snroffset)>>5 */
-        bap[j] = (baptab+156)[mask + 4 * exp[j]];
-    } while (++j < endband);
+        /* minpsd = -289 */
+        UPDATE_LEAK ();
+        mask = (fastleak < slowleak) ? fastleak : slowleak;
+        COMPUTE_MASK ();
+        i++;
+        j = startband;
+        do {
+            /* max(mask+4*exp)=147=-(minpsd+fgain-deltba-snroffset)>>5+4*exp */
+            /* min(mask+4*exp)=-156=-(sgain-deltba-snroffset)>>5 */
+            bap[j] = (baptab+156)[mask + 4 * exp[j]];
+        } while (++j < endband);
     } while (j < end);
 }