# HG changeset patch # User ods15 # Date 1159768585 0 # Node ID 5f8cfa1a6fdbd1b6b50553809ff4af401d34bcfe # Parent 6591b55f648244d95186ebe8faf721661a0c528b Original Commit: r39 | ods15 | 2006-09-23 09:36:11 +0300 (Sat, 23 Sep 2006) | 2 lines add window function diff -r 6591b55f6482 -r 5f8cfa1a6fdb vorbis_enc.c --- a/vorbis_enc.c Mon Oct 02 05:56:23 2006 +0000 +++ b/vorbis_enc.c Mon Oct 02 05:56:25 2006 +0000 @@ -98,6 +98,7 @@ int blocksize[2]; // in (1<modes[0].blockflag = 0; venc->modes[0].mapping = 0; + venc->have_saved = 0; venc->saved = av_malloc(sizeof(float) * venc->channels * (1 << venc->blocksize[1]) / 2); venc->samples = av_malloc(sizeof(float) * venc->channels * (1 << venc->blocksize[1])); venc->floor = av_malloc(sizeof(float) * venc->channels * (1 << venc->blocksize[1]) / 2); @@ -611,6 +613,53 @@ return 0; } +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) { + for (channel = 0; channel < venc->channels; channel++) { + memcpy(venc->samples + channel*window_len*2, venc->saved + channel*window_len, sizeof(float)*window_len); + } + } else { + for (channel = 0; channel < venc->channels; channel++) { + memset(venc->samples + channel*window_len*2, 0, sizeof(float)*window_len); + } + } + + if (samples) { + for (channel = 0; channel < venc->channels; channel++) { + float * offset = venc->saved + 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); + } + } + + for (channel = 0; channel < venc->channels; channel++) { + ff_mdct_calc(&venc->mdct[0], venc->coeffs + channel*window_len, venc->samples + channel*window_len*2, venc->floor/*tmp*/); + } + + if (samples) { + for (channel = 0; channel < venc->channels; channel++) { + j = channel; + for (i = 0; i < samples; i++, j += venc->channels) + venc->saved[i] = audio[j] / 32768. * win[i]; + } + venc->have_saved = 1; + } else { + venc->have_saved = 0; + } + return 1; +} static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * packets, int buf_size, void *data) { @@ -622,6 +671,8 @@ PutBitContext pb; int i; + if (!window(venc, audio, samples)) return 0; + init_put_bits(&pb, packets, buf_size); put_bits(&pb, 1, 0); // magic bit