Revision b58e2985 libavcodec/aacenc.c

View differences:

libavcodec/aacenc.c
537 537
                wi[ch].num_windows    = 1;
538 538
                wi[ch].grouping[0]    = 1;
539 539
            } else {
540
                wi[ch] = ff_psy_suggest_window(&s->psy, samples2, la, cur_channel,
541
                                               ics->window_sequence[0]);
540
                wi[ch] = s->psy.model->window(&s->psy, samples2, la, cur_channel,
541
                                              ics->window_sequence[0]);
542 542
            }
543 543
            ics->window_sequence[1] = ics->window_sequence[0];
544 544
            ics->window_sequence[0] = wi[ch].window_type[0];
......
570 570
            put_bits(&s->pb, 4, chan_el_counter[tag]++);
571 571
            for (ch = 0; ch < chans; ch++) {
572 572
                s->cur_channel = start_ch + ch;
573
                ff_psy_set_band_info(&s->psy, s->cur_channel, cpe->ch[ch].coeffs, &wi[ch]);
573
                s->psy.model->analyze(&s->psy, s->cur_channel, cpe->ch[ch].coeffs, &wi[ch]);
574 574
                s->coder->search_for_quantizers(avctx, s, &cpe->ch[ch], s->lambda);
575 575
            }
576 576
            cpe->common_window = 0;

Also available in: Unified diff