comparison vorbis_enc.c @ 3848:4d9aba494478 libavcodec

Original Commit: r46 | ods15 | 2006-09-23 11:36:32 +0300 (Sat, 23 Sep 2006) | 2 lines fix normalization, output is (roughly?) same volume as input

3847:9cf71c2ff770

static int window(venc_context_t * venc, signed short * audio, int samples) {
    int i, j, channel;
    const float * win = venc->win[0];
    int window_len = 1 << (venc->blocksize[0] - 1);
    // FIXME use dsp

    if (!venc->have_saved && !samples) return 0;

    if (venc->have_saved) {

    if (samples) {
        for (channel = 0; channel < venc->channels; channel++) {
            float * offset = venc->samples + channel*window_len*2 + window_len;
            j = channel;
            for (i = 0; i < samples; i++, j += venc->channels)
                offset[i] = audio[j] / 32768. * win[window_len - i];
        }
    } else {
        for (channel = 0; channel < venc->channels; channel++) {
            memset(venc->samples + channel*window_len*2 + window_len, 0, sizeof(float)*window_len);
        }

    if (samples) {
        for (channel = 0; channel < venc->channels; channel++) {
            float * offset = venc->saved + channel*window_len;
            j = channel;
            for (i = 0; i < samples; i++, j += venc->channels)
                offset[i] = audio[j] / 32768. * win[i];
        }
        venc->have_saved = 1;
    } else {
        venc->have_saved = 0;
    }

                put_bits(&pb, book->entries[entry].len, book->entries[entry].codeword);
            }
        }

        for (j = 0; j < samples; j++) {
            venc->floor[i * samples + j] = floor1_inverse_db_table[220];
        }
    }

    for (i = 0; i < venc->channels; i++) {
        int j;

3848:4d9aba494478

static int window(venc_context_t * venc, signed short * audio, int samples) {
    int i, j, channel;
    const float * win = venc->win[0];
    int window_len = 1 << (venc->blocksize[0] - 1);
    float n = (float)(1 << venc->blocksize[0]) / 4.;
    // FIXME use dsp

    if (!venc->have_saved && !samples) return 0;

    if (venc->have_saved) {

    if (samples) {
        for (channel = 0; channel < venc->channels; channel++) {
            float * offset = venc->samples + channel*window_len*2 + window_len;
            j = channel;
            for (i = 0; i < samples; i++, j += venc->channels)
                offset[i] = audio[j] / 32768. * win[window_len - i] / n;
        }
    } else {
        for (channel = 0; channel < venc->channels; channel++) {
            memset(venc->samples + channel*window_len*2 + window_len, 0, sizeof(float)*window_len);
        }

    if (samples) {
        for (channel = 0; channel < venc->channels; channel++) {
            float * offset = venc->saved + channel*window_len;
            j = channel;
            for (i = 0; i < samples; i++, j += venc->channels)
                offset[i] = audio[j] / 32768. * win[i] / n;
        }
        venc->have_saved = 1;
    } else {
        venc->have_saved = 0;
    }

                put_bits(&pb, book->entries[entry].len, book->entries[entry].codeword);
            }
        }

        for (j = 0; j < samples; j++) {
            venc->floor[i * samples + j] = floor1_inverse_db_table[113];
        }
    }

    for (i = 0; i < venc->channels; i++) {
        int j;