comparison aacenc.c @ 11837:bba34e33081d libavcodec

Cleanup apply_window_and_mdct().

11836:f71c3558f3f5

                s->output[i] = sce->saved[i] * pwindow[i - 448];
            for (i = 576; i < 704; i++)
                s->output[i] = sce->saved[i];
        }
        if (sce->ics.window_sequence[0] != LONG_START_SEQUENCE) {
            j = channel;
            for (i = 0; i < 1024; i++, j += avctx->channels) {
                s->output[i+1024]         = audio[j] * lwindow[1024 - i - 1];
                sce->saved[i] = audio[j] * lwindow[i];
            }
        } else {
            j = channel;
            for (i = 0; i < 448; i++, j += avctx->channels)
                s->output[i+1024]         = audio[j];
            for (i = 448; i < 576; i++, j += avctx->channels)
                s->output[i+1024]         = audio[j] * swindow[576 - i - 1];
            memset(s->output+1024+576, 0, sizeof(s->output[0]) * 448);
            j = channel;
            for (i = 0; i < 1024; i++, j += avctx->channels)
                sce->saved[i] = audio[j];
        }
        ff_mdct_calc(&s->mdct1024, sce->coeffs, s->output);
    } else {
        j = channel;
        for (k = 0; k < 1024; k += 128) {
            for (i = 448 + k; i < 448 + k + 256; i++)
                s->output[i - 448 - k] = (i < 1024)
                                         ? sce->saved[i]
                                         : audio[channel + (i-1024)*avctx->channels];
            s->dsp.vector_fmul        (s->output,     k ?  swindow : pwindow, 128);
            s->dsp.vector_fmul_reverse(s->output+128, s->output+128, swindow, 128);
            ff_mdct_calc(&s->mdct128, sce->coeffs + k, s->output);
        }
        j = channel;
        for (i = 0; i < 1024; i++, j += avctx->channels)
            sce->saved[i] = audio[j];
    }
}

/**

11837:bba34e33081d

                s->output[i] = sce->saved[i] * pwindow[i - 448];
            for (i = 576; i < 704; i++)
                s->output[i] = sce->saved[i];
        }
        if (sce->ics.window_sequence[0] != LONG_START_SEQUENCE) {
            for (i = 0, j = channel; i < 1024; i++, j += avctx->channels) {
                s->output[i+1024]         = audio[j] * lwindow[1024 - i - 1];
                sce->saved[i] = audio[j] * lwindow[i];
            }
        } else {
            for (i = 0, j = channel; i < 448; i++, j += avctx->channels)
                s->output[i+1024]         = audio[j];
            for (; i < 576; i++, j += avctx->channels)
                s->output[i+1024]         = audio[j] * swindow[576 - i - 1];
            memset(s->output+1024+576, 0, sizeof(s->output[0]) * 448);
            for (i = 0, j = channel; i < 1024; i++, j += avctx->channels)
                sce->saved[i] = audio[j];
        }
        ff_mdct_calc(&s->mdct1024, sce->coeffs, s->output);
    } else {
        for (k = 0; k < 1024; k += 128) {
            for (i = 448 + k; i < 448 + k + 256; i++)
                s->output[i - 448 - k] = (i < 1024)
                                         ? sce->saved[i]
                                         : audio[channel + (i-1024)*avctx->channels];
            s->dsp.vector_fmul        (s->output,     k ?  swindow : pwindow, 128);
            s->dsp.vector_fmul_reverse(s->output+128, s->output+128, swindow, 128);
            ff_mdct_calc(&s->mdct128, sce->coeffs + k, s->output);
        }
        for (i = 0, j = channel; i < 1024; i++, j += avctx->channels)
            sce->saved[i] = audio[j];
    }
}

/**