5 files changed, 220 insertions, 55 deletions
diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc
index d3cfd2c05f..8e9747609c 100644
--- a/gr-fec/lib/async_decoder_impl.cc
+++ b/gr-fec/lib/async_decoder_impl.cc
@@ -26,76 +26,188 @@
 
 #include "async_decoder_impl.h"
 #include <gnuradio/io_signature.h>
+#include <volk/volk.h>
 #include <stdio.h>
 
-
 namespace gr {
   namespace fec {
 
     async_decoder::sptr
     async_decoder::make(generic_decoder::sptr my_decoder,
-                        size_t input_item_size, size_t output_item_size)
+                        bool packed, bool rev_pack)
     {
       return gnuradio::get_initial_sptr
-        (new async_decoder_impl(my_decoder, input_item_size, output_item_size));
+        (new async_decoder_impl(my_decoder, packed, rev_pack));
     }
 
     async_decoder_impl::async_decoder_impl(generic_decoder::sptr my_decoder,
-                                           size_t input_item_size,
-                                           size_t output_item_size)
+                                           bool packed, bool rev_pack)
       : block("async_decoder",
               io_signature::make(0,0,0),
               io_signature::make(0,0,0)),
-        d_input_item_size(input_item_size), d_output_item_size(output_item_size)
+        d_input_item_size(sizeof(float)), d_output_item_size(sizeof(char))
     {
+      d_in_port = pmt::mp("in");
+      d_out_port = pmt::mp("out");
+
       d_decoder = my_decoder;
-      message_port_register_in(pmt::mp("in"));
-      message_port_register_out(pmt::mp("out"));
-      set_msg_handler(pmt::mp("pdus"), boost::bind(&async_decoder_impl::decode, this ,_1));
+
+      if(d_decoder->get_history() > 0) {
+        throw std::runtime_error("async_decoder deploment does not support decoders with history requirements.");
+      }
+
+      d_packed = packed;
+      d_rev_pack = rev_pack;
+
+      message_port_register_in(d_in_port);
+      message_port_register_out(d_out_port);
+
+      if(d_packed) {
+        d_pack = new blocks::kernel::pack_k_bits(8);
+        set_msg_handler(d_in_port, boost::bind(&async_decoder_impl::decode_packed, this ,_1));
+      }
+      else {
+        set_msg_handler(d_in_port, boost::bind(&async_decoder_impl::decode_unpacked, this ,_1));
+      }
+
+      // The maximum frame size is set by the initial frame size of the decoder.
+      d_max_bits_in = d_decoder->get_input_size();
+      d_tmp_f32 = (float*)volk_malloc(d_max_bits_in*sizeof(float),
+                                      volk_get_alignment());
+
+      if(strncmp(d_decoder->get_input_conversion(), "uchar", 5) == 0) {
+        d_tmp_u8 = (int8_t*)volk_malloc(d_max_bits_in*sizeof(uint8_t),
+                                        volk_get_alignment());
+      }
+
+      if(d_packed) {
+        int max_bits_out = d_decoder->get_output_size();
+        d_bits_out = (uint8_t*)volk_malloc(max_bits_out*sizeof(uint8_t),
+                                           volk_get_alignment());
+      }
     }
 
     async_decoder_impl::~async_decoder_impl()
     {
+      if(d_packed) {
+        delete d_pack;
+        delete d_bits_out;
+      }
+
+      volk_free(d_tmp_f32);
+
+      if(strncmp(d_decoder->get_input_conversion(), "uchar", 5) == 0) {
+        volk_free(d_tmp_u8);
+      }
     }
 
     void
-    async_decoder_impl::decode(pmt::pmt_t msg)
+    async_decoder_impl::decode_unpacked(pmt::pmt_t msg)
     {
       // extract input pdu
       pmt::pmt_t meta(pmt::car(msg));
       pmt::pmt_t bits(pmt::cdr(msg));
 
-      int nbits = pmt::length(bits);
-      int blksize_in = d_decoder->get_input_size();
-      int blksize_out = d_decoder->get_output_size();
-      int nblocks = nbits/blksize_in;
+      // Watch out for this diff. It might be over-specializing to the
+      // CC decoder in terminated mode that has an extra rate(K-1)
+      // bits added on to the transmitted frame.
+      int diff = d_decoder->rate()*d_decoder->get_input_size() - d_decoder->get_output_size();
 
-      // nbits sanity check
-      if(nbits % blksize_in != 0){
-        throw std::runtime_error((boost::format("nbits_in %% blksize_in != 0 in fec_decoder_asyn! %d bits in, %d blksize") \
-                                  % nbits % blksize_in).str());
-      }
+      int nbits_in = pmt::length(bits);
+      int nbits_out = nbits_in*d_decoder->rate() - diff;
 
-      printf("decoder :: blksize_in = %d, blksize_out = %d\n", blksize_in, blksize_out);
+      // Check here if the frame size is larger than what we've
+      // allocated for in the constructor.
+      if(nbits_in > d_max_bits_in) {
+        throw std::runtime_error("async_decoder: Received frame larger than max frame size.");
+      }
 
-      pmt::pmt_t outvec(pmt::make_u8vector(blksize_out * nblocks, 0xFF));
-      printf("decoder :: outvec len = %d (%d blks)\n", blksize_out * nblocks, nblocks);
+      d_decoder->set_frame_size(nbits_out);
 
-      // get pmt buffer pointers
       size_t o0(0);
       const float* f32in = pmt::f32vector_elements(bits, o0);
+      pmt::pmt_t outvec(pmt::make_u8vector(nbits_out, 0x00));
       uint8_t* u8out = pmt::u8vector_writable_elements(outvec, o0);
 
-      // loop over n fec blocks
-      for(int i = 0; i < nblocks; i++) {
-        size_t offset_in = i * blksize_in;
-        size_t offset_out = i * blksize_out;
+      if(strncmp(d_decoder->get_input_conversion(), "uchar", 5) == 0) {
+        volk_32f_s32f_multiply_32f(d_tmp_f32, f32in, 48.0f, nbits_in);
+      }
+      else {
+        memcpy(d_tmp_f32, f32in, nbits_in*sizeof(float));
+      }
+
+      if(d_decoder->get_shift() != 0) {
+        for(int n = 0; n < nbits_in; n++)
+          d_tmp_f32[n] += d_decoder->get_shift();
+      }
+
+      if(strncmp(d_decoder->get_input_conversion(), "uchar", 5) == 0) {
+        //volk_32f_s32f_convert_8i(d_tmp_u8, d_tmp_f32, 1, nbits_in);
+        for(int n = 0; n < nbits_in; n++)
+          d_tmp_u8[n] = static_cast<uint8_t>(d_tmp_f32[n]);
 
-        // DECODE!
-        d_decoder->generic_work((void*)&f32in[offset_in], (void*)&u8out[offset_out]);
+        d_decoder->generic_work((void*)d_tmp_u8, (void*)u8out);
       }
+      else {
+        d_decoder->generic_work((void*)d_tmp_f32, (void*)u8out);
+      }
+
+      message_port_pub(d_out_port, pmt::cons(meta, outvec));
+    }
+
+    void
+    async_decoder_impl::decode_packed(pmt::pmt_t msg)
+    {
+      // extract input pdu
+      pmt::pmt_t meta(pmt::car(msg));
+      pmt::pmt_t bits(pmt::cdr(msg));
+
+      size_t o0 = 0;
+      int nbits_in = pmt::length(bits);
+      int nbits_out = nbits_in*d_decoder->rate();
+      int nbytes_out = nbits_out/8;
+
+      // Check here if the frame size is larger than what we've
+      // allocated for in the constructor.
+      if(nbits_in > d_max_bits_in) {
+        throw std::runtime_error("async_decoder: Received frame larger than max frame size.");
+      }
+
+      d_decoder->set_frame_size(nbits_out);
+
+      pmt::pmt_t outvec(pmt::make_u8vector(nbytes_out, 0x00));
+      uint8_t* bytes_out = pmt::u8vector_writable_elements(outvec, o0);
+      const float* f32in = pmt::f32vector_elements(bits, o0);
+
+      if(strncmp(d_decoder->get_input_conversion(), "uchar", 5) == 0) {
+        volk_32f_s32f_multiply_32f(d_tmp_f32, f32in, 48.0f, nbits_in);
+      }
+      else {
+        memcpy(d_tmp_f32, f32in, nbits_in*sizeof(float));
+      }
+
+      if(d_decoder->get_shift() != 0) {
+        for(int n = 0; n < nbits_in; n++)
+          d_tmp_f32[n] += d_decoder->get_shift();
+      }
+
+      if(strncmp(d_decoder->get_input_conversion(), "uchar", 5) == 0) {
+        //volk_32f_s32f_convert_8i(d_tmp_u8, d_tmp_f32, 1.0, nbits_in);
+        for(int n = 0; n < nbits_in; n++)
+          d_tmp_u8[n] = static_cast<uint8_t>(d_tmp_f32[n]);
+
+        d_decoder->generic_work((void*)d_tmp_u8, (void*)d_bits_out);
+      }
+      else {
+        d_decoder->generic_work((void*)d_tmp_f32, (void*)d_bits_out);
+      }
+
+      if(d_rev_pack)
+        d_pack->pack_rev(bytes_out, d_bits_out, nbytes_out);
+      else
+        d_pack->pack(bytes_out, d_bits_out, nbytes_out);
 
-      message_port_pub(pmt::mp("pdus"),  pmt::cons(meta, outvec));
+      message_port_pub(d_out_port,  pmt::cons(meta, outvec));
     }
 
     int
diff --git a/gr-fec/lib/async_decoder_impl.h b/gr-fec/lib/async_decoder_impl.h
index 5f4c5c44a0..c3c7a7c3ff 100644
--- a/gr-fec/lib/async_decoder_impl.h
+++ b/gr-fec/lib/async_decoder_impl.h
@@ -24,6 +24,7 @@
 #define INCLUDED_FEC_ASYNC_DECODER_IMPL_H
 
 #include <gnuradio/fec/async_decoder.h>
+#include <gnuradio/blocks/pack_k_bits.h>
 
 namespace gr {
   namespace fec {
@@ -35,12 +36,25 @@ namespace gr {
       size_t d_input_item_size;
       size_t d_output_item_size;
 
-      void decode(pmt::pmt_t msg);
+      pmt::pmt_t d_in_port;
+      pmt::pmt_t d_out_port;
+
+      blocks::kernel::pack_k_bits *d_pack;
+
+      bool d_packed;
+      bool d_rev_pack;
+
+      int d_max_bits_in;
+      float *d_tmp_f32;
+      int8_t *d_tmp_u8;
+      uint8_t *d_bits_out;
+
+      void decode_packed(pmt::pmt_t msg);
+      void decode_unpacked(pmt::pmt_t msg);
 
     public:
       async_decoder_impl(generic_decoder::sptr my_decoder,
-                         size_t input_item_size,
-                         size_t output_item_size);
+                         bool packed=false, bool rev_pack=true);
       ~async_decoder_impl();
 
       int general_work(int noutput_items,
diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc
index ff7480f00a..556a8a5e9b 100644
--- a/gr-fec/lib/async_encoder_impl.cc
+++ b/gr-fec/lib/async_encoder_impl.cc
@@ -34,14 +34,14 @@ namespace gr {
 
     async_encoder::sptr
     async_encoder::make(generic_encoder::sptr my_encoder,
-                        bool rev_unpack, bool rev_pack)
+                        bool packed, bool rev_unpack, bool rev_pack)
     {
       return gnuradio::get_initial_sptr
-        (new async_encoder_impl(my_encoder, rev_unpack, rev_pack));
+        (new async_encoder_impl(my_encoder, packed, rev_unpack, rev_pack));
     }
 
     async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder,
-                                           bool rev_unpack, bool rev_pack)
+                                           bool packed, bool rev_unpack, bool rev_pack)
       : block("async_encoder",
               io_signature::make(0,0,0),
               io_signature::make(0,0,0)),
@@ -51,48 +51,83 @@ namespace gr {
       d_out_port = pmt::mp("out");
 
       d_encoder = my_encoder;
-      d_unpack = new blocks::kernel::unpack_k_bits(8);
-      d_pack   = new blocks::kernel::pack_k_bits(8);
 
+      d_packed = packed;
       d_rev_unpack = rev_unpack;
       d_rev_pack = rev_pack;
 
       message_port_register_in(d_in_port);
       message_port_register_out(d_out_port);
-      set_msg_handler(d_in_port, boost::bind(&async_encoder_impl::encode, this ,_1) );
+
+      if(d_packed) {
+        d_unpack = new blocks::kernel::unpack_k_bits(8);
+        d_pack   = new blocks::kernel::pack_k_bits(8);
+        set_msg_handler(d_in_port, boost::bind(&async_encoder_impl::encode_packed, this ,_1) );
+      }
+      else {
+        set_msg_handler(d_in_port, boost::bind(&async_encoder_impl::encode_unpacked, this ,_1) );
+      }
     }
 
     async_encoder_impl::~async_encoder_impl()
     {
-      delete d_unpack;
-      delete d_pack;
+      if(d_packed) {
+        delete d_unpack;
+        delete d_pack;
+      }
     }
 
     void
-    async_encoder_impl::encode(pmt::pmt_t msg)
+    async_encoder_impl::encode_unpacked(pmt::pmt_t msg)
+    {
+      // extract input pdu
+      pmt::pmt_t meta(pmt::car(msg));
+      pmt::pmt_t bits(pmt::cdr(msg));
+
+      size_t o0 = 0;
+      int nbits_in = pmt::length(bits);
+      const uint8_t* bits_in = pmt::u8vector_elements(bits, o0);
+
+      d_encoder->set_frame_size(nbits_in);
+
+      int nbits_out = d_encoder->get_output_size();
+
+      // buffers for output bits to go to
+      pmt::pmt_t outvec = pmt::make_u8vector(nbits_out, 0x00);
+      uint8_t* bits_out = pmt::u8vector_writable_elements(outvec, o0);
+
+      // ENCODE!
+      d_encoder->generic_work((void*)bits_in, (void*)bits_out);
+
+      pmt::pmt_t msg_pair = pmt::cons(meta, outvec);
+      message_port_pub(d_out_port, msg_pair);
+    }
+
+    void
+    async_encoder_impl::encode_packed(pmt::pmt_t msg)
     {
       // extract input pdu
       pmt::pmt_t meta(pmt::car(msg));
       pmt::pmt_t bytes(pmt::cdr(msg));
 
-      int nbytes = pmt::length(bytes);
-      int nbits = 8*nbytes;
       size_t o0 = 0;
+      int nbytes_in = pmt::length(bytes);
+      int nbits_in = 8*nbytes_in;
       const uint8_t* bytes_in = pmt::u8vector_elements(bytes, o0);
-      uint8_t* bits_in = (uint8_t*)volk_malloc(nbits*sizeof(uint8_t),
+      uint8_t* bits_in = (uint8_t*)volk_malloc(nbits_in*sizeof(uint8_t),
                                                volk_get_alignment());
 
+      d_encoder->set_frame_size(nbits_in);
+
+      int nbits_out = d_encoder->get_output_size();
+      int nbytes_out = nbits_out/8;
+
       // Encoder takes a stream of bits, but PDU's are received as
       // bytes, so we unpack them here.
       if(d_rev_unpack)
-        d_unpack->unpack_rev(bits_in, bytes_in, nbytes);
+        d_unpack->unpack_rev(bits_in, bytes_in, nbytes_in);
       else
-        d_unpack->unpack(bits_in, bytes_in, nbytes);
-
-      d_encoder->set_frame_size(nbits);
-
-      int nbits_out = d_encoder->get_output_size();
-      int nbytes_out = nbits_out/8;
+        d_unpack->unpack(bits_in, bytes_in, nbytes_in);
 
       // buffers for bits/bytes to go to
       uint8_t* bits_out = (uint8_t*)volk_malloc(nbits_out*sizeof(uint8_t),
@@ -104,7 +139,6 @@ namespace gr {
       // ENCODE!
       d_encoder->generic_work((void*)bits_in, (void*)bits_out);
 
-      // Encoder produces bits, so repack them here to bytes.
       if(d_rev_pack)
         d_pack->pack_rev(bytes_out, bits_out, nbytes_out);
       else
diff --git a/gr-fec/lib/async_encoder_impl.h b/gr-fec/lib/async_encoder_impl.h
index 2c43b0d386..7cca623d35 100644
--- a/gr-fec/lib/async_encoder_impl.h
+++ b/gr-fec/lib/async_encoder_impl.h
@@ -40,14 +40,19 @@ namespace gr {
       pmt::pmt_t d_in_port;
       pmt::pmt_t d_out_port;
 
-      void encode(pmt::pmt_t msg);
       blocks::kernel::unpack_k_bits *d_unpack;
       blocks::kernel::pack_k_bits   *d_pack;
+
+      bool d_packed;
       bool d_rev_unpack;
       bool d_rev_pack;
 
+      void encode_packed(pmt::pmt_t msg);
+      void encode_unpacked(pmt::pmt_t msg);
+
     public:
       async_encoder_impl(generic_encoder::sptr my_encoder,
+                         bool packed=false,
                          bool rev_unpack=true, bool rev_pack=true);
       ~async_encoder_impl();
 
diff --git a/gr-fec/lib/cc_encoder_impl.cc b/gr-fec/lib/cc_encoder_impl.cc
index 90d2ee4c1c..75d7dcd66b 100644
--- a/gr-fec/lib/cc_encoder_impl.cc
+++ b/gr-fec/lib/cc_encoder_impl.cc
@@ -127,7 +127,7 @@ namespace gr {
       double
       cc_encoder_impl::rate()
       {
-        return 1.0/static_cast<double>(d_rate);
+        return static_cast<double>(d_rate);
       }
 
       int