blocks: added gr::blocks::deinterleave

3 files changed, 126 insertions, 0 deletions

diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index 77f0c6eca..081064629 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -134,6 +134,7 @@ list(APPEND gr_blocks_sources
     complex_to_mag_squared_impl.cc
     complex_to_arg_impl.cc
     conjugate_cc_impl.cc
+    deinterleave_impl.cc
     float_to_char_impl.cc
     float_to_complex_impl.cc
     float_array_to_int.cc
diff --git a/gr-blocks/lib/deinterleave_impl.cc b/gr-blocks/lib/deinterleave_impl.cc
new file mode 100644
index 000000000..badf4973a
--- /dev/null
+++ b/gr-blocks/lib/deinterleave_impl.cc
@@ -0,0 +1,76 @@
+/* -*- 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 "deinterleave_impl.h"
+#include <gr_io_signature.h>
+
+namespace gr {
+  namespace blocks {
+
+    deinterleave::sptr deinterleave::make(size_t itemsize)
+    {
+      return gnuradio::get_initial_sptr(new deinterleave_impl(itemsize));
+    }
+
+    deinterleave_impl::deinterleave_impl(size_t itemsize)
+      : gr_sync_decimator("deinterleave",
+			  gr_make_io_signature (1, 1, itemsize),
+			  gr_make_io_signature (1, gr_io_signature::IO_INFINITE, itemsize),
+			  1),
+	d_itemsize(itemsize)
+    {
+    }
+
+    bool
+    deinterleave_impl::check_topology(int ninputs, int noutputs)
+    {
+      set_decimation(noutputs);
+      return true;
+    }
+
+    int
+    deinterleave_impl::work(int noutput_items,
+			    gr_vector_const_void_star &input_items,
+			    gr_vector_void_star &output_items)
+    {
+      size_t nchan = output_items.size();
+      size_t itemsize = d_itemsize;
+      const char *in = (const char *)input_items[0];
+      char **out = (char **)&output_items[0];
+      
+      for (int i = 0; i < noutput_items; i++){
+	for (unsigned int n = 0; n < nchan; n++){
+	  memcpy(out[n], in, itemsize);
+	  out[n] += itemsize;
+	  in += itemsize;
+	}
+      }
+      
+      return noutput_items;
+    }
+
+  } /* namespace blocks */
+} /* namespace gr */
diff --git a/gr-blocks/lib/deinterleave_impl.h b/gr-blocks/lib/deinterleave_impl.h
new file mode 100644
index 000000000..762c9d5fe
--- /dev/null
+++ b/gr-blocks/lib/deinterleave_impl.h
@@ -0,0 +1,49 @@
+/* -*- 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_DEINTERLEAVE_IMPL_H
+#define INCLUDED_DEINTERLEAVE_IMPL_H
+
+#include <blocks/deinterleave.h>
+
+namespace gr {
+  namespace blocks {
+
+    class BLOCKS_API deinterleave_impl : public deinterleave
+    {
+      size_t d_itemsize;
+
+    public:
+      deinterleave_impl(size_t itemsize);
+
+      bool check_topology(int ninputs, int noutputs);
+
+      int work(int noutput_items,
+	       gr_vector_const_void_star &input_items,
+	       gr_vector_void_star &output_items);
+    };
+
+  } /* namespace blocks */
+} /* namespace gr */
+   
+
+#endif /* INCLUDED_DEINTERLEAVE_IMPL_H */