RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cosmetics: indentation 

Originally committed as revision 24612 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2010-07-30 21:33:51 +00:00
parent 520effb9b5
commit eb96f1698a
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
libavcodec/flacenc.c
View File

@ -1107,10 +1107,10 @@ static void output_subframes(FlacEncodeContext *s)
for (ch = 0; ch < s->channels; ch++) { for (ch = 0; ch < s->channels; ch++) {
FlacSubframe *sub = &s->frame.subframes[ch]; FlacSubframe *sub = &s->frame.subframes[ch];
int i, p, porder, psize; int i, p, porder, psize;
int32_t *part_end; int32_t *part_end;
int32_t *res = sub->residual; int32_t *res = sub->residual;
int32_t *frame_end = &sub->residual[s->frame.blocksize]; int32_t *frame_end = &sub->residual[s->frame.blocksize];
/* subframe header */ /* subframe header */
put_bits(&s->pb, 1, 0); put_bits(&s->pb, 1, 0);
@ -1118,43 +1118,43 @@ static void output_subframes(FlacEncodeContext *s)
put_bits(&s->pb, 1, 0); /* no wasted bits */ put_bits(&s->pb, 1, 0); /* no wasted bits */
/* subframe */ /* subframe */
if (sub->type == FLAC_SUBFRAME_CONSTANT) { if (sub->type == FLAC_SUBFRAME_CONSTANT) {
put_sbits(&s->pb, sub->obits, res[0]); put_sbits(&s->pb, sub->obits, res[0]);
} else if (sub->type == FLAC_SUBFRAME_VERBATIM) { } else if (sub->type == FLAC_SUBFRAME_VERBATIM) {
while (res < frame_end) while (res < frame_end)
put_sbits(&s->pb, sub->obits, *res++); put_sbits(&s->pb, sub->obits, *res++);
} else { } else {
/* warm-up samples */ /* warm-up samples */
for (i = 0; i < sub->order; i++)
put_sbits(&s->pb, sub->obits, *res++);
/* LPC coefficients */
if (sub->type == FLAC_SUBFRAME_LPC) {
int cbits = s->options.lpc_coeff_precision;
put_bits( &s->pb, 4, cbits-1);
put_sbits(&s->pb, 5, sub->shift);
for (i = 0; i < sub->order; i++) for (i = 0; i < sub->order; i++)
put_sbits(&s->pb, cbits, sub->coefs[i]); put_sbits(&s->pb, sub->obits, *res++);
/* LPC coefficients */
if (sub->type == FLAC_SUBFRAME_LPC) {
int cbits = s->options.lpc_coeff_precision;
put_bits( &s->pb, 4, cbits-1);
put_sbits(&s->pb, 5, sub->shift);
for (i = 0; i < sub->order; i++)
put_sbits(&s->pb, cbits, sub->coefs[i]);
}
/* rice-encoded block */
put_bits(&s->pb, 2, 0);
/* partition order */
porder = sub->rc.porder;
psize = s->frame.blocksize >> porder;
put_bits(&s->pb, 4, porder);
/* residual */
part_end = &sub->residual[psize];
for (p = 0; p < 1 << porder; p++) {
int k = sub->rc.params[p];
put_bits(&s->pb, 4, k);
while (res < part_end)
set_sr_golomb_flac(&s->pb, *res++, k, INT32_MAX, 0);
part_end = FFMIN(frame_end, part_end + psize);
}
} }
/* rice-encoded block */
put_bits(&s->pb, 2, 0);
/* partition order */
porder = sub->rc.porder;
psize = s->frame.blocksize >> porder;
put_bits(&s->pb, 4, porder);
/* residual */
part_end = &sub->residual[psize];
for (p = 0; p < 1 << porder; p++) {
int k = sub->rc.params[p];
put_bits(&s->pb, 4, k);
while (res < part_end)
set_sr_golomb_flac(&s->pb, *res++, k, INT32_MAX, 0);
part_end = FFMIN(frame_end, part_end + psize);
}
}
} }
} }