summaryrefslogtreecommitdiff
path: root/gr-fft/lib
diff options
context:
space:
mode:
authorDoug Geiger <doug.geiger@bioradiation.net>2015-09-21 18:08:46 -0400
committerDoug Geiger <doug.geiger@bioradiation.net>2015-09-21 18:08:46 -0400
commitedd7be6ce3de8e13100d0d27ead108ad4a42b950 (patch)
tree2afe1d1f567192174d160af359d7620bc1bb09c1 /gr-fft/lib
parenta03893d51553eb74ac348ee88d4dd879b0a253c8 (diff)
Fix the VOLKized fft_vcc_fftw and QA code
The QA code did not cover all the cases being VOLKized, and thus failed to notice the incorrect pointer math. This QA code (correctly!) fails on the previous commit, and (correctly!) passes with this fix to fft_vcc_fftw.cc. Thanks to awalls-cx18 for noticing this, and providing the correct array indexing call to VOLK. Fixes issue #844
Diffstat (limited to 'gr-fft/lib')
-rw-r--r--gr-fft/lib/fft_vcc_fftw.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-fft/lib/fft_vcc_fftw.cc b/gr-fft/lib/fft_vcc_fftw.cc
index 37c0d28736..3b23058df5 100644
--- a/gr-fft/lib/fft_vcc_fftw.cc
+++ b/gr-fft/lib/fft_vcc_fftw.cc
@@ -103,8 +103,8 @@ namespace gr {
if(!d_forward && d_shift) {
unsigned int offset = (!d_forward && d_shift)?(d_fft_size/2):0;
int fft_m_offset = d_fft_size - offset;
- volk_32fc_32f_multiply_32fc(&dst[fft_m_offset], in, &d_window[0], offset);
- volk_32fc_32f_multiply_32fc(&dst[0], in, &d_window[0], d_fft_size);
+ volk_32fc_32f_multiply_32fc(&dst[fft_m_offset], &in[0], &d_window[0], offset);
+ volk_32fc_32f_multiply_32fc(&dst[0], &in[offset], &d_window[offset], d_fft_size-offset);
}
else {
volk_32fc_32f_multiply_32fc(&dst[0], in, &d_window[0], d_fft_size);