Mercurial > libavcodec.hg
comparison aacenc.c @ 9942:f91d6810f983 libavcodec
Reindent after last commit
| author | alexc |
|---|---|
| date | Wed, 08 Jul 2009 23:14:47 +0000 |
| parents | a7b6bbf19002 |
| children | c5ca5e520fe1 |
comparison
equal
deleted
inserted
replaced
| 9941:a7b6bbf19002 | 9942:f91d6810f983 |
|---|---|
| 540 } | 540 } |
| 541 start_ch += chans; | 541 start_ch += chans; |
| 542 } | 542 } |
| 543 do { | 543 do { |
| 544 int frame_bits; | 544 int frame_bits; |
| 545 init_put_bits(&s->pb, frame, buf_size*8); | 545 init_put_bits(&s->pb, frame, buf_size*8); |
| 546 if ((avctx->frame_number & 0xFF)==1 && !(avctx->flags & CODEC_FLAG_BITEXACT)) | 546 if ((avctx->frame_number & 0xFF)==1 && !(avctx->flags & CODEC_FLAG_BITEXACT)) |
| 547 put_bitstream_info(avctx, s, LIBAVCODEC_IDENT); | 547 put_bitstream_info(avctx, s, LIBAVCODEC_IDENT); |
| 548 start_ch = 0; | 548 start_ch = 0; |
| 549 memset(chan_el_counter, 0, sizeof(chan_el_counter)); | 549 memset(chan_el_counter, 0, sizeof(chan_el_counter)); |
| 550 for (i = 0; i < chan_map[0]; i++) { | 550 for (i = 0; i < chan_map[0]; i++) { |
| 551 FFPsyWindowInfo* wi = windows + start_ch; | 551 FFPsyWindowInfo* wi = windows + start_ch; |
| 552 tag = chan_map[i+1]; | 552 tag = chan_map[i+1]; |
| 553 chans = tag == TYPE_CPE ? 2 : 1; | 553 chans = tag == TYPE_CPE ? 2 : 1; |
| 554 cpe = &s->cpe[i]; | 554 cpe = &s->cpe[i]; |
| 555 for (j = 0; j < chans; j++) { | 555 for (j = 0; j < chans; j++) { |
| 556 s->coder->search_for_quantizers(avctx, s, &cpe->ch[j], s->lambda); | 556 s->coder->search_for_quantizers(avctx, s, &cpe->ch[j], s->lambda); |
| 557 } | 557 } |
| 558 cpe->common_window = 0; | 558 cpe->common_window = 0; |
| 559 if (chans > 1 | 559 if (chans > 1 |
| 560 && wi[0].window_type[0] == wi[1].window_type[0] | 560 && wi[0].window_type[0] == wi[1].window_type[0] |
| 561 && wi[0].window_shape == wi[1].window_shape) { | 561 && wi[0].window_shape == wi[1].window_shape) { |
| 562 | 562 |
| 563 cpe->common_window = 1; | 563 cpe->common_window = 1; |
| 564 for (j = 0; j < wi[0].num_windows; j++) { | 564 for (j = 0; j < wi[0].num_windows; j++) { |
| 565 if (wi[0].grouping[j] != wi[1].grouping[j]) { | 565 if (wi[0].grouping[j] != wi[1].grouping[j]) { |
| 566 cpe->common_window = 0; | 566 cpe->common_window = 0; |
| 567 break; | 567 break; |
| 568 } | |
| 568 } | 569 } |
| 569 } | 570 } |
| 570 } | 571 if (cpe->common_window && s->coder->search_for_ms) |
| 571 if (cpe->common_window && s->coder->search_for_ms) | 572 s->coder->search_for_ms(s, cpe, s->lambda); |
| 572 s->coder->search_for_ms(s, cpe, s->lambda); | 573 adjust_frame_information(s, cpe, chans); |
| 573 adjust_frame_information(s, cpe, chans); | 574 put_bits(&s->pb, 3, tag); |
| 574 put_bits(&s->pb, 3, tag); | 575 put_bits(&s->pb, 4, chan_el_counter[tag]++); |
| 575 put_bits(&s->pb, 4, chan_el_counter[tag]++); | 576 if (chans == 2) { |
| 576 if (chans == 2) { | 577 put_bits(&s->pb, 1, cpe->common_window); |
| 577 put_bits(&s->pb, 1, cpe->common_window); | 578 if (cpe->common_window) { |
| 578 if (cpe->common_window) { | 579 put_ics_info(s, &cpe->ch[0].ics); |
| 579 put_ics_info(s, &cpe->ch[0].ics); | 580 encode_ms_info(&s->pb, cpe); |
| 580 encode_ms_info(&s->pb, cpe); | 581 } |
| 581 } | 582 } |
| 582 } | 583 for (j = 0; j < chans; j++) { |
| 583 for (j = 0; j < chans; j++) { | 584 s->cur_channel = start_ch + j; |
| 584 s->cur_channel = start_ch + j; | 585 ff_psy_set_band_info(&s->psy, s->cur_channel, cpe->ch[j].coeffs, &wi[j]); |
| 585 ff_psy_set_band_info(&s->psy, s->cur_channel, cpe->ch[j].coeffs, &wi[j]); | 586 encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window); |
| 586 encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window); | 587 } |
| 587 } | 588 start_ch += chans; |
| 588 start_ch += chans; | 589 } |
| 589 } | |
| 590 | 590 |
| 591 frame_bits = put_bits_count(&s->pb); | 591 frame_bits = put_bits_count(&s->pb); |
| 592 if (frame_bits <= 6144 * avctx->channels - 3) | 592 if (frame_bits <= 6144 * avctx->channels - 3) |
| 593 break; | 593 break; |
| 594 | 594 |