cosmetics: prettyprinting, K&R style, break overly long lines

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19377 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/aaccoder.c

@@ -49,7 +49,7 @@ static const uint8_t run_value_bits_short[16] = {
     3, 3, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 9
 };
 
-static const uint8_t* run_value_bits[2] = {
+static const uint8_t *run_value_bits[2] = {
     run_value_bits_long, run_value_bits_short
 };
 
@@ -64,7 +64,8 @@ static av_always_inline int quant(float coef, const float Q)
     return pow(coef * Q, 0.75) + 0.4054;
 }
 
-static void quantize_bands(int (*out)[2], const float *in, const float *scaled, int size, float Q34, int is_signed, int maxval)
+static void quantize_bands(int (*out)[2], const float *in, const float *scaled,
+                           int size, float Q34, int is_signed, int maxval)
 {
     int i;
     double qc;
@@ -79,7 +80,7 @@ static void quantize_bands(int (*out)[2], const float *in, const float *scaled,
     }
 }
 
-static void abs_pow34_v(float *out, const float* in, const int size)
+static void abs_pow34_v(float *out, const float *in, const int size)
 {
 #ifndef USE_REALLY_FULL_SEARCH
     int i;
@@ -102,8 +103,10 @@ static const uint8_t aac_cb_maxval[12] = {0, 1, 1, 2, 2, 4, 4, 7, 7, 12, 12, 16}
  *
  * @return quantization distortion
  */
-static float quantize_band_cost(struct AACEncContext *s, const float *in, const float *scaled, int size, int scale_idx, int cb,
-                                 const float lambda, const float uplim, int *bits)
+static float quantize_band_cost(struct AACEncContext *s, const float *in,
+                                const float *scaled, int size, int scale_idx,
+                                int cb, const float lambda, const float uplim,
+                                int *bits)
 {
     const float IQ = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512];
     const float  Q = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512];
@@ -177,7 +180,7 @@ static float quantize_band_cost(struct AACEncContext *s, const float *in, const
                         rd = INFINITY;
                         break;
                     }
-                    if (vec[k] == 64.0f) {//FIXME: slow
+                    if (vec[k] == 64.0f) { //FIXME: slow
                         if (t >= CLIPPED_ESCAPE) {
                             di = t - CLIPPED_ESCAPE;
                             curbits += 21;
@@ -217,8 +220,9 @@ static float quantize_band_cost(struct AACEncContext *s, const float *in, const
     return cost;
 }
 
-static void quantize_and_encode_band(struct AACEncContext *s, PutBitContext *pb, const float *in, int size,
-                                     int scale_idx, int cb, const float lambda)
+static void quantize_and_encode_band(struct AACEncContext *s, PutBitContext *pb,
+                                     const float *in, int size, int scale_idx,
+                                     int cb, const float lambda)
 {
     const float IQ = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512];
     const float  Q = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512];
@@ -292,7 +296,7 @@ static void quantize_and_encode_band(struct AACEncContext *s, PutBitContext *pb,
                         rd = INFINITY;
                         break;
                     }
-                    if (vec[k] == 64.0f) {//FIXME: slow
+                    if (vec[k] == 64.0f) { //FIXME: slow
                         if (t >= CLIPPED_ESCAPE) {
                             di = t - CLIPPED_ESCAPE;
                             curbits += 21;
@@ -430,7 +434,7 @@ static void encode_window_bands_info(AACEncContext *s, SingleChannelElement *sce
             idx = cb;
     }
     ppos = max_sfb;
-    while(ppos > 0) {
+    while (ppos > 0) {
         cb = idx;
         stackrun[stack_len] = path[ppos][cb].run;
         stackcb [stack_len] = cb;
@@ -449,7 +453,7 @@ static void encode_window_bands_info(AACEncContext *s, SingleChannelElement *sce
             sce->band_type[win*16 + start] =  stackcb[i];
             start++;
         }
-        while(count >= run_esc) {
+        while (count >= run_esc) {
             put_bits(&s->pb, run_bits, run_esc);
             count -= run_esc;
         }
@@ -457,8 +461,10 @@ static void encode_window_bands_info(AACEncContext *s, SingleChannelElement *sce
     }
 }
 
-static void encode_window_bands_info_fixed(AACEncContext *s, SingleChannelElement *sce,
-                                           int win, int group_len, const float lambda)
+static void encode_window_bands_info_fixed(AACEncContext *s,
+                                           SingleChannelElement *sce,
+                                           int win, int group_len,
+                                           const float lambda)
 {
     encode_window_bands_info(s, sce, win, group_len, 1.0f);
 }
@@ -472,7 +478,8 @@ typedef struct TrellisPath {
 } TrellisPath;
 
 static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s,
-                                       SingleChannelElement *sce, const float lambda)
+                                       SingleChannelElement *sce,
+                                       const float lambda)
 {
     int q, w, w2, g, start = 0;
     int i;
@@ -503,7 +510,7 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s,
             float qmin, qmax;
             int nz = 0;
 
-            bandaddr[idx >> 8] = w*16+g;
+            bandaddr[idx >> 8] = w * 16 + g;
             qmin = INT_MAX;
             qmax = 0.0f;
             for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) {
@@ -600,7 +607,7 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s,
             minq = idx + i;
         }
     }
-    while(minq >= 256) {
+    while (minq >= 256) {
         sce->sf_idx[bandaddr[minq>>8]] = minq & 0xFF;
         minq = paths[minq].prev;
     }
@@ -614,8 +621,10 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s,
 /**
  * two-loop quantizers search taken from ISO 13818-7 Appendix C
  */
-static void search_for_quantizers_twoloop(AVCodecContext *avctx, AACEncContext *s,
-                                          SingleChannelElement *sce, const float lambda)
+static void search_for_quantizers_twoloop(AVCodecContext *avctx,
+                                          AACEncContext *s,
+                                          SingleChannelElement *sce,
+                                          const float lambda)
 {
     int start = 0, i, w, w2, g;
     int destbits = avctx->bit_rate * 1024.0 / avctx->sample_rate / avctx->channels;
@@ -663,12 +672,12 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, AACEncContext *
     abs_pow34_v(s->scoefs, sce->coeffs, 1024);
     //perform two-loop search
     //outer loop - improve quality
-    do{
+    do {
         int tbits, qstep;
         minscaler = sce->sf_idx[0];
         //inner loop - quantize spectrum to fit into given number of bits
         qstep = its ? 1 : 32;
-        do{
+        do {
             int prev = -1;
             tbits = 0;
             fflag = 0;
@@ -732,7 +741,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, AACEncContext *
             if (!qstep && tbits > destbits*1.02)
                 qstep = 1;
             if (sce->sf_idx[0] >= 217)break;
-        }while(qstep);
+        } while (qstep);
 
         fflag = 0;
         minscaler = av_clip(minscaler, 60, 255 - SCALE_MAX_DIFF);
@@ -749,11 +758,12 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, AACEncContext *
             }
         }
         its++;
-    }while(fflag && its < 10);
+    } while (fflag && its < 10);
 }
 
 static void search_for_quantizers_faac(AVCodecContext *avctx, AACEncContext *s,
-                                       SingleChannelElement *sce, const float lambda)
+                                       SingleChannelElement *sce,
+                                       const float lambda)
 {
     int start = 0, i, w, w2, g;
     float uplim[128], maxq[128];
@@ -917,7 +927,8 @@ static void search_for_quantizers_faac(AVCodecContext *avctx, AACEncContext *s,
 }
 
 static void search_for_quantizers_fast(AVCodecContext *avctx, AACEncContext *s,
-                                       SingleChannelElement *sce, const float lambda)
+                                       SingleChannelElement *sce,
+                                       const float lambda)
 {
     int start = 0, i, w, w2, g;
     int minq = 255;
@@ -949,7 +960,8 @@ static void search_for_quantizers_fast(AVCodecContext *avctx, AACEncContext *s,
                 sce->sf_idx[(w+w2)*16+g] = sce->sf_idx[w*16+g];
 }
 
-static void search_for_ms(AACEncContext *s, ChannelElement *cpe, const float lambda)
+static void search_for_ms(AACEncContext *s, ChannelElement *cpe,
+                          const float lambda)
 {
     int start = 0, i, w, w2, g;
     float M[128], S[128];
@@ -969,7 +981,7 @@ static void search_for_ms(AACEncContext *s, ChannelElement *cpe, const float lam
                     float maxthr = fmaxf(band0->threshold, band1->threshold);
                     for (i = 0; i < sce0->ics.swb_sizes[g]; i++) {
                         M[i] = (sce0->coeffs[start+w2*128+i]
-                              + sce1->coeffs[start+w2*128+i])*0.5;
+                              + sce1->coeffs[start+w2*128+i]) * 0.5;
                         S[i] =  sce0->coeffs[start+w2*128+i]
                               - sce1->coeffs[start+w2*128+i];
                     }

libavcodec/aacenc.c

@@ -353,8 +353,10 @@ static void adjust_frame_information(AACEncContext *apc, ChannelElement *cpe, in
         for (w = 0; w < ics0->num_windows*16; w += 16)
             for (i = 0; i < ics0->max_sfb; i++)
                 if (cpe->ms_mask[w+i]) msc++;
-        if (msc == 0 || ics0->max_sfb == 0) cpe->ms_mode = 0;
-        else cpe->ms_mode = msc < ics0->max_sfb ? 1 : 2;
+        if (msc == 0 || ics0->max_sfb == 0)
+            cpe->ms_mode = 0;
+        else
+            cpe->ms_mode = msc < ics0->max_sfb ? 1 : 2;
     }
 }
 
@@ -373,7 +375,8 @@ static void encode_band_info(AACEncContext *s, SingleChannelElement *sce)
 /**
  * Encode scalefactors.
  */
-static void encode_scale_factors(AVCodecContext *avctx, AACEncContext *s, SingleChannelElement *sce)
+static void encode_scale_factors(AVCodecContext *avctx, AACEncContext *s,
+                                 SingleChannelElement *sce)
 {
     int off = sce->sf_idx[0], diff;
     int i, w;
@@ -382,7 +385,8 @@ static void encode_scale_factors(AVCodecContext *avctx, AACEncContext *s, Single
         for (i = 0; i < sce->ics.max_sfb; i++) {
             if (!sce->zeroes[w*16 + i]) {
                 diff = sce->sf_idx[w*16 + i] - off + SCALE_DIFF_ZERO;
-                if (diff < 0 || diff > 120) av_log(avctx, AV_LOG_ERROR, "Scalefactor difference is too big to be coded\n");
+                if (diff < 0 || diff > 120)
+                    av_log(avctx, AV_LOG_ERROR, "Scalefactor difference is too big to be coded\n");
                 off = sce->sf_idx[w*16 + i];
                 put_bits(&s->pb, ff_aac_scalefactor_bits[diff], ff_aac_scalefactor_code[diff]);
             }
@@ -398,7 +402,8 @@ static void encode_pulses(AACEncContext *s, Pulse *pulse)
     int i;
 
     put_bits(&s->pb, 1, !!pulse->num_pulse);
-    if (!pulse->num_pulse) return;
+    if (!pulse->num_pulse)
+        return;
 
     put_bits(&s->pb, 2, pulse->num_pulse - 1);
     put_bits(&s->pb, 6, pulse->start);
@@ -437,10 +442,13 @@ static void encode_spectral_coeffs(AACEncContext *s, SingleChannelElement *sce)
 /**
  * Encode one channel of audio data.
  */
-static int encode_individual_channel(AVCodecContext *avctx, AACEncContext *s, SingleChannelElement *sce, int common_window)
+static int encode_individual_channel(AVCodecContext *avctx, AACEncContext *s,
+                                     SingleChannelElement *sce,
+                                     int common_window)
 {
     put_bits(&s->pb, 8, sce->sf_idx[0]);
-    if (!common_window) put_ics_info(s, &sce->ics);
+    if (!common_window)
+        put_ics_info(s, &sce->ics);
     encode_band_info(s, sce);
     encode_scale_factors(avctx, s, sce);
     encode_pulses(s, &sce->pulse);
@@ -453,7 +461,8 @@ static int encode_individual_channel(AVCodecContext *avctx, AACEncContext *s, Si
 /**
  * Write some auxiliary information about the created AAC file.
  */
-static void put_bitstream_info(AVCodecContext *avctx, AACEncContext *s, const char *name)
+static void put_bitstream_info(AVCodecContext *avctx, AACEncContext *s,
+                               const char *name)
 {
     int i, namelen, padbits;
 
@@ -484,20 +493,23 @@ static int aac_encode_frame(AVCodecContext *avctx,
         return 0;
     if (data) {
         if (!s->psypp) {
-            memcpy(s->samples + 1024 * avctx->channels, data, 1024 * avctx->channels * sizeof(s->samples[0]));
+            memcpy(s->samples + 1024 * avctx->channels, data,
+                   1024 * avctx->channels * sizeof(s->samples[0]));
         } else {
             start_ch = 0;
             samples2 = s->samples + 1024 * avctx->channels;
             for (i = 0; i < chan_map[0]; i++) {
                 tag = chan_map[i+1];
                 chans = tag == TYPE_CPE ? 2 : 1;
-                ff_psy_preprocess(s->psypp, (uint16_t*)data + start_ch, samples2 + start_ch, start_ch, chans);
+                ff_psy_preprocess(s->psypp, (uint16_t*)data + start_ch,
+                                  samples2 + start_ch, start_ch, chans);
                 start_ch += chans;
             }
         }
     }
     if (!avctx->frame_number) {
-        memcpy(s->samples, s->samples + 1024 * avctx->channels, 1024 * avctx->channels * sizeof(s->samples[0]));
+        memcpy(s->samples, s->samples + 1024 * avctx->channels,
+               1024 * avctx->channels * sizeof(s->samples[0]));
         return 0;
     }
 
@@ -577,12 +589,14 @@ static int aac_encode_frame(AVCodecContext *avctx,
     }
 
     if (avctx->frame_bits > 6144*avctx->channels) {
-        av_log(avctx, AV_LOG_ERROR, "input buffer violation %d > %d.\n", avctx->frame_bits, 6144*avctx->channels);
+        av_log(avctx, AV_LOG_ERROR, "input buffer violation %d > %d.\n",
+               avctx->frame_bits, 6144*avctx->channels);
     }
 
     if (!data)
         s->last_frame = 1;
-    memcpy(s->samples, s->samples + 1024 * avctx->channels, 1024 * avctx->channels * sizeof(s->samples[0]));
+    memcpy(s->samples, s->samples + 1024 * avctx->channels,
+           1024 * avctx->channels * sizeof(s->samples[0]));
     return put_bits_count(&s->pb)>>3;
 }
 

libavcodec/aacpsy.c

@@ -255,8 +255,8 @@ static FFPsyWindowInfo psy_3gpp_window(FFPsyContext *ctx,
 /**
  * Calculate band thresholds as suggested in 3GPP TS26.403
  */
-static void psy_3gpp_analyze(FFPsyContext *ctx, int channel, const float *coefs,
-                             FFPsyWindowInfo *wi)
+static void psy_3gpp_analyze(FFPsyContext *ctx, int channel,
+                             const float *coefs, FFPsyWindowInfo *wi)
 {
     Psy3gppContext *pctx = (Psy3gppContext*) ctx->model_priv_data;
     Psy3gppChannel *pch  = &pctx->ch[channel];