comparison aacenc.c @ 12191:335efeae3bb7 libavcodec

aacenc: Adjust array offsets for the current channel before calling ff_psy_suggest_window(). Patch by Nathan Caldwell <[e-mail]>

12190:4be87c8091bf

    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];
        samples2 = samples + start_ch;
        la       = samples2 + (448+64) * avctx->channels + start_ch;
        if (!data)
            la = NULL;
        for (j = 0; j < chans; j++) {
            IndividualChannelStream *ics = &cpe->ch[j].ics;
            int k;
            if (tag == TYPE_LFE) {
                wi[j].window_type[0] = ONLY_LONG_SEQUENCE;
                wi[j].window_shape   = 0;
                wi[j].num_windows    = 1;
                wi[j].grouping[0]    = 1;
            } else {
                wi[j] = ff_psy_suggest_window(&s->psy, samples2, la, start_ch + j,
                                              ics->window_sequence[0]);
            }
            ics->window_sequence[1] = ics->window_sequence[0];
            ics->window_sequence[0] = wi[j].window_type[0];
            ics->use_kb_window[1]   = ics->use_kb_window[0];

            ics->swb_sizes          = s->psy.bands    [ics->num_windows == 8];
            ics->num_swb            = tag == TYPE_LFE ? 12 : s->psy.num_bands[ics->num_windows == 8];
            for (k = 0; k < ics->num_windows; k++)
                ics->group_len[k] = wi[j].grouping[k];

            s->cur_channel = start_ch + j;
            apply_window_and_mdct(avctx, s, &cpe->ch[j], samples2 + j);
        }
        start_ch += chans;
    }
    do {
        int frame_bits;

12191:335efeae3bb7

    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++) {
            IndividualChannelStream *ics = &cpe->ch[j].ics;
            int k;
            int cur_channel = start_ch + j;
            samples2 = samples + cur_channel;
            la       = samples2 + (448+64) * avctx->channels;
            if (!data)
                la = NULL;
            if (tag == TYPE_LFE) {
                wi[j].window_type[0] = ONLY_LONG_SEQUENCE;
                wi[j].window_shape   = 0;
                wi[j].num_windows    = 1;
                wi[j].grouping[0]    = 1;
            } else {
                wi[j] = ff_psy_suggest_window(&s->psy, samples2, la, cur_channel,
                                              ics->window_sequence[0]);
            }
            ics->window_sequence[1] = ics->window_sequence[0];
            ics->window_sequence[0] = wi[j].window_type[0];
            ics->use_kb_window[1]   = ics->use_kb_window[0];

            ics->swb_sizes          = s->psy.bands    [ics->num_windows == 8];
            ics->num_swb            = tag == TYPE_LFE ? 12 : s->psy.num_bands[ics->num_windows == 8];
            for (k = 0; k < ics->num_windows; k++)
                ics->group_len[k] = wi[j].grouping[k];

            s->cur_channel = cur_channel;
            apply_window_and_mdct(avctx, s, &cpe->ch[j], samples2);
        }
        start_ch += chans;
    }
    do {
        int frame_bits;