1 files changed, 94 insertions, 92 deletions
diff --git a/gr-blocks/lib/unpacked_to_packed_impl.cc b/gr-blocks/lib/unpacked_to_packed_impl.cc
index ff0fac1050..cdca25dd7e 100644
--- a/gr-blocks/lib/unpacked_to_packed_impl.cc
+++ b/gr-blocks/lib/unpacked_to_packed_impl.cc
@@ -30,121 +30,123 @@
 #include <assert.h>
 
 namespace gr {
-  namespace blocks {
+namespace blocks {
 
 
-    template <class T>
-    typename unpacked_to_packed<T>::sptr
-    unpacked_to_packed<T>::make(unsigned int bits_per_chunk,
-                 endianness_t endianness)
-    {
-      return gnuradio::get_initial_sptr
-        (new unpacked_to_packed_impl<T> (bits_per_chunk, endianness));
-    }
+template <class T>
+typename unpacked_to_packed<T>::sptr
+unpacked_to_packed<T>::make(unsigned int bits_per_chunk, endianness_t endianness)
+{
+    return gnuradio::get_initial_sptr(
+        new unpacked_to_packed_impl<T>(bits_per_chunk, endianness));
+}
 
-    template <class T>
-    unpacked_to_packed_impl<T> ::unpacked_to_packed_impl(unsigned int bits_per_chunk,
-                             endianness_t endianness)
+template <class T>
+unpacked_to_packed_impl<T>::unpacked_to_packed_impl(unsigned int bits_per_chunk,
+                                                    endianness_t endianness)
     : block("unpacked_to_packed",
-               io_signature::make(1, -1, sizeof(T)),
-               io_signature::make(1, -1, sizeof(T))),
-      d_bits_per_chunk(bits_per_chunk), d_endianness(endianness), d_index(0)
-    {
-      assert(bits_per_chunk <= d_bits_per_type);
-      assert(bits_per_chunk > 0);
-
-      this->set_relative_rate((uint64_t)bits_per_chunk, (uint64_t)this->d_bits_per_type);
-    }
-
-    template <class T>
-    unpacked_to_packed_impl<T> ::~unpacked_to_packed_impl()
-    {
-    }
-
-    template <class T>
-    void
-    unpacked_to_packed_impl<T> ::forecast(int noutput_items,
-                          gr_vector_int &ninput_items_required)
-    {
-      int input_required = (int)ceil((d_index+noutput_items * 1.0 * d_bits_per_type)
-                                     / d_bits_per_chunk);
-      unsigned ninputs = ninput_items_required.size();
-      for(unsigned int i = 0; i < ninputs; i++) {
+            io_signature::make(1, -1, sizeof(T)),
+            io_signature::make(1, -1, sizeof(T))),
+      d_bits_per_chunk(bits_per_chunk),
+      d_endianness(endianness),
+      d_index(0)
+{
+    assert(bits_per_chunk <= d_bits_per_type);
+    assert(bits_per_chunk > 0);
+
+    this->set_relative_rate((uint64_t)bits_per_chunk, (uint64_t)this->d_bits_per_type);
+}
+
+template <class T>
+unpacked_to_packed_impl<T>::~unpacked_to_packed_impl()
+{
+}
+
+template <class T>
+void unpacked_to_packed_impl<T>::forecast(int noutput_items,
+                                          gr_vector_int& ninput_items_required)
+{
+    int input_required =
+        (int)ceil((d_index + noutput_items * 1.0 * d_bits_per_type) / d_bits_per_chunk);
+    unsigned ninputs = ninput_items_required.size();
+    for (unsigned int i = 0; i < ninputs; i++) {
         ninput_items_required[i] = input_required;
-      }
-    }
-
-    template <class T>
-    unsigned int
-    unpacked_to_packed_impl<T>::get_bit_be1(const T *in_vector, unsigned int bit_addr,
-                unsigned int bits_per_chunk)
-    {
-      unsigned int byte_addr = (int)bit_addr/bits_per_chunk;
-      T x = in_vector[byte_addr];
-      unsigned int residue = bit_addr - byte_addr * bits_per_chunk;
-      //printf("Bit addr %d  byte addr %d  residue %d  val  %d\n",bit_addr,byte_addr,residue,(x>>(bits_per_chunk-1-residue))&1);
-      return (x >> (bits_per_chunk-1-residue)) & 1;
     }
-
-    template <class T>
-    int
-    unpacked_to_packed_impl<T> ::general_work(int noutput_items,
-                              gr_vector_int &ninput_items,
-                              gr_vector_const_void_star &input_items,
-                              gr_vector_void_star &output_items)
-    {
-      unsigned int index_tmp = d_index;
-
-      assert(input_items.size() == output_items.size());
-      int nstreams = input_items.size();
-
-      for(int m=0; m< nstreams; m++) {
-        const T *in = (T *)input_items[m];
-        T *out = (T *)output_items[m];
-        index_tmp=d_index;
+}
+
+template <class T>
+unsigned int unpacked_to_packed_impl<T>::get_bit_be1(const T* in_vector,
+                                                     unsigned int bit_addr,
+                                                     unsigned int bits_per_chunk)
+{
+    unsigned int byte_addr = (int)bit_addr / bits_per_chunk;
+    T x = in_vector[byte_addr];
+    unsigned int residue = bit_addr - byte_addr * bits_per_chunk;
+    // printf("Bit addr %d  byte addr %d  residue %d  val
+    // %d\n",bit_addr,byte_addr,residue,(x>>(bits_per_chunk-1-residue))&1);
+    return (x >> (bits_per_chunk - 1 - residue)) & 1;
+}
+
+template <class T>
+int unpacked_to_packed_impl<T>::general_work(int noutput_items,
+                                             gr_vector_int& ninput_items,
+                                             gr_vector_const_void_star& input_items,
+                                             gr_vector_void_star& output_items)
+{
+    unsigned int index_tmp = d_index;
+
+    assert(input_items.size() == output_items.size());
+    int nstreams = input_items.size();
+
+    for (int m = 0; m < nstreams; m++) {
+        const T* in = (T*)input_items[m];
+        T* out = (T*)output_items[m];
+        index_tmp = d_index;
 
         // per stream processing
 
-        //assert((ninput_items[m]-d_index)*d_bits_per_chunk >= noutput_items*d_bits_per_type);
+        // assert((ninput_items[m]-d_index)*d_bits_per_chunk >=
+        // noutput_items*d_bits_per_type);
 
-        switch(d_endianness) {
+        switch (d_endianness) {
 
         case GR_MSB_FIRST:
-          for(int i = 0; i < noutput_items; i++) {
-            T tmp=0;
-            for(unsigned int j = 0; j < d_bits_per_type; j++) {
-              tmp = (tmp<<1) | get_bit_be1(in, index_tmp, d_bits_per_chunk);
-              index_tmp++;
+            for (int i = 0; i < noutput_items; i++) {
+                T tmp = 0;
+                for (unsigned int j = 0; j < d_bits_per_type; j++) {
+                    tmp = (tmp << 1) | get_bit_be1(in, index_tmp, d_bits_per_chunk);
+                    index_tmp++;
+                }
+                out[i] = tmp;
             }
-            out[i] = tmp;
-          }
-          break;
+            break;
 
         case GR_LSB_FIRST:
-          for(int i = 0; i < noutput_items; i++) {
-            unsigned long tmp=0;
-            for(unsigned int j = 0; j < d_bits_per_type; j++) {
-              tmp = (tmp>>1) | (get_bit_be1(in, index_tmp, d_bits_per_chunk) << (d_bits_per_type-1));
-              index_tmp++;
+            for (int i = 0; i < noutput_items; i++) {
+                unsigned long tmp = 0;
+                for (unsigned int j = 0; j < d_bits_per_type; j++) {
+                    tmp = (tmp >> 1) | (get_bit_be1(in, index_tmp, d_bits_per_chunk)
+                                        << (d_bits_per_type - 1));
+                    index_tmp++;
+                }
+                out[i] = tmp;
             }
-            out[i] = tmp;
-          }
-          break;
+            break;
 
         default:
-          assert(0);
+            assert(0);
         }
-      }
+    }
 
-      d_index = index_tmp;
-      this->consume_each((int)(d_index/d_bits_per_chunk));
-      d_index = d_index%d_bits_per_chunk;
+    d_index = index_tmp;
+    this->consume_each((int)(d_index / d_bits_per_chunk));
+    d_index = d_index % d_bits_per_chunk;
 
-      return noutput_items;
-    }
+    return noutput_items;
+}
 
 template class unpacked_to_packed<std::uint8_t>;
 template class unpacked_to_packed<std::int16_t>;
 template class unpacked_to_packed<std::int32_t>;
-  } /* namespace blocks */
+} /* namespace blocks */
 } /* namespace gr */