diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-02-24 17:50:10 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-02-24 17:50:10 -0500 |
| commit | 4c8665422db1efeea228e7d35cdf2d58b6172b03 (patch) | |
| tree | eedef81f8def3492154c403b633920b307dffd37 | |
| parent | 4bbd9a89a0e5e77adb601fc08a6d17484401f1c9 (diff) | |
qtgui: fixed call to _a version of volk kernels for waterfall plots.
(same fix tha was applied to freq_sinks in bf6d843ebde3a36).
| -rw-r--r-- | gr-qtgui/lib/waterfall_sink_c_impl.cc | 15 | ||||
| -rw-r--r-- | gr-qtgui/lib/waterfall_sink_f_impl.cc | 16 |
2 files changed, 16 insertions, 15 deletions
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index 9fc4f2163f..e3ac3cc8e2 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -32,7 +32,7 @@ namespace gr { namespace qtgui { - + waterfall_sink_c::sptr waterfall_sink_c::make(int fftsize, int wintype, double fc, double bw, @@ -321,7 +321,8 @@ namespace gr { waterfall_sink_c_impl::fft(float *data_out, const gr_complex *data_in, int size) { if(d_window.size()) { - volk_32fc_32f_multiply_32fc_a(d_fft->get_inbuf(), data_in, &d_window.front(), size); + volk_32fc_32f_multiply_32fc(d_fft->get_inbuf(), data_in, + &d_window.front(), size); } else { memcpy(d_fft->get_inbuf(), data_in, sizeof(gr_complex)*size); @@ -329,8 +330,8 @@ namespace gr { d_fft->execute(); // compute the fft - volk_32fc_s32f_x2_power_spectral_density_32f_a(data_out, d_fft->get_outbuf(), - size, 1.0, size); + volk_32fc_s32f_x2_power_spectral_density_32f(data_out, d_fft->get_outbuf(), + size, 1.0, size); // Perform shift operation unsigned int len = (unsigned int)(floor(size/2.0)); @@ -383,8 +384,8 @@ namespace gr { memset(d_magbufs[i], 0, newfftsize*sizeof(double)); } - // Set new fft size and reset buffer index - // (throws away any currently held data, but who cares?) + // Set new fft size and reset buffer index + // (throws away any currently held data, but who cares?) d_fftsize = newfftsize; d_index = 0; @@ -433,7 +434,7 @@ namespace gr { } //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize); } - + d_last_time = gr::high_res_timer_now(); d_qApplication->postEvent(d_main_gui, new WaterfallUpdateEvent(d_magbufs, diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index 50525f1903..4164a1844f 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -31,7 +31,7 @@ namespace gr { namespace qtgui { - + waterfall_sink_f::sptr waterfall_sink_f::make(int fftsize, int wintype, double fc, double bw, @@ -325,14 +325,14 @@ namespace gr { dst[i] = data_in[i]; if(d_window.size()) { - volk_32fc_32f_multiply_32fc_a(d_fft->get_inbuf(), dst, - &d_window.front(), size); + volk_32fc_32f_multiply_32fc(d_fft->get_inbuf(), dst, + &d_window.front(), size); } d_fft->execute(); // compute the fft - volk_32fc_s32f_x2_power_spectral_density_32f_a(data_out, d_fft->get_outbuf(), - size, 1.0, size); + volk_32fc_s32f_x2_power_spectral_density_32f(data_out, d_fft->get_outbuf(), + size, 1.0, size); // Perform shift operation unsigned int len = (unsigned int)(floor(size/2.0)); @@ -384,8 +384,8 @@ namespace gr { memset(d_magbufs[i], 0, newfftsize*sizeof(double)); } - // Set new fft size and reset buffer index - // (throws away any currently held data, but who cares?) + // Set new fft size and reset buffer index + // (throws away any currently held data, but who cares?) d_fftsize = newfftsize; d_index = 0; @@ -434,7 +434,7 @@ namespace gr { } //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize); } - + d_last_time = gr::high_res_timer_now(); d_qApplication->postEvent(d_main_gui, new WaterfallUpdateEvent(d_magbufs, |