1 files changed, 54 insertions, 20 deletions
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