diff options
| author | Johnathan Corgan | 2010-06-22 07:45:21 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-06-22 07:45:21 -0700 |
| commit | 36389a6f6c5c84599757a140c83e59372f0350c9 (patch) | |
| tree | a4c12d47d0c11cfca9f026434bdff08020c76202 /gnuradio-core | |
| parent | 76eabccf014dfd1a055f2797179e3a4c0fe21d37 (diff) | |
| parent | ec8ef957565226ec98830192544d7d5da68dbe23 (diff) | |
| download | gnuradio-36389a6f6c5c84599757a140c83e59372f0350c9.tar.gz gnuradio-36389a6f6c5c84599757a140c83e59372f0350c9.tar.bz2 gnuradio-36389a6f6c5c84599757a140c83e59372f0350c9.zip | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/src/lib/general/gri_fft.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/general/gri_fft.cc b/gnuradio-core/src/lib/general/gri_fft.cc index e535f28c7..1ce14eefd 100644 --- a/gnuradio-core/src/lib/general/gri_fft.cc +++ b/gnuradio-core/src/lib/general/gri_fft.cc @@ -28,6 +28,7 @@ #include <stdio.h> #include <cassert> #include <stdexcept> +#include <gr_prefs.h> boost::mutex & @@ -113,7 +114,9 @@ gri_fft_complex::gri_fft_complex (int fft_size, bool forward) reinterpret_cast<fftwf_complex *>(d_inbuf), reinterpret_cast<fftwf_complex *>(d_outbuf), forward ? FFTW_FORWARD : FFTW_BACKWARD, - FFTW_MEASURE); + gr_prefs::singleton()->get_bool("fftw", "estimate", false) == true ? FFTW_ESTIMATE + : FFTW_MEASURE); + if (d_plan == NULL) { fprintf(stderr, "gri_fft_complex: error creating plan\n"); @@ -165,7 +168,8 @@ gri_fft_real_fwd::gri_fft_real_fwd (int fft_size) d_plan = fftwf_plan_dft_r2c_1d (fft_size, d_inbuf, reinterpret_cast<fftwf_complex *>(d_outbuf), - FFTW_MEASURE); + gr_prefs::singleton()->get_bool("fftw", "estimate", false) == true ? FFTW_ESTIMATE + : FFTW_MEASURE); if (d_plan == NULL) { fprintf(stderr, "gri_fft_real_fwd: error creating plan\n"); |