1 files changed, 65 insertions, 37 deletions
diff --git a/gr-fec/lib/ber_bf_impl.cc b/gr-fec/lib/ber_bf_impl.cc
index 566b70b88a..d7282ea699 100644
--- a/gr-fec/lib/ber_bf_impl.cc
+++ b/gr-fec/lib/ber_bf_impl.cc
@@ -27,24 +27,25 @@
 #include "ber_bf_impl.h"
 #include "ber_tools.h"
 #include <gnuradio/io_signature.h>
+#include <volk/volk.h>
 #include <math.h>
 
 namespace gr {
   namespace fec {
 
     ber_bf::sptr
-    ber_bf::make(int berminerrors, float ber_limit)
+    ber_bf::make(bool test_mode, int berminerrors, float ber_limit)
     {
       return gnuradio::get_initial_sptr
-        (new ber_bf_impl(berminerrors, ber_limit));
+        (new ber_bf_impl(test_mode, berminerrors, ber_limit));
     }
 
-    ber_bf_impl::ber_bf_impl(int berminerrors, float ber_limit)
+    ber_bf_impl::ber_bf_impl(bool test_mode, int berminerrors, float ber_limit)
       : block("fec_ber_bf",
               io_signature::make(2, 2, sizeof(unsigned char)),
               io_signature::make(1, 1, sizeof(float))),
-        d_total_errors(0), d_berminerrors(berminerrors),
-        d_ber_limit(ber_limit), d_total(0)
+        d_total_errors(0), d_total(0), d_test_mode(test_mode),
+        d_berminerrors(berminerrors), d_ber_limit(ber_limit)
     {
     }
 
@@ -66,48 +67,75 @@ namespace gr {
                               gr_vector_const_void_star &input_items,
                               gr_vector_void_star &output_items)
     {
-      if(d_total_errors >= d_berminerrors) {
-	return -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) {
+            /*
+            for(int i = 0; i < items; ++i) {
+              if(inbuffer0[i] != inbuffer1[i]) {
+                GR_LOG_INFO(d_logger, boost::format("%1%/%2%:   %3% versus %4%") \
+                            % i % items % inbuffer0[i] % inbuffer1[i]);
+              }
+            }
+            GR_LOG_INFO(d_logger, boost::format("%1% errors")           \
+                        % (compber(inbuffer0, inbuffer1, items)));
+            */
+
+            d_total_errors += compber(inbuffer0, inbuffer1, items);
+            d_total += items;
+          }
+          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]);
+            return 1;
+          }
+          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;
+            return 1;
+          }
+          else {
+            return 0;
+          }
+        }
       }
-      else {
+      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];
+        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];
+        int items = ninput_items[0] <= ninput_items[1] ? ninput_items[0] : ninput_items[1];
 
-	if(items > 0) {
-          /*
-          for(int i = 0; i < items; ++i) {
-            if(inbuffer0[i] != inbuffer1[i]) {
-              GR_LOG_INFO(d_logger, boost::format("%1%/%2%:   %3% versus %4%") \
-                          % i % items % inbuffer0[i] % inbuffer1[i]);
-            }
+        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]));
+            d_total_errors += ret;
           }
-          GR_LOG_INFO(d_logger, boost::format("%1% errors") \
-                      % (compber(inbuffer0, inbuffer1, items)));
-          */
 
-          d_total_errors += compber(inbuffer0, inbuffer1, items);
           d_total += items;
-	}
-	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]);
-          return 1;
-	}
-	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;
+
+          consume_each(items);
           return 1;
-	}
-	else {
+        }
+        else {
+          consume_each(0);
           return 0;
-	}
+        }
       }
     }