diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-12-29 13:09:00 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-12-29 13:09:00 -0500 |
| commit | 8c86d9490d5b33ed5652aa38984be457a472d199 (patch) | |
| tree | e0026f3609e105b705b61acefab143b777b54df6 /gr-fec | |
| parent | ccebbe0a028158df250aae02c1dd893dd1551dda (diff) | |
| parent | b508945c8096a778a171ee70fe769d97924e4978 (diff) | |
Merge branch 'maint'
Conflicts:
gr-fec/lib/decoder_impl.cc
gr-fec/lib/encoder_impl.cc
Diffstat (limited to 'gr-fec')
| -rw-r--r-- | gr-fec/include/gnuradio/fec/dummy_decoder.h | 1 | ||||
| -rw-r--r-- | gr-fec/lib/decoder_impl.cc | 6 | ||||
| -rw-r--r-- | gr-fec/lib/dummy_decoder_impl.cc | 10 | ||||
| -rw-r--r-- | gr-fec/lib/dummy_decoder_impl.h | 1 | ||||
| -rw-r--r-- | gr-fec/lib/encoder_impl.cc | 9 |
5 files changed, 3 insertions, 24 deletions
diff --git a/gr-fec/include/gnuradio/fec/dummy_decoder.h b/gr-fec/include/gnuradio/fec/dummy_decoder.h index 071b57151e..0561803ea1 100644 --- a/gr-fec/include/gnuradio/fec/dummy_decoder.h +++ b/gr-fec/include/gnuradio/fec/dummy_decoder.h @@ -67,6 +67,7 @@ namespace gr { * Returns the coding rate of this encoder (it will always be 1). */ virtual double rate() = 0; + }; } /* namespace code */ diff --git a/gr-fec/lib/decoder_impl.cc b/gr-fec/lib/decoder_impl.cc index 62c301d501..d570c4077a 100644 --- a/gr-fec/lib/decoder_impl.cc +++ b/gr-fec/lib/decoder_impl.cc @@ -95,9 +95,6 @@ namespace gr { noutput_items/(output_multiple() - d_decoder->get_history()) : innum; - //GR_LOG_DEBUG(d_debug_logger, boost::format("%1%, %2%, %3%") \ - // % outnum % ninput_items[0] % items); - for(int i = 0; i < items; ++i) { d_decoder->generic_work((void*)(in+(i*d_decoder->get_input_size()*d_input_item_size)), (void*)(out+(i*d_decoder->get_output_size()*d_output_item_size))); @@ -109,9 +106,6 @@ namespace gr { int consumed = static_cast<int>(items/relative_rate()*(output_multiple() - d_decoder->get_history()) + 0.5); int returned = items*(output_multiple() - d_decoder->get_history()); - //GR_LOG_DEBUG(d_debug_logger, boost::format("consumed %1%") % consumed); - //GR_LOG_DEBUG(d_debug_logger, boost::format("returned %1%") % returned); - consume_each(consumed); return returned; } diff --git a/gr-fec/lib/dummy_decoder_impl.cc b/gr-fec/lib/dummy_decoder_impl.cc index 105057447f..f1bada4f5a 100644 --- a/gr-fec/lib/dummy_decoder_impl.cc +++ b/gr-fec/lib/dummy_decoder_impl.cc @@ -81,12 +81,6 @@ namespace gr { return "none"; } - float - dummy_decoder_impl::get_shift() - { - return 1; - } - bool dummy_decoder_impl::set_frame_size(unsigned int frame_size) { @@ -116,8 +110,8 @@ namespace gr { int8_t *out = (int8_t*)outbuffer; //memcpy(out, in, d_frame_size*sizeof(char)); - //volk_32f_binary_slicer_8i(out, in, d_frame_size); - volk_32f_s32f_convert_8i(out, in, 1.0/2.0, d_frame_size); + volk_32f_binary_slicer_8i(out, in, d_frame_size); + //volk_32f_s32f_convert_8i(out, in, 1.0/2.0, d_frame_size); } } /* namespace code */ diff --git a/gr-fec/lib/dummy_decoder_impl.h b/gr-fec/lib/dummy_decoder_impl.h index 4685a86f14..bcdd606f18 100644 --- a/gr-fec/lib/dummy_decoder_impl.h +++ b/gr-fec/lib/dummy_decoder_impl.h @@ -39,7 +39,6 @@ namespace gr { int get_output_size(); int get_input_size(); int get_input_item_size(); - float get_shift(); const char* get_input_conversion(); //const char* get_output_conversion(); diff --git a/gr-fec/lib/encoder_impl.cc b/gr-fec/lib/encoder_impl.cc index af72f31133..dfa1f48592 100644 --- a/gr-fec/lib/encoder_impl.cc +++ b/gr-fec/lib/encoder_impl.cc @@ -91,20 +91,11 @@ namespace gr { char *inbuffer = (char*)input_items[0]; char *outbuffer = (char*)output_items[0]; - //GR_LOG_DEBUG(d_debug_logger, boost::format("%1%, %2%, %3%") \ - // % noutput_items % ninput_items[0] % (noutput_items/output_multiple())); - - for(int i = 0; i < noutput_items/output_multiple(); i++) { d_encoder->generic_work((void*)(inbuffer+(i*d_input_size)), (void*)(outbuffer+(i*d_output_size))); } - //GR_LOG_DEBUG(d_debug_logger, boost::format("consuming: %1%") \ - // % (fixed_rate_noutput_to_ninput(noutput_items))); - //GR_LOG_DEBUG(d_debug_logger, boost::format("returning: %1%") \ - // % (noutput_items)); - consume_each(fixed_rate_noutput_to_ninput(noutput_items)); return noutput_items; } |