diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-12 09:46:25 +1000 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-12 09:46:25 +1000 |
| commit | 792302fbdfa37cf680234353dbe973886c4b2898 (patch) | |
| tree | e999bcf6dbfe12cf19ae49b1762cd71d724aa8ae /gr-blocks/lib/interleaved_short_array_to_complex.cc | |
| parent | a7adf4689b58d91bd88d0dc948b017e1d42bff01 (diff) | |
| parent | 9851f2377d099ffe72312375e7f761f66b664aa6 (diff) | |
Merge branch 'next' into runtime_pimpl
Catches up runtime_pimpl branch with changes on next since
the initial branch start.
Conflicts:
gnuradio-runtime/include/gnuradio/constants.h
gnuradio-runtime/include/gnuradio/tags.h
gnuradio-runtime/include/gr_block_detail.h
gnuradio-runtime/include/gr_buffer.h
gnuradio-runtime/lib/CMakeLists.txt
gnuradio-runtime/lib/gr_block.cc
gnuradio-runtime/lib/gr_block_detail.cc
gnuradio-runtime/lib/gr_block_executor.cc
gnuradio-runtime/lib/gr_buffer.cc
gnuradio-runtime/lib/gr_realtime.cc
gr-blocks/lib/interleaved_short_to_complex_impl.cc
Diffstat (limited to 'gr-blocks/lib/interleaved_short_array_to_complex.cc')
| -rw-r--r-- | gr-blocks/lib/interleaved_short_array_to_complex.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gr-blocks/lib/interleaved_short_array_to_complex.cc b/gr-blocks/lib/interleaved_short_array_to_complex.cc index eb6431b7a5..4aac6208a1 100644 --- a/gr-blocks/lib/interleaved_short_array_to_complex.cc +++ b/gr-blocks/lib/interleaved_short_array_to_complex.cc @@ -26,14 +26,12 @@ #include "interleaved_short_array_to_complex.h" #include <assert.h> +#include <volk/volk.h> void interleaved_short_array_to_complex (const short *in, gr_complex *out, int nsamples) { assert (nsamples % 2 == 0); - - for (int i = 0; i < nsamples/2; i++){ - out[i] = gr_complex (in[i*2 + 0], in[i*2 + 1]); - } + volk_16i_s32f_convert_32f_u( (float*)out, (const int16_t*) in, 1, nsamples ); } |