[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'maint'

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit 8c86d9490d5b33ed5652aa38984be457a472d199
Merge: ccebbe0 b508945
Author: Tom Rondeau <address@hidden>
Date:   Mon Dec 29 13:09:00 2014 -0500

    Merge branch 'maint'
    
    Conflicts:
        gr-fec/lib/decoder_impl.cc
        gr-fec/lib/encoder_impl.cc

 .../gnuradio/digital/correlate_access_code_bb_ts.h |  18 ++-
 .../gnuradio/digital/correlate_access_code_ff_ts.h |   8 +-
 gr-digital/lib/correlate_access_code_bb_ts_impl.cc | 151 ++++++++++++++-------
 gr-digital/lib/correlate_access_code_bb_ts_impl.h  |  19 ++-
 gr-fec/include/gnuradio/fec/dummy_decoder.h        |   1 +
 gr-fec/lib/decoder_impl.cc                         |   6 -
 gr-fec/lib/dummy_decoder_impl.cc                   |  10 +-
 gr-fec/lib/dummy_decoder_impl.h                    |   1 -
 gr-fec/lib/encoder_impl.cc                         |   9 --
 9 files changed, 143 insertions(+), 80 deletions(-)

diff --cc gr-fec/lib/decoder_impl.cc
index 62c301d,38d5643..d570c40
--- a/gr-fec/lib/decoder_impl.cc
+++ b/gr-fec/lib/decoder_impl.cc
@@@ -95,9 -95,11 +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);
 -      /*
 -      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 -111,9 +106,6 @@@
        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);
 -      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 --cc gr-fec/lib/encoder_impl.cc
index af72f31,31f56ea..dfa1f48
--- a/gr-fec/lib/encoder_impl.cc
+++ b/gr-fec/lib/encoder_impl.cc
@@@ -91,20 -91,24 +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()));
 -      /*
 -      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));
 -      /*
 -      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;
      }