Mercurial > libavcodec.hg
comparison flacenc.c @ 12312:4f7ed0667a27 libavcodec
cosmetics: indentation
| author | jbr |
|---|---|
| date | Fri, 30 Jul 2010 21:07:21 +0000 |
| parents | 1a4351501522 |
| children | c1918adb174b |
comparison
equal
deleted
inserted
replaced
| 12311:1a4351501522 | 12312:4f7ed0667a27 |
|---|---|
| 1112 put_sbits(&s->pb, sub->obits, res[0]); | 1112 put_sbits(&s->pb, sub->obits, res[0]); |
| 1113 } else if (sub->type == FLAC_SUBFRAME_VERBATIM) { | 1113 } else if (sub->type == FLAC_SUBFRAME_VERBATIM) { |
| 1114 while (res < frame_end) | 1114 while (res < frame_end) |
| 1115 put_sbits(&s->pb, sub->obits, *res++); | 1115 put_sbits(&s->pb, sub->obits, *res++); |
| 1116 } else { | 1116 } else { |
| 1117 /* warm-up samples */ | 1117 /* warm-up samples */ |
| 1118 for (i = 0; i < sub->order; i++) | |
| 1119 put_sbits(&s->pb, sub->obits, *res++); | |
| 1120 | |
| 1121 /* LPC coefficients */ | |
| 1122 if (sub->type == FLAC_SUBFRAME_LPC) { | |
| 1123 int cbits = s->options.lpc_coeff_precision; | |
| 1124 put_bits( &s->pb, 4, cbits-1); | |
| 1125 put_sbits(&s->pb, 5, sub->shift); | |
| 1126 for (i = 0; i < sub->order; i++) | 1118 for (i = 0; i < sub->order; i++) |
| 1127 put_sbits(&s->pb, cbits, sub->coefs[i]); | 1119 put_sbits(&s->pb, sub->obits, *res++); |
| 1128 } | 1120 |
| 1129 | 1121 /* LPC coefficients */ |
| 1130 /* rice-encoded block */ | 1122 if (sub->type == FLAC_SUBFRAME_LPC) { |
| 1131 put_bits(&s->pb, 2, 0); | 1123 int cbits = s->options.lpc_coeff_precision; |
| 1132 | 1124 put_bits( &s->pb, 4, cbits-1); |
| 1133 /* partition order */ | 1125 put_sbits(&s->pb, 5, sub->shift); |
| 1134 porder = sub->rc.porder; | 1126 for (i = 0; i < sub->order; i++) |
| 1135 psize = s->frame.blocksize >> porder; | 1127 put_sbits(&s->pb, cbits, sub->coefs[i]); |
| 1136 put_bits(&s->pb, 4, porder); | 1128 } |
| 1137 | 1129 |
| 1138 /* residual */ | 1130 /* rice-encoded block */ |
| 1139 part_end = &sub->residual[psize ]; | 1131 put_bits(&s->pb, 2, 0); |
| 1140 for (p = 0; p < 1 << porder; p++) { | 1132 |
| 1141 int k = sub->rc.params[p]; | 1133 /* partition order */ |
| 1142 put_bits(&s->pb, 4, k); | 1134 porder = sub->rc.porder; |
| 1143 while (res < part_end) | 1135 psize = s->frame.blocksize >> porder; |
| 1144 set_sr_golomb_flac(&s->pb, *res++, k, INT32_MAX, 0); | 1136 put_bits(&s->pb, 4, porder); |
| 1145 part_end = FFMIN(frame_end, part_end + psize); | 1137 |
| 1146 } | 1138 /* residual */ |
| 1139 part_end = &sub->residual[psize]; | |
| 1140 for (p = 0; p < 1 << porder; p++) { | |
| 1141 int k = sub->rc.params[p]; | |
| 1142 put_bits(&s->pb, 4, k); | |
| 1143 while (res < part_end) | |
| 1144 set_sr_golomb_flac(&s->pb, *res++, k, INT32_MAX, 0); | |
| 1145 part_end = FFMIN(frame_end, part_end + psize); | |
| 1146 } | |
| 1147 } | 1147 } |
| 1148 } | 1148 } |
| 1149 | 1149 |
| 1150 | 1150 |
| 1151 static void output_subframes(FlacEncodeContext *s) | 1151 static void output_subframes(FlacEncodeContext *s) |