[Commit-gnuradio] [gnuradio] 02/16: fec: some initial refactoring for ber_bf

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit ad6d9ca46e5d6a24ba9625ab93e0c48b78f57e9e
Author: Johannes Demel <address@hidden>
Date:   Fri Jul 17 14:10:04 2015 +0200

    fec: some initial refactoring for ber_bf
---
 gr-fec/lib/ber_bf_impl.cc | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/gr-fec/lib/ber_bf_impl.cc b/gr-fec/lib/ber_bf_impl.cc
index ebc19bc..375844b 100644
--- a/gr-fec/lib/ber_bf_impl.cc
+++ b/gr-fec/lib/ber_bf_impl.cc
@@ -53,26 +53,25 @@ namespace gr {
     }
 
     int
-    ber_bf_impl::general_work(int noutput_items,
-                              gr_vector_int& ninput_items,
+    ber_bf_impl::general_work(int noutput_items, gr_vector_int& ninput_items,
                               gr_vector_const_void_star &input_items,
                               gr_vector_void_star &output_items)
     {
+      unsigned char *inbuffer0 = (unsigned char *) input_items[0];
+      unsigned char *inbuffer1 = (unsigned char *) input_items[1];
+      float *outbuffer = (float *) output_items[0];
+
+      int items = ninput_items[0] <= ninput_items[1] ? ninput_items[0] : 
ninput_items[1];
+
       if(d_test_mode) {
         if(d_total_errors >= d_berminerrors) {
           return -1;
         }
         else {
-          unsigned char *inbuffer0 = (unsigned char *)input_items[0];
-          unsigned char *inbuffer1 = (unsigned char *)input_items[1];
-          float *outbuffer = (float *)output_items[0];
-
-          int items = ninput_items[0] <= ninput_items[1] ? ninput_items[0] : 
ninput_items[1];
-
           if(items > 0) {
             uint32_t ret;
             for(int i = 0; i < items; i++) {
-              volk_32u_popcnt(&ret, 
static_cast<uint32_t>(inbuffer0[i]^inbuffer1[i]));
+              volk_32u_popcnt(&ret, static_cast<uint32_t>(inbuffer0[i] ^ 
inbuffer1[i]));
               d_total_errors += ret;
             }
             d_total += items;
@@ -80,12 +79,12 @@ namespace gr {
           consume_each(items);
 
           if(d_total_errors >= d_berminerrors) {
-            outbuffer[0] = log10(((double)d_total_errors)/(d_total * 8.0));
-            GR_LOG_INFO(d_logger, boost::format("    %1% over %2% --> %3%") \
-                        % d_total_errors % (d_total * 8) % outbuffer[0]);
+            outbuffer[0] = log10(((double) d_total_errors) / (d_total * 8.0));
+            GR_LOG_INFO(d_logger, boost::format("    %1% over %2% --> %3%")
+                    % d_total_errors % (d_total * 8) % outbuffer[0]);
             return 1;
           }
-          else if(log10(((double)d_berminerrors)/(d_total * 8.0)) < 
d_ber_limit) {
+          else if(log10(((double) d_berminerrors) / (d_total * 8.0)) < 
d_ber_limit) {
             GR_LOG_INFO(d_logger, "    Min. BER limit reached");
             outbuffer[0] = d_ber_limit;
             d_total_errors = d_berminerrors + 1;
@@ -97,21 +96,15 @@ namespace gr {
         }
       }
       else { // streaming mode
-        unsigned char *inbuffer0 = (unsigned char *)input_items[0];
-        unsigned char *inbuffer1 = (unsigned char *)input_items[1];
-        float *outbuffer = (float *)output_items[0];
-
-        int items = ninput_items[0] <= ninput_items[1] ? ninput_items[0] : 
ninput_items[1];
-
         if(items > 0) {
           uint32_t ret;
           for(int i = 0; i < items; i++) {
-            volk_32u_popcnt(&ret, 
static_cast<uint32_t>(inbuffer0[i]^inbuffer1[i]));
+            volk_32u_popcnt(&ret, static_cast<uint32_t>(inbuffer0[i] ^ 
inbuffer1[i]));
             d_total_errors += ret;
           }
 
           d_total += items;
-          outbuffer[0] = log10(((double)d_total_errors)/(d_total * 8.0));
+          outbuffer[0] = log10(((double) d_total_errors) / (d_total * 8.0));
 
           consume_each(items);
           return 1;