Mercurial > libavcodec.hg
comparison flacenc.c @ 12315:f903ba955ae7 libavcodec
cosmetics: indentation
| author | jbr |
|---|---|
| date | Fri, 30 Jul 2010 21:33:51 +0000 |
| parents | 46b00f7710da |
| children | 014e19fbfae7 |
comparison
equal
deleted
inserted
replaced
| 12314:46b00f7710da | 12315:f903ba955ae7 |
|---|---|
| 1105 { | 1105 { |
| 1106 int ch; | 1106 int ch; |
| 1107 | 1107 |
| 1108 for (ch = 0; ch < s->channels; ch++) { | 1108 for (ch = 0; ch < s->channels; ch++) { |
| 1109 FlacSubframe *sub = &s->frame.subframes[ch]; | 1109 FlacSubframe *sub = &s->frame.subframes[ch]; |
| 1110 int i, p, porder, psize; | 1110 int i, p, porder, psize; |
| 1111 int32_t *part_end; | 1111 int32_t *part_end; |
| 1112 int32_t *res = sub->residual; | 1112 int32_t *res = sub->residual; |
| 1113 int32_t *frame_end = &sub->residual[s->frame.blocksize]; | 1113 int32_t *frame_end = &sub->residual[s->frame.blocksize]; |
| 1114 | 1114 |
| 1115 /* subframe header */ | 1115 /* subframe header */ |
| 1116 put_bits(&s->pb, 1, 0); | 1116 put_bits(&s->pb, 1, 0); |
| 1117 put_bits(&s->pb, 6, sub->type_code); | 1117 put_bits(&s->pb, 6, sub->type_code); |
| 1118 put_bits(&s->pb, 1, 0); /* no wasted bits */ | 1118 put_bits(&s->pb, 1, 0); /* no wasted bits */ |
| 1119 | 1119 |
| 1120 /* subframe */ | 1120 /* subframe */ |
| 1121 if (sub->type == FLAC_SUBFRAME_CONSTANT) { | 1121 if (sub->type == FLAC_SUBFRAME_CONSTANT) { |
| 1122 put_sbits(&s->pb, sub->obits, res[0]); | 1122 put_sbits(&s->pb, sub->obits, res[0]); |
| 1123 } else if (sub->type == FLAC_SUBFRAME_VERBATIM) { | 1123 } else if (sub->type == FLAC_SUBFRAME_VERBATIM) { |
| 1124 while (res < frame_end) | 1124 while (res < frame_end) |
| 1125 put_sbits(&s->pb, sub->obits, *res++); | 1125 put_sbits(&s->pb, sub->obits, *res++); |
| 1126 } else { | 1126 } else { |
| 1127 /* warm-up samples */ | 1127 /* warm-up samples */ |
| 1128 for (i = 0; i < sub->order; i++) | |
| 1129 put_sbits(&s->pb, sub->obits, *res++); | |
| 1130 | |
| 1131 /* LPC coefficients */ | |
| 1132 if (sub->type == FLAC_SUBFRAME_LPC) { | |
| 1133 int cbits = s->options.lpc_coeff_precision; | |
| 1134 put_bits( &s->pb, 4, cbits-1); | |
| 1135 put_sbits(&s->pb, 5, sub->shift); | |
| 1136 for (i = 0; i < sub->order; i++) | 1128 for (i = 0; i < sub->order; i++) |
| 1137 put_sbits(&s->pb, cbits, sub->coefs[i]); | 1129 put_sbits(&s->pb, sub->obits, *res++); |
| 1138 } | 1130 |
| 1139 | 1131 /* LPC coefficients */ |
| 1140 /* rice-encoded block */ | 1132 if (sub->type == FLAC_SUBFRAME_LPC) { |
| 1141 put_bits(&s->pb, 2, 0); | 1133 int cbits = s->options.lpc_coeff_precision; |
| 1142 | 1134 put_bits( &s->pb, 4, cbits-1); |
| 1143 /* partition order */ | 1135 put_sbits(&s->pb, 5, sub->shift); |
| 1144 porder = sub->rc.porder; | 1136 for (i = 0; i < sub->order; i++) |
| 1145 psize = s->frame.blocksize >> porder; | 1137 put_sbits(&s->pb, cbits, sub->coefs[i]); |
| 1146 put_bits(&s->pb, 4, porder); | 1138 } |
| 1147 | 1139 |
| 1148 /* residual */ | 1140 /* rice-encoded block */ |
| 1149 part_end = &sub->residual[psize]; | 1141 put_bits(&s->pb, 2, 0); |
| 1150 for (p = 0; p < 1 << porder; p++) { | 1142 |
| 1151 int k = sub->rc.params[p]; | 1143 /* partition order */ |
| 1152 put_bits(&s->pb, 4, k); | 1144 porder = sub->rc.porder; |
| 1153 while (res < part_end) | 1145 psize = s->frame.blocksize >> porder; |
| 1154 set_sr_golomb_flac(&s->pb, *res++, k, INT32_MAX, 0); | 1146 put_bits(&s->pb, 4, porder); |
| 1155 part_end = FFMIN(frame_end, part_end + psize); | 1147 |
| 1156 } | 1148 /* residual */ |
| 1157 } | 1149 part_end = &sub->residual[psize]; |
| 1150 for (p = 0; p < 1 << porder; p++) { | |
| 1151 int k = sub->rc.params[p]; | |
| 1152 put_bits(&s->pb, 4, k); | |
| 1153 while (res < part_end) | |
| 1154 set_sr_golomb_flac(&s->pb, *res++, k, INT32_MAX, 0); | |
| 1155 part_end = FFMIN(frame_end, part_end + psize); | |
| 1156 } | |
| 1157 } | |
| 1158 } | 1158 } |
| 1159 } | 1159 } |
| 1160 | 1160 |
| 1161 | 1161 |
| 1162 static void output_frame_footer(FlacEncodeContext *s) | 1162 static void output_frame_footer(FlacEncodeContext *s) |