blocks: added gr::blocks::float_to_int

author: Johnathan Corgan <jcorgan@corganenterprises.com> 2012-06-25 06:25:04 -0700
committer: Johnathan Corgan <jcorgan@corganenterprises.com> 2012-06-25 06:25:04 -0700
commit: 31c61c16e2073f0c3f54a8d0523d8c4f10ca5dd2 (patch)
tree: bf81e2f6ba3a342f32cd9425dfcdfadecfb6d1d6 /gr-blocks
parent: 8c23d9f9ebfe04b60d59efc636c6d5b02baacc99 (diff)
11 files changed, 341 insertions, 4 deletions
diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml
index 29cc2634d5..169533d34a 100644
--- a/gr-blocks/grc/blocks_block_tree.xml
+++ b/gr-blocks/grc/blocks_block_tree.xml
@@ -38,7 +38,7 @@
 		<block>blocks_sub_xx</block>
 	</cat>
 	<cat>
-	        <name>Type Conversions</name>
+	        <name>Stream Type Conversions</name>
 		<block>blocks_char_to_float</block>
 		<block>blocks_char_to_short</block>
 		<block>blocks_complex_to_interleaved_short</block>
@@ -48,7 +48,8 @@
 		<block>blocks_complex_to_mag</block>
 		<block>blocks_complex_to_mag_squared</block>
 		<block>blocks_complex_to_arg</block>
-		<block>float_to_char</block>
-		<block>float_to_complex</block>
+		<block>blocks_float_to_char</block>
+		<block>blocks_float_to_complex</block>
+		<block>blocks_float_to_int</block>
 	</cat>
 </cat>
diff --git a/gr-blocks/grc/blocks_float_to_int.xml b/gr-blocks/grc/blocks_float_to_int.xml
new file mode 100644
index 0000000000..0ff5d9cdf1
--- /dev/null
+++ b/gr-blocks/grc/blocks_float_to_int.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Float to Int:
+###################################################
+ -->
+<block>
+	<name>Float To Int</name>
+	<key>blocks_float_to_int</key>
+	<import>from gnuradio import blocks</import>
+	<make>blocks.float_to_int($vlen, $scale)</make>
+	<callback>set_scale($scale)</callback>
+	<param>
+		<name>Vec Length</name>
+		<key>vlen</key>
+		<value>1</value>
+		<type>int</type>
+	</param>
+	<param>
+		<name>Scale</name>
+		<key>scale</key>
+		<value>1</value>
+		<type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>float</type>
+		<vlen>$vlen</vlen>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>int</type>
+		<vlen>$vlen</vlen>
+	</source>
+</block>
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt
index 96f42a6993..3171a4d02b 100644
--- a/gr-blocks/include/blocks/CMakeLists.txt
+++ b/gr-blocks/include/blocks/CMakeLists.txt
@@ -95,6 +95,7 @@ install(FILES
     complex_to_arg.h
     float_to_char.h
     float_to_complex.h
+    float_to_int.h
     multiply_cc.h
     multiply_ff.h
     multiply_const_cc.h
diff --git a/gr-blocks/include/blocks/float_to_int.h b/gr-blocks/include/blocks/float_to_int.h
new file mode 100644
index 0000000000..95c62e5162
--- /dev/null
+++ b/gr-blocks/include/blocks/float_to_int.h
@@ -0,0 +1,62 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_FLOAT_TO_INT_H
+#define INCLUDED_BLOCKS_FLOAT_TO_INT_H
+
+#include <blocks/api.h>
+#include <gr_sync_block.h>
+
+namespace gr {
+  namespace blocks {
+
+    /*!
+     * \brief Convert stream of floats to a stream of char
+     * \ingroup converter_blk
+     *
+     * \param vlen vector length of data streams.
+     * \param scale a scalar multiplier to change the output signal scale.
+     */
+    class BLOCKS_API float_to_int : virtual public gr_sync_block
+    {
+    public:
+      
+      // gr::blocks::float_to_int_ff::sptr
+      typedef boost::shared_ptr<float_to_int> sptr;
+
+      static sptr make(size_t vlen=1, float scale=1.0);
+
+      /*!
+       * Get the scalar multiplier value.
+       */
+      virtual float scale() const = 0;
+
+      /*!
+       * Set the scalar multiplier value.
+       */
+      virtual void set_scale(float scale) = 0;
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+
+#endif /* INCLUDED_BLOCKS_FLOAT_TO_INT_H */
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index f1d04622d9..e443d5488f 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -77,7 +77,7 @@ macro(expand_cc_h_impl root)
   set_source_files_properties(${expanded_files_h_impl}
     PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
   )
-  
+
   #install rules for the generated cc files
   list(APPEND generated_sources ${expanded_files_cc_impl})  
 endmacro(expand_cc_h_impl)
@@ -129,6 +129,8 @@ list(APPEND gr_blocks_sources
     complex_to_arg_impl.cc
     float_to_char_impl.cc
     float_to_complex_impl.cc
+    float_array_to_int.cc
+    float_to_int_impl.cc
     multiply_cc_impl.cc
     multiply_ff_impl.cc
     multiply_const_cc_impl.cc
diff --git a/gr-blocks/lib/float_array_to_int.cc b/gr-blocks/lib/float_array_to_int.cc
new file mode 100644
index 0000000000..66b112c066
--- /dev/null
+++ b/gr-blocks/lib/float_array_to_int.cc
@@ -0,0 +1,46 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2011-2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _ISOC9X_SOURCE
+#include <float_array_to_int.h>
+#include <math.h>
+#include <stdint.h>
+
+static const int64_t MAX_INT =  2147483647; //  (2^31)-1
+static const int64_t MIN_INT = -2147483647; // -(2^31)-1
+
+void
+float_array_to_int(const float *in, int *out, float scale, int nsamples)
+{
+  for (int i = 0; i < nsamples; i++){
+    int64_t r = llrintf(scale * in[i]);
+    if (r < MIN_INT)
+      r = MIN_INT;
+    else if (r > MAX_INT)
+      r = MAX_INT;
+    out[i] = static_cast<int>(r);
+  }
+}
diff --git a/gr-blocks/lib/float_array_to_int.h b/gr-blocks/lib/float_array_to_int.h
new file mode 100644
index 0000000000..943736d7ee
--- /dev/null
+++ b/gr-blocks/lib/float_array_to_int.h
@@ -0,0 +1,33 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2011-2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_BLOCKS_FLOAT_ARRAY_TO_INT_H
+#define INCLUDED_BLOCKS_FLOAT_ARRAY_TO_INT_H
+
+#include <blocks/api.h>
+
+/*!
+ * convert array of floats to int with rounding and saturation.
+ */
+BLOCKS_API void float_array_to_int (const float *in, int *out, float scale, int nsamples);
+
+#endif /* INCLUDED_BLOCKS_FLOAT_ARRAY_TO_INT_H */
diff --git a/gr-blocks/lib/float_to_int_impl.cc b/gr-blocks/lib/float_to_int_impl.cc
new file mode 100644
index 0000000000..24218ab682
--- /dev/null
+++ b/gr-blocks/lib/float_to_int_impl.cc
@@ -0,0 +1,83 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "float_to_int_impl.h"
+#include "float_array_to_int.h"
+#include <gr_io_signature.h>
+#include <volk/volk.h>
+
+namespace gr {
+  namespace blocks {
+
+    float_to_int::sptr float_to_int::make(size_t vlen, float scale)
+    {
+      return gnuradio::get_initial_sptr(new float_to_int_impl(vlen, scale));
+    }
+
+    float_to_int_impl::float_to_int_impl(size_t vlen, float scale)
+      : gr_sync_block("float_to_int",
+		      gr_make_io_signature (1, 1, sizeof(float)*vlen),
+		      gr_make_io_signature (1, 1, sizeof(int)*vlen)),
+	d_vlen(vlen), d_scale(scale)
+    {
+      const int alignment_multiple =
+	volk_get_alignment() / sizeof(int);
+      set_alignment(std::max(1, alignment_multiple));
+    }
+
+    int
+    float_to_int_impl::work(int noutput_items,
+			    gr_vector_const_void_star &input_items,
+			    gr_vector_void_star &output_items)
+    {
+      // Disable the Volk for now. There is a problem for large 32-bit ints that
+      // are not properly represented by the precisions of a single float, which
+      // can cause wrapping from large, positive numbers to negative.
+      // In gri_float_to_int, the value is first promoted to a 64-bit
+      // value, clipped, then converted to a float.
+#if 0
+      const float *in = (const float *) input_items[0];
+      int32_t *out = (int32_t *) output_items[0];
+      
+      if(is_unaligned()) {
+	volk_32f_s32f_convert_32i_u(out, in, d_scale, d_vlen*noutput_items);
+      }
+      else {
+	volk_32f_s32f_convert_32i_a(out, in, d_scale, d_vlen*noutput_items);
+      }
+#else
+      const float *in = (const float *) input_items[0];
+      int *out = (int *) output_items[0];
+      
+      float_array_to_int (in, out, d_scale, d_vlen*noutput_items);
+      
+#endif
+
+      return noutput_items;
+    }
+
+  } /* namespace blocks */
+}/* namespace gr */
diff --git a/gr-blocks/lib/float_to_int_impl.h b/gr-blocks/lib/float_to_int_impl.h
new file mode 100644
index 0000000000..71775fcb1c
--- /dev/null
+++ b/gr-blocks/lib/float_to_int_impl.h
@@ -0,0 +1,51 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_FLOAT_TO_INT_IMPL_H
+#define INCLUDED_FLOAT_TO_INT_IMPL_H
+
+#include <blocks/float_to_int.h>
+
+namespace gr {
+  namespace blocks {
+
+    class BLOCKS_API float_to_int_impl : public float_to_int
+    {
+      size_t d_vlen;
+      float d_scale;
+
+    public:
+      float_to_int_impl(size_t vlen, float scale);
+
+      virtual float scale() const { return d_scale; }
+      virtual void set_scale(float scale) { d_scale = scale; }
+
+      int work(int noutput_items,
+	       gr_vector_const_void_star &input_items,
+	       gr_vector_void_star &output_items);
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+   
+
+#endif /* INCLUDED_FLOAT_TO_INT_IMPL_H */
diff --git a/gr-blocks/python/qa_type_conversions.py b/gr-blocks/python/qa_type_conversions.py
index 4daf5f6023..fba38ab009 100755
--- a/gr-blocks/python/qa_type_conversions.py
+++ b/gr-blocks/python/qa_type_conversions.py
@@ -191,6 +191,26 @@ class test_type_conversions(gr_unittest.TestCase):
         self.tb.run()
         self.assertFloatTuplesAlmostEqual(expected_data, dst.data())
 
+    def test_float_to_int_identity(self):
+        src_data = (1.0, 2.0, 3.0, 4.0, 5.0)
+        expected_data = (1, 2, 3, 4, 5)
+        src = gr.vector_source_f(src_data)
+        op = blocks_swig.float_to_int()
+        dst = gr.vector_sink_i()
+        self.tb.connect(src, op, dst)
+        self.tb.run()
+        self.assertEqual(expected_data, dst.data())
+
+    def test_float_to_int_scale(self):
+        src_data = (1.0, 2.0, 3.0, 4.0, 5.0)
+        expected_data = (5, 10, 15, 20, 25)
+        src = gr.vector_source_f(src_data)
+        op = blocks_swig.float_to_int(1, 5)
+        dst = gr.vector_sink_i()
+        self.tb.connect(src, op, dst)
+        self.tb.run()
+        self.assertEqual(expected_data, dst.data())
+
 
 if __name__ == '__main__':
     gr_unittest.run(test_type_conversions, "test_type_conversions.xml")
diff --git a/gr-blocks/swig/blocks_swig.i b/gr-blocks/swig/blocks_swig.i
index e15b5eb021..593b7ad2dd 100644
--- a/gr-blocks/swig/blocks_swig.i
+++ b/gr-blocks/swig/blocks_swig.i
@@ -55,6 +55,7 @@
 #include "blocks/divide_cc.h"
 #include "blocks/float_to_char.h"
 #include "blocks/float_to_complex.h"
+#include "blocks/float_to_int.h"
 #include "blocks/multiply_ss.h"
 #include "blocks/multiply_ii.h"
 #include "blocks/multiply_ff.h"
@@ -100,6 +101,7 @@
 %include "blocks/divide_cc.h"
 %include "blocks/float_to_char.h"
 %include "blocks/float_to_complex.h"
+%include "blocks/float_to_int.h"
 %include "blocks/multiply_ss.h"
 %include "blocks/multiply_ii.h"
 %include "blocks/multiply_ff.h"
@@ -144,6 +146,7 @@ GR_SWIG_BLOCK_MAGIC2(blocks, divide_ii);
 GR_SWIG_BLOCK_MAGIC2(blocks, divide_cc);
 GR_SWIG_BLOCK_MAGIC2(blocks, float_to_char);
 GR_SWIG_BLOCK_MAGIC2(blocks, float_to_complex);
+GR_SWIG_BLOCK_MAGIC2(blocks, float_to_int);
 GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ss);
 GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ii);
 GR_SWIG_BLOCK_MAGIC2(blocks, multiply_ff);
author	Johnathan Corgan <jcorgan@corganenterprises.com>	2012-06-25 06:25:04 -0700
committer	Johnathan Corgan <jcorgan@corganenterprises.com>	2012-06-25 06:25:04 -0700
commit	31c61c16e2073f0c3f54a8d0523d8c4f10ca5dd2 (patch)
tree	bf81e2f6ba3a342f32cd9425dfcdfadecfb6d1d6 /gr-blocks
parent	8c23d9f9ebfe04b60d59efc636c6d5b02baacc99 (diff)