comparison aacenc.c @ 12443:e824bd360c35 libavcodec

aacenc: Write tag.elem_id early.

12442:94b578d0af10

        for (i = 0; i < chan_map[0]; i++) {
            FFPsyWindowInfo* wi = windows + start_ch;
            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);
            }

            }
            s->cur_channel = start_ch;
            if (cpe->common_window && s->coder->search_for_ms)
                s->coder->search_for_ms(s, cpe, s->lambda);
            adjust_frame_information(s, cpe, chans);
            put_bits(&s->pb, 3, tag);
            put_bits(&s->pb, 4, chan_el_counter[tag]++);
            if (chans == 2) {
                put_bits(&s->pb, 1, cpe->common_window);
                if (cpe->common_window) {
                    put_ics_info(s, &cpe->ch[0].ics);
                    encode_ms_info(&s->pb, cpe);

12443:e824bd360c35

        for (i = 0; i < chan_map[0]; i++) {
            FFPsyWindowInfo* wi = windows + start_ch;
            tag      = chan_map[i+1];
            chans    = tag == TYPE_CPE ? 2 : 1;
            cpe      = &s->cpe[i];
            put_bits(&s->pb, 3, tag);
            put_bits(&s->pb, 4, chan_el_counter[tag]++);
            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);
            }

            }
            s->cur_channel = start_ch;
            if (cpe->common_window && s->coder->search_for_ms)
                s->coder->search_for_ms(s, cpe, s->lambda);
            adjust_frame_information(s, cpe, chans);
            if (chans == 2) {
                put_bits(&s->pb, 1, cpe->common_window);
                if (cpe->common_window) {
                    put_ics_info(s, &cpe->ch[0].ics);
                    encode_ms_info(&s->pb, cpe);