diff options
| author | Thomas Habets <thomas@habets.se> | 2020-08-11 19:34:45 +0100 |
|---|---|---|
| committer | Martin Braun <martin@gnuradio.org> | 2020-08-14 03:34:54 -0700 |
| commit | 6d7bcb67b10f7db8e36ef12e9ed039511e8dbacd (patch) | |
| tree | ae416262ffeb15c659c16790bd12d710126e2dcb /gr-fec/lib/async_decoder_impl.cc | |
| parent | e8a43cb754183c9e7461e0651f388bf16d2ccce3 (diff) | |
fec/async_decoder: Remove manual memory management
Diffstat (limited to 'gr-fec/lib/async_decoder_impl.cc')
| -rw-r--r-- | gr-fec/lib/async_decoder_impl.cc | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc index e8c04829b9..10d4524d47 100644 --- a/gr-fec/lib/async_decoder_impl.cc +++ b/gr-fec/lib/async_decoder_impl.cc @@ -31,7 +31,8 @@ async_decoder_impl::async_decoder_impl(generic_decoder::sptr my_decoder, bool packed, bool rev_pack, int mtu) - : block("async_decoder", io_signature::make(0, 0, 0), io_signature::make(0, 0, 0)) + : block("async_decoder", io_signature::make(0, 0, 0), io_signature::make(0, 0, 0)), + d_pack(8) { d_in_port = pmt::mp("in"); d_out_port = pmt::mp("out"); @@ -51,7 +52,6 @@ async_decoder_impl::async_decoder_impl(generic_decoder::sptr my_decoder, 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, [this](pmt::pmt_t msg) { this->decode_packed(msg); }); } else { set_msg_handler(d_in_port, @@ -60,33 +60,19 @@ async_decoder_impl::async_decoder_impl(generic_decoder::sptr my_decoder, // The maximum frame size is set by the initial frame size of the decoder. d_max_bits_in = d_mtu * 8 * 1.0 / d_decoder->rate(); - d_tmp_f32 = (float*)volk_malloc(d_max_bits_in * sizeof(float), volk_get_alignment()); + d_tmp_f32.resize(d_max_bits_in); 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()); + d_tmp_u8.resize(d_max_bits_in); } if (d_packed) { int max_bits_out = d_mtu * 8; - d_bits_out = - (uint8_t*)volk_malloc(max_bits_out * sizeof(uint8_t), volk_get_alignment()); + d_bits_out.resize(max_bits_out); } } -async_decoder_impl::~async_decoder_impl() -{ - if (d_packed) { - delete d_pack; - volk_free(d_bits_out); - } - - volk_free(d_tmp_f32); - - if (strncmp(d_decoder->get_input_conversion(), "uchar", 5) == 0) { - volk_free(d_tmp_u8); - } -} +async_decoder_impl::~async_decoder_impl() {} void async_decoder_impl::decode_unpacked(pmt::pmt_t msg) { @@ -130,9 +116,9 @@ void async_decoder_impl::decode_unpacked(pmt::pmt_t msg) uint8_t* u8out = pmt::u8vector_writable_elements(outvec, o0); if (strncmp(d_decoder->get_input_conversion(), "uchar", 5) == 0) { - volk_32f_s32f_multiply_32f(d_tmp_f32, f32in, 48.0f, nbits_in); + volk_32f_s32f_multiply_32f(d_tmp_f32.data(), f32in, 48.0f, nbits_in); } else { - memcpy(d_tmp_f32, f32in, nbits_in * sizeof(float)); + memcpy(d_tmp_f32.data(), f32in, nbits_in * sizeof(float)); } if (d_decoder->get_shift() != 0) { @@ -145,7 +131,7 @@ void async_decoder_impl::decode_unpacked(pmt::pmt_t msg) for (size_t 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*)u8out); + d_decoder->generic_work((void*)d_tmp_u8.data(), (void*)u8out); } else { for (size_t i = 0; i < nblocks; i++) { d_decoder->generic_work((void*)&d_tmp_f32[i * d_decoder->get_input_size()], @@ -183,9 +169,9 @@ void async_decoder_impl::decode_packed(pmt::pmt_t msg) 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); + volk_32f_s32f_multiply_32f(d_tmp_f32.data(), f32in, 48.0f, nbits_in); } else { - memcpy(d_tmp_f32, f32in, nbits_in * sizeof(float)); + memcpy(d_tmp_f32.data(), f32in, nbits_in * sizeof(float)); } if (d_decoder->get_shift() != 0) { @@ -198,15 +184,15 @@ void async_decoder_impl::decode_packed(pmt::pmt_t msg) for (size_t 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); + d_decoder->generic_work((void*)d_tmp_u8.data(), (void*)d_bits_out.data()); } else { - d_decoder->generic_work((void*)d_tmp_f32, (void*)d_bits_out); + d_decoder->generic_work((void*)d_tmp_f32.data(), (void*)d_bits_out.data()); } if (d_rev_pack) - d_pack->pack_rev(bytes_out, d_bits_out, nbytes_out); + d_pack.pack_rev(bytes_out, d_bits_out.data(), nbytes_out); else - d_pack->pack(bytes_out, d_bits_out, nbytes_out); + d_pack.pack(bytes_out, d_bits_out.data(), nbytes_out); message_port_pub(d_out_port, pmt::cons(meta, outvec)); } |