From 9afbfef48de723d08d15e44d1bbbbf3e0d4ff522 Mon Sep 17 00:00:00 2001 From: Tom Rondeau <tom@trondeau.com> Date: Wed, 24 Jul 2013 12:53:26 -0400 Subject: blocks: moved type conversions to use Volk dispatchers. --- gr-blocks/lib/short_to_float_impl.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gr-blocks/lib/short_to_float_impl.cc') diff --git a/gr-blocks/lib/short_to_float_impl.cc b/gr-blocks/lib/short_to_float_impl.cc index 147b0c07f4..fce0da77b3 100644 --- a/gr-blocks/lib/short_to_float_impl.cc +++ b/gr-blocks/lib/short_to_float_impl.cc @@ -55,12 +55,8 @@ namespace gr { const short *in = (const short *) input_items[0]; float *out = (float *) output_items[0]; - if(is_unaligned()) { - volk_16i_s32f_convert_32f_u(out, in, d_scale, d_vlen*noutput_items); - } - else { - volk_16i_s32f_convert_32f_a(out, in, d_scale, d_vlen*noutput_items); - } + volk_16i_s32f_convert_32f(out, in, d_scale, d_vlen*noutput_items); + return noutput_items; } -- cgit v1.2.3