comparison aacenc.c @ 9936:7f42ae22c351 libavcodec

Cosmetics: Pretty print the AAC encoder.
author alexc
date Wed, 08 Jul 2009 20:36:45 +0000
parents d09283aeeef8
children 3e39dbd2d9eb
comparison
equal deleted inserted replaced
9935:d09283aeeef8 9936:7f42ae22c351
157 const uint8_t *sizes[2]; 157 const uint8_t *sizes[2];
158 int lengths[2]; 158 int lengths[2];
159 159
160 avctx->frame_size = 1024; 160 avctx->frame_size = 1024;
161 161
162 for(i = 0; i < 16; i++) 162 for (i = 0; i < 16; i++)
163 if(avctx->sample_rate == ff_mpeg4audio_sample_rates[i]) 163 if (avctx->sample_rate == ff_mpeg4audio_sample_rates[i])
164 break; 164 break;
165 if(i == 16){ 165 if (i == 16) {
166 av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate %d\n", avctx->sample_rate); 166 av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate %d\n", avctx->sample_rate);
167 return -1; 167 return -1;
168 } 168 }
169 if(avctx->channels > 6){ 169 if (avctx->channels > 6) {
170 av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %d\n", avctx->channels); 170 av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels: %d\n", avctx->channels);
171 return -1; 171 return -1;
172 } 172 }
173 s->samplerate_index = i; 173 s->samplerate_index = i;
174 174
216 const float * swindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_short_128 : ff_sine_128; 216 const float * swindow = sce->ics.use_kb_window[0] ? ff_aac_kbd_short_128 : ff_sine_128;
217 const float * pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128; 217 const float * pwindow = sce->ics.use_kb_window[1] ? ff_aac_kbd_short_128 : ff_sine_128;
218 218
219 if (sce->ics.window_sequence[0] != EIGHT_SHORT_SEQUENCE) { 219 if (sce->ics.window_sequence[0] != EIGHT_SHORT_SEQUENCE) {
220 memcpy(s->output, sce->saved, sizeof(float)*1024); 220 memcpy(s->output, sce->saved, sizeof(float)*1024);
221 if(sce->ics.window_sequence[0] == LONG_STOP_SEQUENCE){ 221 if (sce->ics.window_sequence[0] == LONG_STOP_SEQUENCE) {
222 memset(s->output, 0, sizeof(s->output[0]) * 448); 222 memset(s->output, 0, sizeof(s->output[0]) * 448);
223 for(i = 448; i < 576; i++) 223 for (i = 448; i < 576; i++)
224 s->output[i] = sce->saved[i] * pwindow[i - 448]; 224 s->output[i] = sce->saved[i] * pwindow[i - 448];
225 for(i = 576; i < 704; i++) 225 for (i = 576; i < 704; i++)
226 s->output[i] = sce->saved[i]; 226 s->output[i] = sce->saved[i];
227 } 227 }
228 if(sce->ics.window_sequence[0] != LONG_START_SEQUENCE){ 228 if (sce->ics.window_sequence[0] != LONG_START_SEQUENCE) {
229 j = channel; 229 j = channel;
230 for (i = 0; i < 1024; i++, j += avctx->channels){ 230 for (i = 0; i < 1024; i++, j += avctx->channels) {
231 s->output[i+1024] = audio[j] * lwindow[1024 - i - 1]; 231 s->output[i+1024] = audio[j] * lwindow[1024 - i - 1];
232 sce->saved[i] = audio[j] * lwindow[i]; 232 sce->saved[i] = audio[j] * lwindow[i];
233 } 233 }
234 }else{ 234 } else {
235 j = channel; 235 j = channel;
236 for(i = 0; i < 448; i++, j += avctx->channels) 236 for (i = 0; i < 448; i++, j += avctx->channels)
237 s->output[i+1024] = audio[j]; 237 s->output[i+1024] = audio[j];
238 for(i = 448; i < 576; i++, j += avctx->channels) 238 for (i = 448; i < 576; i++, j += avctx->channels)
239 s->output[i+1024] = audio[j] * swindow[576 - i - 1]; 239 s->output[i+1024] = audio[j] * swindow[576 - i - 1];
240 memset(s->output+1024+576, 0, sizeof(s->output[0]) * 448); 240 memset(s->output+1024+576, 0, sizeof(s->output[0]) * 448);
241 j = channel; 241 j = channel;
242 for(i = 0; i < 1024; i++, j += avctx->channels) 242 for (i = 0; i < 1024; i++, j += avctx->channels)
243 sce->saved[i] = audio[j]; 243 sce->saved[i] = audio[j];
244 } 244 }
245 ff_mdct_calc(&s->mdct1024, sce->coeffs, s->output); 245 ff_mdct_calc(&s->mdct1024, sce->coeffs, s->output);
246 }else{ 246 } else {
247 j = channel; 247 j = channel;
248 for (k = 0; k < 1024; k += 128) { 248 for (k = 0; k < 1024; k += 128) {
249 for(i = 448 + k; i < 448 + k + 256; i++) 249 for (i = 448 + k; i < 448 + k + 256; i++)
250 s->output[i - 448 - k] = (i < 1024) 250 s->output[i - 448 - k] = (i < 1024)
251 ? sce->saved[i] 251 ? sce->saved[i]
252 : audio[channel + (i-1024)*avctx->channels]; 252 : audio[channel + (i-1024)*avctx->channels];
253 s->dsp.vector_fmul (s->output, k ? swindow : pwindow, 128); 253 s->dsp.vector_fmul (s->output, k ? swindow : pwindow, 128);
254 s->dsp.vector_fmul_reverse(s->output+128, s->output+128, swindow, 128); 254 s->dsp.vector_fmul_reverse(s->output+128, s->output+128, swindow, 128);
255 ff_mdct_calc(&s->mdct128, sce->coeffs + k, s->output); 255 ff_mdct_calc(&s->mdct128, sce->coeffs + k, s->output);
256 } 256 }
257 j = channel; 257 j = channel;
258 for(i = 0; i < 1024; i++, j += avctx->channels) 258 for (i = 0; i < 1024; i++, j += avctx->channels)
259 sce->saved[i] = audio[j]; 259 sce->saved[i] = audio[j];
260 } 260 }
261 } 261 }
262 262
263 /** 263 /**
269 int w; 269 int w;
270 270
271 put_bits(&s->pb, 1, 0); // ics_reserved bit 271 put_bits(&s->pb, 1, 0); // ics_reserved bit
272 put_bits(&s->pb, 2, info->window_sequence[0]); 272 put_bits(&s->pb, 2, info->window_sequence[0]);
273 put_bits(&s->pb, 1, info->use_kb_window[0]); 273 put_bits(&s->pb, 1, info->use_kb_window[0]);
274 if(info->window_sequence[0] != EIGHT_SHORT_SEQUENCE){ 274 if (info->window_sequence[0] != EIGHT_SHORT_SEQUENCE) {
275 put_bits(&s->pb, 6, info->max_sfb); 275 put_bits(&s->pb, 6, info->max_sfb);
276 put_bits(&s->pb, 1, 0); // no prediction 276 put_bits(&s->pb, 1, 0); // no prediction
277 }else{ 277 } else {
278 put_bits(&s->pb, 4, info->max_sfb); 278 put_bits(&s->pb, 4, info->max_sfb);
279 for(w = 1; w < 8; w++){ 279 for (w = 1; w < 8; w++) {
280 put_bits(&s->pb, 1, !info->group_len[w]); 280 put_bits(&s->pb, 1, !info->group_len[w]);
281 } 281 }
282 } 282 }
283 } 283 }
284 284
289 static void encode_ms_info(PutBitContext *pb, ChannelElement *cpe) 289 static void encode_ms_info(PutBitContext *pb, ChannelElement *cpe)
290 { 290 {
291 int i, w; 291 int i, w;
292 292
293 put_bits(pb, 2, cpe->ms_mode); 293 put_bits(pb, 2, cpe->ms_mode);
294 if(cpe->ms_mode == 1){ 294 if (cpe->ms_mode == 1) {
295 for(w = 0; w < cpe->ch[0].ics.num_windows; w += cpe->ch[0].ics.group_len[w]){ 295 for (w = 0; w < cpe->ch[0].ics.num_windows; w += cpe->ch[0].ics.group_len[w]) {
296 for(i = 0; i < cpe->ch[0].ics.max_sfb; i++) 296 for (i = 0; i < cpe->ch[0].ics.max_sfb; i++)
297 put_bits(pb, 1, cpe->ms_mask[w*16 + i]); 297 put_bits(pb, 1, cpe->ms_mask[w*16 + i]);
298 } 298 }
299 } 299 }
300 } 300 }
301 301
305 static void adjust_frame_information(AACEncContext *apc, ChannelElement *cpe, int chans) 305 static void adjust_frame_information(AACEncContext *apc, ChannelElement *cpe, int chans)
306 { 306 {
307 int i, w, w2, g, ch; 307 int i, w, w2, g, ch;
308 int start, sum, maxsfb, cmaxsfb; 308 int start, sum, maxsfb, cmaxsfb;
309 309
310 for(ch = 0; ch < chans; ch++){ 310 for (ch = 0; ch < chans; ch++) {
311 IndividualChannelStream *ics = &cpe->ch[ch].ics; 311 IndividualChannelStream *ics = &cpe->ch[ch].ics;
312 start = 0; 312 start = 0;
313 maxsfb = 0; 313 maxsfb = 0;
314 cpe->ch[ch].pulse.num_pulse = 0; 314 cpe->ch[ch].pulse.num_pulse = 0;
315 for(w = 0; w < ics->num_windows*16; w += 16){ 315 for (w = 0; w < ics->num_windows*16; w += 16) {
316 for(g = 0; g < ics->num_swb; g++){ 316 for (g = 0; g < ics->num_swb; g++) {
317 sum = 0; 317 sum = 0;
318 //apply M/S 318 //apply M/S
319 if(!ch && cpe->ms_mask[w + g]){ 319 if (!ch && cpe->ms_mask[w + g]) {
320 for(i = 0; i < ics->swb_sizes[g]; i++){ 320 for (i = 0; i < ics->swb_sizes[g]; i++) {
321 cpe->ch[0].coeffs[start+i] = (cpe->ch[0].coeffs[start+i] + cpe->ch[1].coeffs[start+i]) / 2.0; 321 cpe->ch[0].coeffs[start+i] = (cpe->ch[0].coeffs[start+i] + cpe->ch[1].coeffs[start+i]) / 2.0;
322 cpe->ch[1].coeffs[start+i] = cpe->ch[0].coeffs[start+i] - cpe->ch[1].coeffs[start+i]; 322 cpe->ch[1].coeffs[start+i] = cpe->ch[0].coeffs[start+i] - cpe->ch[1].coeffs[start+i];
323 } 323 }
324 } 324 }
325 start += ics->swb_sizes[g]; 325 start += ics->swb_sizes[g];
326 } 326 }
327 for(cmaxsfb = ics->num_swb; cmaxsfb > 0 && cpe->ch[ch].zeroes[w+cmaxsfb-1]; cmaxsfb--); 327 for (cmaxsfb = ics->num_swb; cmaxsfb > 0 && cpe->ch[ch].zeroes[w+cmaxsfb-1]; cmaxsfb--);
328 maxsfb = FFMAX(maxsfb, cmaxsfb); 328 maxsfb = FFMAX(maxsfb, cmaxsfb);
329 } 329 }
330 ics->max_sfb = maxsfb; 330 ics->max_sfb = maxsfb;
331 331
332 //adjust zero bands for window groups 332 //adjust zero bands for window groups
333 for(w = 0; w < ics->num_windows; w += ics->group_len[w]){ 333 for (w = 0; w < ics->num_windows; w += ics->group_len[w]) {
334 for(g = 0; g < ics->max_sfb; g++){ 334 for (g = 0; g < ics->max_sfb; g++) {
335 i = 1; 335 i = 1;
336 for(w2 = w; w2 < w + ics->group_len[w]; w2++){ 336 for (w2 = w; w2 < w + ics->group_len[w]; w2++) {
337 if(!cpe->ch[ch].zeroes[w2*16 + g]){ 337 if (!cpe->ch[ch].zeroes[w2*16 + g]) {
338 i = 0; 338 i = 0;
339 break; 339 break;
340 } 340 }
341 } 341 }
342 cpe->ch[ch].zeroes[w*16 + g] = i; 342 cpe->ch[ch].zeroes[w*16 + g] = i;
343 } 343 }
344 } 344 }
345 } 345 }
346 346
347 if(chans > 1 && cpe->common_window){ 347 if (chans > 1 && cpe->common_window) {
348 IndividualChannelStream *ics0 = &cpe->ch[0].ics; 348 IndividualChannelStream *ics0 = &cpe->ch[0].ics;
349 IndividualChannelStream *ics1 = &cpe->ch[1].ics; 349 IndividualChannelStream *ics1 = &cpe->ch[1].ics;
350 int msc = 0; 350 int msc = 0;
351 ics0->max_sfb = FFMAX(ics0->max_sfb, ics1->max_sfb); 351 ics0->max_sfb = FFMAX(ics0->max_sfb, ics1->max_sfb);
352 ics1->max_sfb = ics0->max_sfb; 352 ics1->max_sfb = ics0->max_sfb;
353 for(w = 0; w < ics0->num_windows*16; w += 16) 353 for (w = 0; w < ics0->num_windows*16; w += 16)
354 for(i = 0; i < ics0->max_sfb; i++) 354 for (i = 0; i < ics0->max_sfb; i++)
355 if(cpe->ms_mask[w+i]) msc++; 355 if (cpe->ms_mask[w+i]) msc++;
356 if(msc == 0 || ics0->max_sfb == 0) cpe->ms_mode = 0; 356 if (msc == 0 || ics0->max_sfb == 0) cpe->ms_mode = 0;
357 else cpe->ms_mode = msc < ics0->max_sfb ? 1 : 2; 357 else cpe->ms_mode = msc < ics0->max_sfb ? 1 : 2;
358 } 358 }
359 } 359 }
360 360
361 /** 361 /**
363 */ 363 */
364 static void encode_band_info(AACEncContext *s, SingleChannelElement *sce) 364 static void encode_band_info(AACEncContext *s, SingleChannelElement *sce)
365 { 365 {
366 int w; 366 int w;
367 367
368 for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ 368 for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {
369 s->coder->encode_window_bands_info(s, sce, w, sce->ics.group_len[w], s->lambda); 369 s->coder->encode_window_bands_info(s, sce, w, sce->ics.group_len[w], s->lambda);
370 } 370 }
371 } 371 }
372 372
373 /** 373 /**
376 static void encode_scale_factors(AVCodecContext *avctx, AACEncContext *s, SingleChannelElement *sce) 376 static void encode_scale_factors(AVCodecContext *avctx, AACEncContext *s, SingleChannelElement *sce)
377 { 377 {
378 int off = sce->sf_idx[0], diff; 378 int off = sce->sf_idx[0], diff;
379 int i, w; 379 int i, w;
380 380
381 for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ 381 for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {
382 for(i = 0; i < sce->ics.max_sfb; i++){ 382 for (i = 0; i < sce->ics.max_sfb; i++) {
383 if(!sce->zeroes[w*16 + i]){ 383 if (!sce->zeroes[w*16 + i]) {
384 diff = sce->sf_idx[w*16 + i] - off + SCALE_DIFF_ZERO; 384 diff = sce->sf_idx[w*16 + i] - off + SCALE_DIFF_ZERO;
385 if(diff < 0 || diff > 120) av_log(avctx, AV_LOG_ERROR, "Scalefactor difference is too big to be coded\n"); 385 if (diff < 0 || diff > 120) av_log(avctx, AV_LOG_ERROR, "Scalefactor difference is too big to be coded\n");
386 off = sce->sf_idx[w*16 + i]; 386 off = sce->sf_idx[w*16 + i];
387 put_bits(&s->pb, ff_aac_scalefactor_bits[diff], ff_aac_scalefactor_code[diff]); 387 put_bits(&s->pb, ff_aac_scalefactor_bits[diff], ff_aac_scalefactor_code[diff]);
388 } 388 }
389 } 389 }
390 } 390 }
396 static void encode_pulses(AACEncContext *s, Pulse *pulse) 396 static void encode_pulses(AACEncContext *s, Pulse *pulse)
397 { 397 {
398 int i; 398 int i;
399 399
400 put_bits(&s->pb, 1, !!pulse->num_pulse); 400 put_bits(&s->pb, 1, !!pulse->num_pulse);
401 if(!pulse->num_pulse) return; 401 if (!pulse->num_pulse) return;
402 402
403 put_bits(&s->pb, 2, pulse->num_pulse - 1); 403 put_bits(&s->pb, 2, pulse->num_pulse - 1);
404 put_bits(&s->pb, 6, pulse->start); 404 put_bits(&s->pb, 6, pulse->start);
405 for(i = 0; i < pulse->num_pulse; i++){ 405 for (i = 0; i < pulse->num_pulse; i++) {
406 put_bits(&s->pb, 5, pulse->pos[i]); 406 put_bits(&s->pb, 5, pulse->pos[i]);
407 put_bits(&s->pb, 4, pulse->amp[i]); 407 put_bits(&s->pb, 4, pulse->amp[i]);
408 } 408 }
409 } 409 }
410 410
413 */ 413 */
414 static void encode_spectral_coeffs(AACEncContext *s, SingleChannelElement *sce) 414 static void encode_spectral_coeffs(AACEncContext *s, SingleChannelElement *sce)
415 { 415 {
416 int start, i, w, w2; 416 int start, i, w, w2;
417 417
418 for(w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]){ 418 for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {
419 start = 0; 419 start = 0;
420 for(i = 0; i < sce->ics.max_sfb; i++){ 420 for (i = 0; i < sce->ics.max_sfb; i++) {
421 if(sce->zeroes[w*16 + i]){ 421 if (sce->zeroes[w*16 + i]) {
422 start += sce->ics.swb_sizes[i]; 422 start += sce->ics.swb_sizes[i];
423 continue; 423 continue;
424 } 424 }
425 for(w2 = w; w2 < w + sce->ics.group_len[w]; w2++){ 425 for (w2 = w; w2 < w + sce->ics.group_len[w]; w2++) {
426 s->coder->quantize_and_encode_band(s, &s->pb, sce->coeffs + start + w2*128, 426 s->coder->quantize_and_encode_band(s, &s->pb, sce->coeffs + start + w2*128,
427 sce->ics.swb_sizes[i], 427 sce->ics.swb_sizes[i],
428 sce->sf_idx[w*16 + i], 428 sce->sf_idx[w*16 + i],
429 sce->band_type[w*16 + i], 429 sce->band_type[w*16 + i],
430 s->lambda); 430 s->lambda);
438 * Encode one channel of audio data. 438 * Encode one channel of audio data.
439 */ 439 */
440 static int encode_individual_channel(AVCodecContext *avctx, AACEncContext *s, SingleChannelElement *sce, int common_window) 440 static int encode_individual_channel(AVCodecContext *avctx, AACEncContext *s, SingleChannelElement *sce, int common_window)
441 { 441 {
442 put_bits(&s->pb, 8, sce->sf_idx[0]); 442 put_bits(&s->pb, 8, sce->sf_idx[0]);
443 if(!common_window) put_ics_info(s, &sce->ics); 443 if (!common_window) put_ics_info(s, &sce->ics);
444 encode_band_info(s, sce); 444 encode_band_info(s, sce);
445 encode_scale_factors(avctx, s, sce); 445 encode_scale_factors(avctx, s, sce);
446 encode_pulses(s, &sce->pulse); 446 encode_pulses(s, &sce->pulse);
447 put_bits(&s->pb, 1, 0); //tns 447 put_bits(&s->pb, 1, 0); //tns
448 put_bits(&s->pb, 1, 0); //ssr 448 put_bits(&s->pb, 1, 0); //ssr
458 int i, namelen, padbits; 458 int i, namelen, padbits;
459 459
460 namelen = strlen(name) + 2; 460 namelen = strlen(name) + 2;
461 put_bits(&s->pb, 3, TYPE_FIL); 461 put_bits(&s->pb, 3, TYPE_FIL);
462 put_bits(&s->pb, 4, FFMIN(namelen, 15)); 462 put_bits(&s->pb, 4, FFMIN(namelen, 15));
463 if(namelen >= 15) 463 if (namelen >= 15)
464 put_bits(&s->pb, 8, namelen - 16); 464 put_bits(&s->pb, 8, namelen - 16);
465 put_bits(&s->pb, 4, 0); //extension type - filler 465 put_bits(&s->pb, 4, 0); //extension type - filler
466 padbits = 8 - (put_bits_count(&s->pb) & 7); 466 padbits = 8 - (put_bits_count(&s->pb) & 7);
467 align_put_bits(&s->pb); 467 align_put_bits(&s->pb);
468 for(i = 0; i < namelen - 2; i++) 468 for (i = 0; i < namelen - 2; i++)
469 put_bits(&s->pb, 8, name[i]); 469 put_bits(&s->pb, 8, name[i]);
470 put_bits(&s->pb, 12 - padbits, 0); 470 put_bits(&s->pb, 12 - padbits, 0);
471 } 471 }
472 472
473 static int aac_encode_frame(AVCodecContext *avctx, 473 static int aac_encode_frame(AVCodecContext *avctx,
478 ChannelElement *cpe; 478 ChannelElement *cpe;
479 int i, j, chans, tag, start_ch; 479 int i, j, chans, tag, start_ch;
480 const uint8_t *chan_map = aac_chan_configs[avctx->channels-1]; 480 const uint8_t *chan_map = aac_chan_configs[avctx->channels-1];
481 int chan_el_counter[4]; 481 int chan_el_counter[4];
482 482
483 if(s->last_frame) 483 if (s->last_frame)
484 return 0; 484 return 0;
485 if(data){ 485 if (data) {
486 if(!s->psypp){ 486 if (!s->psypp) {
487 memcpy(s->samples + 1024 * avctx->channels, data, 1024 * avctx->channels * sizeof(s->samples[0])); 487 memcpy(s->samples + 1024 * avctx->channels, data, 1024 * avctx->channels * sizeof(s->samples[0]));
488 }else{ 488 } else {
489 start_ch = 0; 489 start_ch = 0;
490 samples2 = s->samples + 1024 * avctx->channels; 490 samples2 = s->samples + 1024 * avctx->channels;
491 for(i = 0; i < chan_map[0]; i++){ 491 for (i = 0; i < chan_map[0]; i++) {
492 tag = chan_map[i+1]; 492 tag = chan_map[i+1];
493 chans = tag == TYPE_CPE ? 2 : 1; 493 chans = tag == TYPE_CPE ? 2 : 1;
494 ff_psy_preprocess(s->psypp, (uint16_t*)data + start_ch, samples2 + start_ch, start_ch, chans); 494 ff_psy_preprocess(s->psypp, (uint16_t*)data + start_ch, samples2 + start_ch, start_ch, chans);
495 start_ch += chans; 495 start_ch += chans;
496 } 496 }
497 } 497 }
498 } 498 }
499 if(!avctx->frame_number){ 499 if (!avctx->frame_number) {
500 memcpy(s->samples, s->samples + 1024 * avctx->channels, 1024 * avctx->channels * sizeof(s->samples[0])); 500 memcpy(s->samples, s->samples + 1024 * avctx->channels, 1024 * avctx->channels * sizeof(s->samples[0]));
501 return 0; 501 return 0;
502 } 502 }
503 503
504 init_put_bits(&s->pb, frame, buf_size*8); 504 init_put_bits(&s->pb, frame, buf_size*8);
505 if((avctx->frame_number & 0xFF)==1 && !(avctx->flags & CODEC_FLAG_BITEXACT)){ 505 if ((avctx->frame_number & 0xFF)==1 && !(avctx->flags & CODEC_FLAG_BITEXACT)) {
506 put_bitstream_info(avctx, s, LIBAVCODEC_IDENT); 506 put_bitstream_info(avctx, s, LIBAVCODEC_IDENT);
507 } 507 }
508 start_ch = 0; 508 start_ch = 0;
509 memset(chan_el_counter, 0, sizeof(chan_el_counter)); 509 memset(chan_el_counter, 0, sizeof(chan_el_counter));
510 for(i = 0; i < chan_map[0]; i++){ 510 for (i = 0; i < chan_map[0]; i++) {
511 FFPsyWindowInfo wi[2]; 511 FFPsyWindowInfo wi[2];
512 tag = chan_map[i+1]; 512 tag = chan_map[i+1];
513 chans = tag == TYPE_CPE ? 2 : 1; 513 chans = tag == TYPE_CPE ? 2 : 1;
514 cpe = &s->cpe[i]; 514 cpe = &s->cpe[i];
515 samples2 = samples + start_ch; 515 samples2 = samples + start_ch;
516 la = samples2 + 1024 * avctx->channels + start_ch; 516 la = samples2 + 1024 * avctx->channels + start_ch;
517 if(!data) la = NULL; 517 if (!data) la = NULL;
518 for(j = 0; j < chans; j++){ 518 for (j = 0; j < chans; j++) {
519 IndividualChannelStream *ics = &cpe->ch[j].ics; 519 IndividualChannelStream *ics = &cpe->ch[j].ics;
520 int k; 520 int k;
521 wi[j] = ff_psy_suggest_window(&s->psy, samples2, la, start_ch + j, ics->window_sequence[0]); 521 wi[j] = ff_psy_suggest_window(&s->psy, samples2, la, start_ch + j, ics->window_sequence[0]);
522 ics->window_sequence[1] = ics->window_sequence[0]; 522 ics->window_sequence[1] = ics->window_sequence[0];
523 ics->window_sequence[0] = wi[j].window_type[0]; 523 ics->window_sequence[0] = wi[j].window_type[0];
524 ics->use_kb_window[1] = ics->use_kb_window[0]; 524 ics->use_kb_window[1] = ics->use_kb_window[0];
525 ics->use_kb_window[0] = wi[j].window_shape; 525 ics->use_kb_window[0] = wi[j].window_shape;
526 ics->num_windows = wi[j].num_windows; 526 ics->num_windows = wi[j].num_windows;
527 ics->swb_sizes = s->psy.bands [ics->num_windows == 8]; 527 ics->swb_sizes = s->psy.bands [ics->num_windows == 8];
528 ics->num_swb = s->psy.num_bands[ics->num_windows == 8]; 528 ics->num_swb = s->psy.num_bands[ics->num_windows == 8];
529 for(k = 0; k < ics->num_windows; k++) 529 for (k = 0; k < ics->num_windows; k++)
530 ics->group_len[k] = wi[j].grouping[k]; 530 ics->group_len[k] = wi[j].grouping[k];
531 531
532 s->cur_channel = start_ch + j; 532 s->cur_channel = start_ch + j;
533 apply_window_and_mdct(avctx, s, &cpe->ch[j], samples2, j); 533 apply_window_and_mdct(avctx, s, &cpe->ch[j], samples2, j);
534 s->coder->search_for_quantizers(avctx, s, &cpe->ch[j], s->lambda); 534 s->coder->search_for_quantizers(avctx, s, &cpe->ch[j], s->lambda);
535 } 535 }
536 cpe->common_window = 0; 536 cpe->common_window = 0;
537 if(chans > 1 537 if (chans > 1
538 && wi[0].window_type[0] == wi[1].window_type[0] 538 && wi[0].window_type[0] == wi[1].window_type[0]
539 && wi[0].window_shape == wi[1].window_shape){ 539 && wi[0].window_shape == wi[1].window_shape) {
540 540
541 cpe->common_window = 1; 541 cpe->common_window = 1;
542 for(j = 0; j < wi[0].num_windows; j++){ 542 for (j = 0; j < wi[0].num_windows; j++) {
543 if(wi[0].grouping[j] != wi[1].grouping[j]){ 543 if (wi[0].grouping[j] != wi[1].grouping[j]) {
544 cpe->common_window = 0; 544 cpe->common_window = 0;
545 break; 545 break;
546 } 546 }
547 } 547 }
548 } 548 }
549 if(cpe->common_window && s->coder->search_for_ms) 549 if (cpe->common_window && s->coder->search_for_ms)
550 s->coder->search_for_ms(s, cpe, s->lambda); 550 s->coder->search_for_ms(s, cpe, s->lambda);
551 adjust_frame_information(s, cpe, chans); 551 adjust_frame_information(s, cpe, chans);
552 put_bits(&s->pb, 3, tag); 552 put_bits(&s->pb, 3, tag);
553 put_bits(&s->pb, 4, chan_el_counter[tag]++); 553 put_bits(&s->pb, 4, chan_el_counter[tag]++);
554 if(chans == 2){ 554 if (chans == 2) {
555 put_bits(&s->pb, 1, cpe->common_window); 555 put_bits(&s->pb, 1, cpe->common_window);
556 if(cpe->common_window){ 556 if (cpe->common_window) {
557 put_ics_info(s, &cpe->ch[0].ics); 557 put_ics_info(s, &cpe->ch[0].ics);
558 encode_ms_info(&s->pb, cpe); 558 encode_ms_info(&s->pb, cpe);
559 } 559 }
560 } 560 }
561 for(j = 0; j < chans; j++){ 561 for (j = 0; j < chans; j++) {
562 s->cur_channel = start_ch + j; 562 s->cur_channel = start_ch + j;
563 ff_psy_set_band_info(&s->psy, s->cur_channel, cpe->ch[j].coeffs, &wi[j]); 563 ff_psy_set_band_info(&s->psy, s->cur_channel, cpe->ch[j].coeffs, &wi[j]);
564 encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window); 564 encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window);
565 } 565 }
566 start_ch += chans; 566 start_ch += chans;
569 put_bits(&s->pb, 3, TYPE_END); 569 put_bits(&s->pb, 3, TYPE_END);
570 flush_put_bits(&s->pb); 570 flush_put_bits(&s->pb);
571 avctx->frame_bits = put_bits_count(&s->pb); 571 avctx->frame_bits = put_bits_count(&s->pb);
572 572
573 // rate control stuff 573 // rate control stuff
574 if(!(avctx->flags & CODEC_FLAG_QSCALE)){ 574 if (!(avctx->flags & CODEC_FLAG_QSCALE)) {
575 float ratio = avctx->bit_rate * 1024.0f / avctx->sample_rate / avctx->frame_bits; 575 float ratio = avctx->bit_rate * 1024.0f / avctx->sample_rate / avctx->frame_bits;
576 s->lambda *= ratio; 576 s->lambda *= ratio;
577 } 577 }
578 578
579 if (avctx->frame_bits > 6144*avctx->channels) { 579 if (avctx->frame_bits > 6144*avctx->channels) {
580 av_log(avctx, AV_LOG_ERROR, "input buffer violation %d > %d.\n", avctx->frame_bits, 6144*avctx->channels); 580 av_log(avctx, AV_LOG_ERROR, "input buffer violation %d > %d.\n", avctx->frame_bits, 6144*avctx->channels);
581 } 581 }
582 582
583 if(!data) 583 if (!data)
584 s->last_frame = 1; 584 s->last_frame = 1;
585 memcpy(s->samples, s->samples + 1024 * avctx->channels, 1024 * avctx->channels * sizeof(s->samples[0])); 585 memcpy(s->samples, s->samples + 1024 * avctx->channels, 1024 * avctx->channels * sizeof(s->samples[0]));
586 return put_bits_count(&s->pb)>>3; 586 return put_bits_count(&s->pb)>>3;
587 } 587 }
588 588