Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17133
Modified Files: Tag: devel_0_39 d_fft.c Log Message: rather ESTIMATE than MEASURE in fftw, since the latter takes too much time
Index: d_fft.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_fft.c,v retrieving revision 1.2.4.1.2.1 retrieving revision 1.2.4.1.2.2 diff -C2 -d -r1.2.4.1.2.1 -r1.2.4.1.2.2 *** d_fft.c 12 Jul 2005 15:11:06 -0000 1.2.4.1.2.1 --- d_fft.c 5 Jan 2006 10:35:14 -0000 1.2.4.1.2.2 *************** *** 306,310 **** x->dim.os=1; x->plan = fftwf_plan_guru_split_dft(1, &(x->dim), 0, NULL, in1, ! in2, out1, out2, FFTW_MEASURE); dsp_add(sigfftw_perform, 1, &x->plan); } --- 306,310 ---- x->dim.os=1; x->plan = fftwf_plan_guru_split_dft(1, &(x->dim), 0, NULL, in1, ! in2, out1, out2, FFTW_ESTIMATE); dsp_add(sigfftw_perform, 1, &x->plan); } *************** *** 322,326 **** x->dim.os=1; x->plan = fftwf_plan_guru_split_dft(1, &(x->dim), 0, NULL, in2, ! in1, out2, out1, FFTW_MEASURE); dsp_add(sigfftw_perform, 1, &x->plan); } --- 322,326 ---- x->dim.os=1; x->plan = fftwf_plan_guru_split_dft(1, &(x->dim), 0, NULL, in2, ! in1, out2, out1, FFTW_ESTIMATE); dsp_add(sigfftw_perform, 1, &x->plan); } *************** *** 412,416 **** x->dim.os=1; x->plan = fftwf_plan_guru_split_dft_r2c(1, &(x->dim), 0, NULL, ! in, out1, out2, FFTW_MEASURE | FFTW_PRESERVE_INPUT); dsp_add(sigrfftw_perform,3,&x->plan,out2+1,n2-1); } --- 412,416 ---- x->dim.os=1; x->plan = fftwf_plan_guru_split_dft_r2c(1, &(x->dim), 0, NULL, ! in, out1, out2, FFTW_ESTIMATE | FFTW_PRESERVE_INPUT); dsp_add(sigrfftw_perform,3,&x->plan,out2+1,n2-1); } *************** *** 486,490 **** x->dim.os=1; x->plan = fftwf_plan_guru_split_dft_c2r(1, &(x->dim), 0, NULL, ! in1, in2, out, FFTW_MEASURE | FFTW_PRESERVE_INPUT); dsp_add_zero(in1+ n/2, n/2); dsp_add(sigrifftw_perform,3,&x->plan,in2,n2); --- 486,490 ---- x->dim.os=1; x->plan = fftwf_plan_guru_split_dft_c2r(1, &(x->dim), 0, NULL, ! in1, in2, out, FFTW_ESTIMATE | FFTW_PRESERVE_INPUT); dsp_add_zero(in1+ n/2, n/2); dsp_add(sigrifftw_perform,3,&x->plan,in2,n2);