diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-05-16 12:18:46 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-05-17 17:45:16 -0400 |
| commit | 86c7f2844331b6759461acf1afbe8e9c60a678a0 (patch) | |
| tree | ecb4342ecfc5b34abe733c2b7f993dfa32774417 /gr-fec | |
| parent | 0db24ffd533cc4b0e22f82c5d6a4713892bb5ef7 (diff) | |
fec: wip: using unpack/pack k bits kernels instead of copying logic in here.
Need to remove volk_malloc from encode.
Diffstat (limited to 'gr-fec')
| -rw-r--r-- | gr-fec/lib/async_encoder_impl.cc | 24 | ||||
| -rw-r--r-- | gr-fec/lib/async_encoder_impl.h | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc index 6f9b54b3fc..de760b1c69 100644 --- a/gr-fec/lib/async_encoder_impl.cc +++ b/gr-fec/lib/async_encoder_impl.cc @@ -49,6 +49,9 @@ 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); + 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) ); @@ -56,6 +59,8 @@ namespace gr { async_encoder_impl::~async_encoder_impl() { + delete d_unpack; + delete d_pack; } void @@ -72,20 +77,16 @@ namespace gr { uint8_t* bits_in = (uint8_t*)volk_malloc(nbits*sizeof(uint8_t), volk_get_alignment()); - // Stolen from unpack_k_bits - int n = 0; - for(int i = 0; i < nbytes; i++) { - uint8_t t = bytes_in[i]; - for(int j = 7; j >= 0; j--) - bits_in[n++] = (t >> j) & 0x01; - } + // Encoder takes a stream of bits, but PDU's are received as + // bytes, so we unpack them here. + 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; - // get pmt buffer pointers + // buffers for bits/bytes to go to uint8_t* bits_out = (uint8_t*)volk_malloc(nbits_out*sizeof(uint8_t), volk_get_alignment()); uint8_t* bytes_out = (uint8_t*)volk_malloc(nbytes_out*sizeof(uint8_t), @@ -95,12 +96,7 @@ namespace gr { d_encoder->generic_work((void*)bits_in, (void*)bits_out); // Stolen from pack_k_bits - for(int i = 0; i < nbytes_out; i++) { - bytes_out[i] = 0x00; - for(int j = 0; j < 8; j++) { - bytes_out[i] |= (0x01 & bits_out[i*8+j])<<(8-j-1); - } - } + d_pack->pack(bytes_out, bits_out, nbytes_out); //pmt::pmt_t outvec = pmt::init_u8vector(nouts, u8out); pmt::pmt_t outvec = pmt::init_u8vector(nbytes_out, bytes_out); diff --git a/gr-fec/lib/async_encoder_impl.h b/gr-fec/lib/async_encoder_impl.h index 38ae6850ed..4090d77035 100644 --- a/gr-fec/lib/async_encoder_impl.h +++ b/gr-fec/lib/async_encoder_impl.h @@ -24,6 +24,8 @@ #define INCLUDED_FEC_ASYNC_ENCODER_IMPL_H #include <gnuradio/fec/async_encoder.h> +#include <gnuradio/blocks/unpack_k_bits.h> +#include <gnuradio/blocks/pack_k_bits.h> namespace gr { namespace fec { @@ -39,6 +41,8 @@ namespace gr { 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; public: async_encoder_impl(generic_encoder::sptr my_encoder); |