comparison aacenc.c @ 11728:907ac02ef561 libavcodec

aacenc: Fix psy logic. Set band info before determining scalefactors. Use the look ahead for windowing decision.

11727:0c98bdb71f48

            tag      = chan_map[i+1];
            chans    = tag == TYPE_CPE ? 2 : 1;
            cpe      = &s->cpe[i];
            for (j = 0; j < chans; j++) {
                s->cur_channel = start_ch + j;
                s->coder->search_for_quantizers(avctx, s, &cpe->ch[j], s->lambda);
            }
            cpe->common_window = 0;
            if (chans > 1
                && wi[0].window_type[0] == wi[1].window_type[0]

                    encode_ms_info(&s->pb, cpe);
                }
            }
            for (j = 0; j < chans; j++) {
                s->cur_channel = start_ch + j;
                ff_psy_set_band_info(&s->psy, s->cur_channel, cpe->ch[j].coeffs, &wi[j]);
                encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window);
            }
            start_ch += chans;
        }

11728:907ac02ef561

            tag      = chan_map[i+1];
            chans    = tag == TYPE_CPE ? 2 : 1;
            cpe      = &s->cpe[i];
            for (j = 0; j < chans; j++) {
                s->cur_channel = start_ch + j;
                ff_psy_set_band_info(&s->psy, s->cur_channel, cpe->ch[j].coeffs, &wi[j]);
                s->coder->search_for_quantizers(avctx, s, &cpe->ch[j], s->lambda);
            }
            cpe->common_window = 0;
            if (chans > 1
                && wi[0].window_type[0] == wi[1].window_type[0]

                    encode_ms_info(&s->pb, cpe);
                }
            }
            for (j = 0; j < chans; j++) {
                s->cur_channel = start_ch + j;
                encode_individual_channel(avctx, s, &cpe->ch[j], cpe->common_window);
            }
            start_ch += chans;
        }