History

Formatting K&R fixes

Originally committed as revision 19732 to svn://svn.ffmpeg.org/ffmpeg/trunk

Vitor Sessak committed 17 years ago

Commit bf8202f1 parent 9263a051 file · +51 −51Browse files

Unified · Split

libavcodec/twinvq.c+51−51
@@ -234,7 +234,7 @@ static float eval_lpc_spectrum(const float *lsp, float cos_val, int order) · 233 unmodified lines
234234 float q = 0.5f;
235235 float two_cos_w = 2.0f*cos_val;
236236
237− for (j=0; j + 1 < order; j += 2*2) {
237+ for (j = 0; j + 1 < order; j += 2*2) {
238238 // Unroll the loop once since order is a multiple of four
239239 q *= lsp[j ] - two_cos_w;
240240 p *= lsp[j+1] - two_cos_w;
@@ -258,7 +258,7 @@ static void eval_lpcenv(TwinContext *tctx, const float *cos_vals, float *lpc) · 17 unmodified lines
258258 const ModeTab *mtab = tctx->mtab;
259259 int size_s = mtab->size / mtab->fmode[FT_SHORT].sub;
260260
261− for (i=0; i < size_s/2; i++) {
261+ for (i = 0; i < size_s/2; i++) {
262262 float cos_i = tctx->cos_tabs[0][i];
263263 lpc[i] = eval_lpc_spectrum(cos_vals, cos_i, mtab->n_lsp);
264264 lpc[size_s-i-1] = eval_lpc_spectrum(cos_vals, -cos_i, mtab->n_lsp);
@@ -270,7 +270,7 @@ static void interpolate(float *out, float v1, float v2, int size) · 5 unmodified lines
270270 int i;
271271 float step = (v1 - v2)/(size + 1);
272272
273− for (i=0; i < size; i++) {
273+ for (i = 0; i < size; i++) {
274274 v2 += step;
275275 out[i] = v2;
276276 }
@@ -306,14 +306,14 @@ static inline void eval_lpcenv_or_interp(TwinContext *tctx, · 29 unmodified lines
306306 const float *cos_tab = tctx->cos_tabs[ftype];
307307
308308 // Fill the 's'
309− for (i=0; i < size; i += step)
309+ for (i = 0; i < size; i += step)
310310 out[i] =
311311 eval_lpc_spectrum(in,
312312 get_cos(i, part, cos_tab, size),
313313 mtab->n_lsp);
314314
315315 // Fill the 'iiiibiiii'
316− for (i=step; i <= size - 2*step; i += step) {
316+ for (i = step; i <= size - 2*step; i += step) {
317317 if (out[i + step] + out[i - step] > 1.95*out[i] ||
318318 out[i + step] >= out[i - step]) {
319319 interpolate(out + i - step + 1, out[i], out[i-step], step - 1);
@@ -354,7 +354,7 @@ static void dequant(TwinContext *tctx, GetBitContext *gb, float *out, · 34 unmodified lines
354354 int pos = 0;
355355 int i, j;
356356
357− for (i=0; i < tctx->n_div[ftype]; i++) {
357+ for (i = 0; i < tctx->n_div[ftype]; i++) {
358358 int tmp0, tmp1;
359359 int sign0 = 1;
360360 int sign1 = 1;
@@ -383,7 +383,7 @@ static void dequant(TwinContext *tctx, GetBitContext *gb, float *out, · 22 unmodified lines
383383 tab0 = cb0 + tmp0*cb_len;
384384 tab1 = cb1 + tmp1*cb_len;
385385
386− for (j=0; j < length; j++)
386+ for (j = 0; j < length; j++)
387387 out[tctx->permut[ftype][pos+j]] = sign0*tab0[j] + sign1*tab1[j];
388388
389389 pos += length;
@@ -447,18 +447,18 @@ static void add_peak(int period, int width, const float *shape, · 57 unmodified lines
447447 int center;
448448
449449 // First peak centered around zero
450− for (i=0; i < width/2; i++)
450+ for (i = 0; i < width/2; i++)
451451 speech[i] += ppc_gain * *shape++;
452452
453− for (i=1; i < ROUNDED_DIV(len,width) ; i++) {
453+ for (i = 1; i < ROUNDED_DIV(len,width) ; i++) {
454454 center = very_broken_op(period, i);
455− for (j=-width/2; j < (width+1)/2; j++)
455+ for (j = -width/2; j < (width+1)/2; j++)
456456 speech[j+center] += ppc_gain * *shape++;
457457 }
458458
459459 // For the last block, be careful not to go beyond the end of the buffer
460460 center = very_broken_op(period, i);
461− for (j=-width/2; j < (width + 1)/2 && shape < shape_end; j++)
461+ for (j = -width/2; j < (width + 1)/2 && shape < shape_end; j++)
462462 speech[j+center] += ppc_gain * *shape++;
463463 }
464464
@@ -497,17 +497,17 @@ static void dec_gain(TwinContext *tctx, GetBitContext *gb, enum FrameType ftype, · 32 unmodified lines
497497 float sub_step = SUB_AMP_MAX / ((1 << SUB_GAIN_BITS) - 1);
498498
499499 if (ftype == FT_LONG) {
500− for (i=0; i < tctx->avctx->channels; i++)
500+ for (i = 0; i < tctx->avctx->channels; i++)
501501 out[i] = (1./(1<<13)) *
502502 mulawinv(step * 0.5 + step * get_bits(gb, GAIN_BITS),
503503 AMP_MAX, MULAW_MU);
504504 } else {
505− for (i=0; i < tctx->avctx->channels; i++) {
505+ for (i = 0; i < tctx->avctx->channels; i++) {
506506 float val = (1./(1<<23)) *
507507 mulawinv(step * 0.5 + step * get_bits(gb, GAIN_BITS),
508508 AMP_MAX, MULAW_MU);
509509
510− for (j=0; j < sub; j++) {
510+ for (j = 0; j < sub; j++) {
511511 out[i*sub + j] =
512512 val*mulawinv(sub_step* 0.5 +
513513 sub_step* get_bits(gb, SUB_GAIN_BITS),
@@ -527,7 +527,7 @@ static void rearrange_lsp(int order, float *lsp, float min_dist) · 13 unmodified lines
527527 {
528528 int i;
529529 float min_dist2 = min_dist * 0.5;
530− for (i=1; i < order; i++)
530+ for (i = 1; i < order; i++)
531531 if (lsp[i] - lsp[i-1] < min_dist) {
532532 float avg = (lsp[i] + lsp[i-1]) * 0.5;
533533
@@ -542,8 +542,8 @@ static void bubblesort(float *lsp, int lp_order) · 8 unmodified lines
542542
543543 /* sort lsp in ascending order. float bubble agorithm,
544544 O(n) if data already sorted, O(n^2) - otherwise */
545− for (i=0; i < lp_order - 1; i++)
546− for (j=i; j >= 0 && lsp[j] > lsp[j+1]; j--)
545+ for (i = 0; i < lp_order - 1; i++)
546+ for (j = i; j >= 0 && lsp[j] > lsp[j+1]; j--)
547547 FFSWAP(float, lsp[j], lsp[j+1]);
548548 }
549549
@@ -564,8 +564,8 @@ static void decode_lsp(TwinContext *tctx, int lpc_idx1, uint8_t *lpc_idx2, · 14 unmodified lines
564564 0
565565 };
566566
567− j=0;
568− for (i=0; i < mtab->lsp_split; i++) {
567+ j = 0;
568+ for (i = 0; i < mtab->lsp_split; i++) {
569569 int chunk_end = ((i + 1)*mtab->n_lsp + funny_rounding[i])/mtab->lsp_split;
570570 for (; j < chunk_end; j++)
571571 lsp[j] = cb [lpc_idx1 * mtab->n_lsp + j] +
@@ -574,7 +574,7 @@ static void decode_lsp(TwinContext *tctx, int lpc_idx1, uint8_t *lpc_idx2, · 2 unmodified lines
574574
575575 rearrange_lsp(mtab->n_lsp, lsp, 0.0001);
576576
577− for (i=0; i < mtab->n_lsp; i++) {
577+ for (i = 0; i < mtab->n_lsp; i++) {
578578 float tmp1 = 1. - cb3[lpc_hist_idx*mtab->n_lsp + i];
579579 float tmp2 = hist[i] * cb3[lpc_hist_idx*mtab->n_lsp + i];
580580 hist[i] = lsp[i];
@@ -592,7 +592,7 @@ static void dec_lpc_spectrum_inv(TwinContext *tctx, float *lsp, · 11 unmodified lines
592592 int i;
593593 int size = tctx->mtab->size / tctx->mtab->fmode[ftype].sub;
594594
595− for (i=0; i < tctx->mtab->n_lsp; i++)
595+ for (i = 0; i < tctx->mtab->n_lsp; i++)
596596 lsp[i] = 2*cos(lsp[i]);
597597
598598 switch (ftype) {
@@ -633,7 +633,7 @@ static void imdct_and_window(TwinContext *tctx, enum FrameType ftype, int wtype, · 34 unmodified lines
633633 first_wsize = wsize;
634634 prev_buf = prev + (size - bsize)/2;
635635
636− for (j=0; j < mtab->fmode[ftype].sub; j++) {
636+ for (j = 0; j < mtab->fmode[ftype].sub; j++) {
637637 int sub_wtype = ftype == FT_MEDIUM ? 8 : wtype;
638638
639639 if (!j && wtype == 4)
@@ -670,7 +670,7 @@ static void imdct_output(TwinContext *tctx, enum FrameType ftype, int wtype, · 30 unmodified lines
670670 float *prev_buf = tctx->prev_frame + tctx->last_block_pos[0];
671671 int i, j;
672672
673− for (i=0; i < tctx->avctx->channels; i++) {
673+ for (i = 0; i < tctx->avctx->channels; i++) {
674674 imdct_and_window(tctx, ftype, wtype,
675675 tctx->spectrum + i*mtab->size,
676676 prev_buf + 2*i*mtab->size,
@@ -678,13 +678,13 @@ static void imdct_output(TwinContext *tctx, enum FrameType ftype, int wtype, · 1 unmodified line
678678 }
679679
680680 if (tctx->avctx->channels == 2) {
681− for (i=0; i < mtab->size - tctx->last_block_pos[0]; i++) {
681+ for (i = 0; i < mtab->size - tctx->last_block_pos[0]; i++) {
682682 float f1 = prev_buf[ i];
683683 float f2 = prev_buf[2*mtab->size + i];
684684 out[2*i ] = f1 + f2;
685685 out[2*i + 1] = f1 - f2;
686686 }
687− for (j=0; i < mtab->size; j++,i++) {
687+ for (j = 0; i < mtab->size; j++,i++) {
688688 float f1 = tctx->curr_frame[ j];
689689 float f2 = tctx->curr_frame[2*mtab->size + j];
690690 out[2*i ] = f1 + f2;
@@ -713,8 +713,8 @@ static void dec_bark_env(TwinContext *tctx, const uint8_t *in, int use_hist, · 22 unmodified lines
713713 int fw_cb_len = mtab->fmode[ftype].bark_env_size / bark_n_coef;
714714 int idx = 0;
715715
716− for (i=0; i < fw_cb_len; i++)
717− for (j=0; j < bark_n_coef; j++, idx++) {
716+ for (i = 0; i < fw_cb_len; i++)
717+ for (j = 0; j < bark_n_coef; j++, idx++) {
718718 float tmp2 =
719719 mtab->fmode[ftype].bark_cb[fw_cb_len*in[j] + i] * (1./4096);
720720 float st = use_hist ?
@@ -751,23 +751,23 @@ static void read_and_decode_spectrum(TwinContext *tctx, GetBitContext *gb, · 30 unmodified lines
751751 mtab->fmode[ftype].cb0, mtab->fmode[ftype].cb1,
752752 mtab->fmode[ftype].cb_len_read);
753753
754− for (i=0; i < channels; i++)
755− for (j=0; j < sub; j++)
756− for (k=0; k < mtab->fmode[ftype].bark_n_coef; k++)
754+ for (i = 0; i < channels; i++)
755+ for (j = 0; j < sub; j++)
756+ for (k = 0; k < mtab->fmode[ftype].bark_n_coef; k++)
757757 bark1[i][j][k] =
758758 get_bits(gb, mtab->fmode[ftype].bark_n_bit);
759759
760− for (i=0; i < channels; i++)
761− for (j=0; j < sub; j++)
760+ for (i = 0; i < channels; i++)
761+ for (j = 0; j < sub; j++)
762762 bark_use_hist[i][j] = get_bits1(gb);
763763
764764 dec_gain(tctx, gb, ftype, gain);
765765
766− for (i=0; i < channels; i++) {
766+ for (i = 0; i < channels; i++) {
767767 lpc_hist_idx[i] = get_bits(gb, tctx->mtab->lsp_bit0);
768768 lpc_idx1 [i] = get_bits(gb, tctx->mtab->lsp_bit1);
769769
770− for (j=0; j < tctx->mtab->lsp_split; j++)
770+ for (j = 0; j < tctx->mtab->lsp_split; j++)
771771 lpc_idx2[i][j] = get_bits(gb, tctx->mtab->lsp_bit2);
772772 }
773773
@@ -778,11 +778,11 @@ static void read_and_decode_spectrum(TwinContext *tctx, GetBitContext *gb, · 4 unmodified lines
778778 mtab->ppc_shape_cb + cb_len_p*PPC_SHAPE_CB_SIZE, cb_len_p);
779779 }
780780
781− for (i=0; i < channels; i++) {
781+ for (i = 0; i < channels; i++) {
782782 float *chunk = out + mtab->size * i;
783783 float lsp[tctx->mtab->n_lsp];
784784
785− for (j=0; j < sub; j++) {
785+ for (j = 0; j < sub; j++) {
786786 dec_bark_env(tctx, bark1[i][j], bark_use_hist[i][j], i,
787787 tctx->tmp_buf, gain[sub*i+j], ftype);
788788
@@ -807,7 +807,7 @@ static void read_and_decode_spectrum(TwinContext *tctx, GetBitContext *gb, · 18 unmodified lines
807807
808808 dec_lpc_spectrum_inv(tctx, lsp, ftype, tctx->tmp_buf);
809809
810− for (j=0; j < mtab->fmode[ftype].sub; j++) {
810+ for (j = 0; j < mtab->fmode[ftype].sub; j++) {
811811 tctx->dsp.vector_fmul(chunk, tctx->tmp_buf, block_size);
812812 chunk += block_size;
813813 }
@@ -879,7 +879,7 @@ static av_cold void init_mdct_win(TwinContext *tctx) · 65 unmodified lines
879879 int channels = tctx->avctx->channels;
880880 float norm = channels == 1 ? 2. : 1.;
881881
882− for (i=0; i < 3; i++) {
882+ for (i = 0; i < 3; i++) {
883883 int bsize = tctx->mtab->size/tctx->mtab->fmode[i].sub;
884884 ff_mdct_init(&tctx->mdct_ctx[i], av_log2(bsize) + 1, 1,
885885 -sqrt(norm/bsize) / (1<<15));
@@ -891,14 +891,14 @@ static av_cold void init_mdct_win(TwinContext *tctx) · 5 unmodified lines
891891 tctx->curr_frame = av_malloc(2*mtab->size*channels*sizeof(float));
892892 tctx->prev_frame = av_malloc(2*mtab->size*channels*sizeof(float));
893893
894− for(i=0; i < 3; i++) {
894+ for (i = 0; i < 3; i++) {
895895 int m = 4*mtab->size/mtab->fmode[i].sub;
896896 double freq = 2*M_PI/m;
897897 tctx->cos_tabs[i] = av_malloc((m/4)*sizeof(*tctx->cos_tabs));
898898
899− for (j=0; j <= m/8; j++)
899+ for (j = 0; j <= m/8; j++)
900900 tctx->cos_tabs[i][j] = cos((2*j + 1)*freq);
901− for (j=1; j < m/8; j++)
901+ for (j = 1; j < m/8; j++)
902902 tctx->cos_tabs[i][m/4-j] = tctx->cos_tabs[i][j];
903903 }
904904
@@ -922,7 +922,7 @@ static void permutate_in_line(int16_t *tab, int num_vect, int num_blocks, · 17 unmodified lines
922922 {
923923 int i,j;
924924
925− for (i=0; i < line_len[0]; i++) {
925+ for (i = 0; i < line_len[0]; i++) {
926926 int shift;
927927
928928 if (num_blocks == 1 ||
@@ -935,7 +935,7 @@ static void permutate_in_line(int16_t *tab, int num_vect, int num_blocks, · 6 unmodified lines
935935 } else
936936 shift = i*i;
937937
938− for (j=0; j < num_vect && (j+num_vect*i < block_size*num_blocks); j++)
938+ for (j = 0; j < num_vect && (j+num_vect*i < block_size*num_blocks); j++)
939939 tab[i*num_vect+j] = i*num_vect + (j + shift) % num_vect;
940940 }
941941 }
@@ -960,8 +960,8 @@ static void transpose_perm(int16_t *out, int16_t *in, int num_vect, · 18 unmodified lines
960960 {
961961 int i,j;
962962 int cont= 0;
963− for (i=0; i < num_vect; i++)
964− for (j=0; j < line_len[i >= length_div]; j++)
963+ for (i = 0; i < num_vect; i++)
964+ for (j = 0; j < line_len[i >= length_div]; j++)
965965 out[cont++] = in[j*num_vect + i];
966966 }
967967
@@ -970,7 +970,7 @@ static void linear_perm(int16_t *out, int16_t *in, int n_blocks, int size) · 2 unmodified lines
970970 int block_size = size/n_blocks;
971971 int i;
972972
973− for (i=0; i < size; i++)
973+ for (i = 0; i < size; i++)
974974 out[i] = block_size * (in[i] % n_blocks) + in[i] / n_blocks;
975975 }
976976
@@ -1015,7 +1015,7 @@ static av_cold void init_bitstream_params(TwinContext *tctx) · 38 unmodified lines
10151015 int bse_bits[3];
10161016 int i;
10171017
1018− for (i=0; i < 3; i++)
1018+ for (i = 0; i < 3; i++)
10191019 // +1 for history usage switch
10201020 bse_bits[i] = n_ch *
10211021 (mtab->fmode[i].bark_n_coef * mtab->fmode[i].bark_n_bit + 1);
@@ -1023,13 +1023,13 @@ static av_cold void init_bitstream_params(TwinContext *tctx) · 1 unmodified line
10231023 bsize_no_main_cb[2] = bse_bits[2] + lsp_bits_per_block + ppc_bits +
10241024 WINDOW_TYPE_BITS + n_ch*GAIN_BITS;
10251025
1026− for (i=0; i < 2; i++)
1026+ for (i = 0; i < 2; i++)
10271027 bsize_no_main_cb[i] =
10281028 lsp_bits_per_block + n_ch*GAIN_BITS + WINDOW_TYPE_BITS +
10291029 mtab->fmode[i].sub*(bse_bits[i] + n_ch*SUB_GAIN_BITS);
10301030
10311031 // The remaining bits are all used for the main spectrum coefficients
1032− for (i=0; i < 4; i++) {
1032+ for (i = 0; i < 4; i++) {
10331033 int bit_size;
10341034 int vect_size;
10351035 int rounded_up, rounded_down, num_rounded_down, num_rounded_up;
@@ -1062,7 +1062,7 @@ static av_cold void init_bitstream_params(TwinContext *tctx) · 26 unmodified lines
10621062 tctx->length_change[i] = num_rounded_up;
10631063 }
10641064
1065− for (i=0; i < 4; i++)
1065+ for (i = 0; i < 4; i++)
10661066 construct_perm_table(tctx, i);
10671067 }
10681068
@@ -1110,7 +1110,7 @@ static av_cold int twin_decode_close(AVCodecContext *avctx) · 41 unmodified lines
11101110 TwinContext *tctx = avctx->priv_data;
11111111 int i;
11121112
1113− for (i=0; i < 3; i++) {
1113+ for (i = 0; i < 3; i++) {
11141114 ff_mdct_end(&tctx->mdct_ctx[i]);
11151115 av_free(tctx->cos_tabs[i]);
11161116 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t