8 files changed, 53 insertions, 53 deletions

diff --git a/apps/codecs/libfaad/hcr.c b/apps/codecs/libfaad/hcr.c
index f2766c38e1..f968ea7bec 100644
--- a/apps/codecs/libfaad/hcr.c
+++ b/apps/codecs/libfaad/hcr.c
@@ -78,7 +78,7 @@ typedef struct
 {
     uint8_t     cb;
     uint8_t     decoded;
-    uint16_t    sp_offset;
+    uint16_t    sp_offset;
     bits_t      bits;
 } codeword_t;
 
diff --git a/apps/codecs/libfaad/huffman.c b/apps/codecs/libfaad/huffman.c
index 8b9e27b553..c142ad7ac7 100644
--- a/apps/codecs/libfaad/huffman.c
+++ b/apps/codecs/libfaad/huffman.c
@@ -124,7 +124,7 @@ static INLINE int16_t huffman_getescape(bitfile *ld, int16_t sp)
 {
     uint8_t neg, i;
     int16_t j;
-        int16_t off;
+    int16_t off;
 
     if (sp < 0)
     {
@@ -500,14 +500,14 @@ int8_t huffman_spectral_data_2(uint8_t cb, bits_t *ld, int16_t *sp)
         break;
     }
 
-        /* decode sign bits */
+    /* decode sign bits */
     if (unsigned_cb[cb])
     {
         for(i = 0; i < ((cb < FIRST_PAIR_HCB) ? QUAD_LEN : PAIR_LEN); i++)
         {
             if(sp[i])
             {
-                uint8_t b;
+                uint8_t b;
                 if ( get1bit_hcr(ld, &b) ) return -1;
                 if (b != 0) {
                     sp[i] = -sp[i];
diff --git a/apps/codecs/libfaad/sbr_dct.c b/apps/codecs/libfaad/sbr_dct.c
index dbfbb8945c..c916a82a61 100644
--- a/apps/codecs/libfaad/sbr_dct.c
+++ b/apps/codecs/libfaad/sbr_dct.c
@@ -1489,7 +1489,7 @@ static void fft_dif(real_t * Real, real_t * Imag)
     // First 2 stages of 32 point FFT decimation in frequency
     // 4*16*2=64*2=128 multiplications
     // 6*16*2=96*2=192 additions
-        // Stage 1 of 32 point FFT decimation in frequency
+    // Stage 1 of 32 point FFT decimation in frequency
     for (i = 0; i < 16; i++)
     {
         point1_real = Real[i];
@@ -1519,7 +1519,7 @@ static void fft_dif(real_t * Real, real_t * Imag)
         w_real = w_array_real[w_index];
         w_imag = w_array_imag[w_index];
 
-        i = j;
+        i = j;
         point1_real = Real[i];
         point1_imag = Imag[i];
         i2 = i+8;
@@ -1818,9 +1818,9 @@ void dct4_kernel(real_t * in_real, real_t * in_imag, real_t * out_real, real_t *
     // 3*32=96 additions
     for (i = 0; i < 32; i++)
     {
-        real_t x_re, x_im, tmp;
-        x_re = in_real[i];
-        x_im = in_imag[i];
+        real_t x_re, x_im, tmp;
+        x_re = in_real[i];
+        x_im = in_imag[i];
         tmp =        MUL_C(x_re + x_im, dct4_64_tab[i]);
         in_real[i] = MUL_C(x_im, dct4_64_tab[i + 64]) + tmp;
         in_imag[i] = MUL_C(x_re, dct4_64_tab[i + 32]) + tmp;
@@ -1834,10 +1834,10 @@ void dct4_kernel(real_t * in_real, real_t * in_imag, real_t * out_real, real_t *
     // 3*31+2=95 additions
     for (i = 0; i < 16; i++)
     {
-        real_t x_re, x_im, tmp;
-        i_rev = bit_rev_tab[i];
-        x_re = in_real[i_rev];
-        x_im = in_imag[i_rev];
+        real_t x_re, x_im, tmp;
+        i_rev = bit_rev_tab[i];
+        x_re = in_real[i_rev];
+        x_im = in_imag[i_rev];
 
         tmp =         MUL_C(x_re + x_im, dct4_64_tab[i + 3*32]);
         out_real[i] = MUL_C(x_im, dct4_64_tab[i + 5*32]) + tmp;
@@ -1848,10 +1848,10 @@ void dct4_kernel(real_t * in_real, real_t * in_imag, real_t * out_real, real_t *
     out_real[16] = MUL_C(in_real[1] + in_imag[1], dct4_64_tab[16 + 3*32]);
     for (i = 17; i < 32; i++)
     {
-        real_t x_re, x_im, tmp;
-        i_rev = bit_rev_tab[i];
-        x_re = in_real[i_rev];
-        x_im = in_imag[i_rev];
+        real_t x_re, x_im, tmp;
+        i_rev = bit_rev_tab[i];
+        x_re = in_real[i_rev];
+        x_im = in_imag[i_rev];
         tmp =         MUL_C(x_re + x_im, dct4_64_tab[i + 3*32]);
         out_real[i] = MUL_C(x_im, dct4_64_tab[i + 5*32]) + tmp;
         out_imag[i] = MUL_C(x_re, dct4_64_tab[i + 4*32]) + tmp;
diff --git a/apps/codecs/libfaad/sbr_dec.c b/apps/codecs/libfaad/sbr_dec.c
index c18ea454d5..97f1d9b647 100644
--- a/apps/codecs/libfaad/sbr_dec.c
+++ b/apps/codecs/libfaad/sbr_dec.c
@@ -50,7 +50,7 @@ static void sbr_save_matrix(sbr_info *sbr, uint8_t ch);
 sbr_info *sbrDecodeInit(uint16_t framelength, uint8_t id_aac,
                         uint32_t sample_rate, uint8_t downSampledSBR
 #ifdef DRM
-                                                , uint8_t IsDRM
+                        , uint8_t IsDRM
 #endif
                         )
 {
diff --git a/apps/codecs/libfaad/sbr_hfadj.c b/apps/codecs/libfaad/sbr_hfadj.c
index 374d16f443..453180d544 100644
--- a/apps/codecs/libfaad/sbr_hfadj.c
+++ b/apps/codecs/libfaad/sbr_hfadj.c
@@ -1561,7 +1561,7 @@ static void hf_assembly(sbr_info *sbr, sbr_hfadj_info *adj,
 #ifndef SBR_LOW_POWER
                 if (h_SL != 0)
                 {
-                        uint8_t ri = sbr->GQ_ringbuf_index[ch];
+                    uint8_t ri = sbr->GQ_ringbuf_index[ch];
                     for (n = 0; n <= 4; n++)
                     {
                         real_t curr_h_smooth = h_smooth[n];
diff --git a/apps/codecs/libfaad/sbr_hfgen.c b/apps/codecs/libfaad/sbr_hfgen.c
index f77bbd052f..63a2fce855 100644
--- a/apps/codecs/libfaad/sbr_hfgen.c
+++ b/apps/codecs/libfaad/sbr_hfgen.c
@@ -128,20 +128,20 @@ void hf_generation(sbr_info *sbr, qmf_t Xlow[MAX_NTSRHFG][64],
                 a1_i = MUL_C(IM(alpha_1[p]), bw2);
 #endif
 
-                temp2_r = QMF_RE(Xlow[first - 2 + offset][p]);
-                temp3_r = QMF_RE(Xlow[first - 1 + offset][p]);
+                temp2_r = QMF_RE(Xlow[first - 2 + offset][p]);
+                temp3_r = QMF_RE(Xlow[first - 1 + offset][p]);
 #ifndef SBR_LOW_POWER
-                temp2_i = QMF_IM(Xlow[first - 2 + offset][p]);
-                temp3_i = QMF_IM(Xlow[first - 1 + offset][p]);
+                temp2_i = QMF_IM(Xlow[first - 2 + offset][p]);
+                temp3_i = QMF_IM(Xlow[first - 1 + offset][p]);
 #endif
-                                for (l = first; l < last; l++)
+                for (l = first; l < last; l++)
                 {
-                        temp1_r = temp2_r;
-                        temp2_r = temp3_r;
-                        temp3_r = QMF_RE(Xlow[l + offset][p]);
+                    temp1_r = temp2_r;
+                    temp2_r = temp3_r;
+                    temp3_r = QMF_RE(Xlow[l + offset][p]);
 #ifndef SBR_LOW_POWER
-                        temp1_i = temp2_i;
-                        temp2_i = temp3_i;
+                    temp1_i = temp2_i;
+                    temp2_i = temp3_i;
                     temp3_i = QMF_IM(Xlow[l + offset][p]);
 #endif
 
@@ -303,10 +303,10 @@ static void auto_correlation(sbr_info *sbr, acorr_coef *ac, qmf_t buffer[MAX_NTS
 
     for (j = offset; j < len + offset; j++)
     {
-        temp1_r = temp2_r; // temp1_r = (QMF_RE(buffer[offset-2][bd] + (1<<(exp-1))) >> exp;
-        temp1_i = temp2_i; // temp1_i = (QMF_IM(buffer[offset-2][bd] + (1<<(exp-1))) >> exp;
-        temp2_r = temp3_r; // temp2_r = (QMF_RE(buffer[offset-1][bd] + (1<<(exp-1))) >> exp;
-        temp2_i = temp3_i; // temp2_i = (QMF_IM(buffer[offset-1][bd] + (1<<(exp-1))) >> exp;
+        temp1_r = temp2_r; // temp1_r = (QMF_RE(buffer[offset-2][bd] + (1<<(exp-1))) >> exp;
+        temp1_i = temp2_i; // temp1_i = (QMF_IM(buffer[offset-2][bd] + (1<<(exp-1))) >> exp;
+        temp2_r = temp3_r; // temp2_r = (QMF_RE(buffer[offset-1][bd] + (1<<(exp-1))) >> exp;
+        temp2_i = temp3_i; // temp2_i = (QMF_IM(buffer[offset-1][bd] + (1<<(exp-1))) >> exp;
         temp3_r = (QMF_RE(buffer[j][bd]) + pow2_to_exp) >> exp;
         temp3_i = (QMF_IM(buffer[j][bd]) + pow2_to_exp) >> exp;
         r01r += MUL_R(temp3_r, temp2_r) + MUL_R(temp3_i, temp2_i);
@@ -352,10 +352,10 @@ static void auto_correlation(sbr_info *sbr, acorr_coef *ac, qmf_t buffer[MAX_NTS
 
     for (j = offset; j < len + offset; j++)
     {
-        temp1_r = temp2_r; // temp1_r = QMF_RE(buffer[j-2][bd];
-        temp1_i = temp2_i; // temp1_i = QMF_IM(buffer[j-2][bd];
-        temp2_r = temp3_r; // temp2_r = QMF_RE(buffer[j-1][bd];
-        temp2_i = temp3_i; // temp2_i = QMF_IM(buffer[j-1][bd];
+        temp1_r = temp2_r; // temp1_r = QMF_RE(buffer[j-2][bd];
+        temp1_i = temp2_i; // temp1_i = QMF_IM(buffer[j-2][bd];
+        temp2_r = temp3_r; // temp2_r = QMF_RE(buffer[j-1][bd];
+        temp2_i = temp3_i; // temp2_i = QMF_IM(buffer[j-1][bd];
         temp3_r = QMF_RE(buffer[j][bd]);
         temp3_i = QMF_IM(buffer[j][bd]);
         r01r += temp3_r * temp2_r + temp3_i * temp2_i;
diff --git a/apps/codecs/libfaad/sbr_qmf.c b/apps/codecs/libfaad/sbr_qmf.c
index 540332bdcb..5486cd283d 100644
--- a/apps/codecs/libfaad/sbr_qmf.c
+++ b/apps/codecs/libfaad/sbr_qmf.c
@@ -42,12 +42,12 @@ qmfa_info *qmfa_init(uint8_t channels)
 {
     qmfa_info *qmfa = (qmfa_info*)faad_malloc(sizeof(qmfa_info));
 
-        /* x is implemented as double ringbuffer */
+    /* x is implemented as double ringbuffer */
     qmfa->x = (real_t*)faad_malloc(2 * channels * 10 * sizeof(real_t));
     memset(qmfa->x, 0, 2 * channels * 10 * sizeof(real_t));
 
-        /* ringbuffer index */
-        qmfa->x_index = 0;
+    /* ringbuffer index */
+    qmfa->x_index = 0;
 
     qmfa->channels = channels;
 
@@ -81,7 +81,7 @@ void sbr_qmf_analysis_32(sbr_info *sbr, qmfa_info *qmfa, const real_t *input,
         int16_t n;
 
         /* shift input buffer x */
-                /* input buffer is not shifted anymore, x is implemented as double ringbuffer */
+        /* input buffer is not shifted anymore, x is implemented as double ringbuffer */
         //memmove(qmfa->x + 32, qmfa->x, (320-32)*sizeof(real_t));
 
         /* add new samples to input buffer x */
@@ -104,10 +104,10 @@ void sbr_qmf_analysis_32(sbr_info *sbr, qmfa_info *qmfa, const real_t *input,
                 MUL_F(qmfa->x[qmfa->x_index + n + 256], qmf_c[2*(n + 256)]);
         }
 
-                /* update ringbuffer index */
-                qmfa->x_index -= 32;
-                if (qmfa->x_index < 0)
-                        qmfa->x_index = (320-32);
+        /* update ringbuffer index */
+        qmfa->x_index -= 32;
+        if (qmfa->x_index < 0)
+            qmfa->x_index = (320-32);
 
         /* calculate 32 subband samples by introducing X */
 #ifdef SBR_LOW_POWER
@@ -224,7 +224,7 @@ qmfs_info *qmfs_init(uint8_t channels)
 {
     qmfs_info *qmfs = (qmfs_info*)faad_malloc(sizeof(qmfs_info));
 
-        /* v is a double ringbuffer */
+    /* v is a double ringbuffer */
     qmfs->v = (real_t*)faad_malloc(2 * channels * 20 * sizeof(real_t));
     memset(qmfs->v, 0, 2 * channels * 20 * sizeof(real_t));
 
@@ -483,8 +483,8 @@ void sbr_qmf_synthesis_64(sbr_info *sbr, qmfs_info *qmfs, qmf_t X[MAX_NTSRHFG][6
     for (l = 0; l < sbr->numTimeSlotsRate; l++)
     {
         /* shift buffer v */
-                /* buffer is not shifted, we use double ringbuffer */
-                //memmove(qmfs->v + 128, qmfs->v, (1280-128)*sizeof(real_t));
+        /* buffer is not shifted, we use double ringbuffer */
+        //memmove(qmfs->v + 128, qmfs->v, (1280-128)*sizeof(real_t));
 
         /* calculate 128 samples */
 #ifndef FIXED_POINT
diff --git a/apps/codecs/libfaad/sbr_syntax.c b/apps/codecs/libfaad/sbr_syntax.c
index 267e954a2e..eff26e9f46 100644
--- a/apps/codecs/libfaad/sbr_syntax.c
+++ b/apps/codecs/libfaad/sbr_syntax.c
@@ -337,16 +337,16 @@ static uint8_t sbr_data(bitfile *ld, sbr_info *sbr)
     switch (sbr->id_aac)
     {
     case ID_SCE:
-                if ((result = sbr_single_channel_element(ld, sbr)) > 0)
-                        return result;
+        if ((result = sbr_single_channel_element(ld, sbr)) > 0)
+            return result;
         break;
     case ID_CPE:
-                if ((result = sbr_channel_pair_element(ld, sbr)) > 0)
-                        return result;
+        if ((result = sbr_channel_pair_element(ld, sbr)) > 0)
+            return result;
         break;
     }
 
-        return 0;
+    return 0;
 }
 
 /* table 5 */