Commit 724f3471 authored by Justin Ruggles's avatar Justin Ruggles

cosmetics: indentation

Originally committed as revision 24609 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6d263f41
...@@ -1114,36 +1114,36 @@ static void output_subframe(FlacEncodeContext *s, FlacSubframe *sub) ...@@ -1114,36 +1114,36 @@ static void output_subframe(FlacEncodeContext *s, FlacSubframe *sub)
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++);
}
/* rice-encoded block */ /* LPC coefficients */
put_bits(&s->pb, 2, 0); if (sub->type == FLAC_SUBFRAME_LPC) {
int cbits = s->options.lpc_coeff_precision;
/* partition order */ put_bits( &s->pb, 4, cbits-1);
porder = sub->rc.porder; put_sbits(&s->pb, 5, sub->shift);
psize = s->frame.blocksize >> porder; for (i = 0; i < sub->order; i++)
put_bits(&s->pb, 4, porder); put_sbits(&s->pb, cbits, sub->coefs[i]);
}
/* residual */
part_end = &sub->residual[psize ]; /* rice-encoded block */
for (p = 0; p < 1 << porder; p++) { put_bits(&s->pb, 2, 0);
int k = sub->rc.params[p];
put_bits(&s->pb, 4, k); /* partition order */
while (res < part_end) porder = sub->rc.porder;
set_sr_golomb_flac(&s->pb, *res++, k, INT32_MAX, 0); psize = s->frame.blocksize >> porder;
part_end = FFMIN(frame_end, part_end + psize); 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);
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment