summaryrefslogtreecommitdiff
path: root/gr-fec
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-04-13 15:29:01 -0400
committerTom Rondeau <tom@trondeau.com>2014-05-17 17:45:13 -0400
commite6fe7b1151dbf1ff056c267dbb887a81e8504a8e (patch)
treef1c3fe2f8d38459ea44aa5c60e6db0b736679686 /gr-fec
parent941ce6ab00b60bc9d4dea598226e37af8c04538a (diff)
fec: wip: allowing ber block to be used as a streaming block.
Diffstat (limited to 'gr-fec')
-rw-r--r--gr-fec/grc/fec_ber_bf.xml19
-rw-r--r--gr-fec/include/gnuradio/fec/ber_bf.h2
-rw-r--r--gr-fec/lib/ber_bf_impl.cc102
-rw-r--r--gr-fec/lib/ber_bf_impl.h19
4 files changed, 94 insertions, 48 deletions
diff --git a/gr-fec/grc/fec_ber_bf.xml b/gr-fec/grc/fec_ber_bf.xml
index e4a070fe8b..6d8d85e9ff 100644
--- a/gr-fec/grc/fec_ber_bf.xml
+++ b/gr-fec/grc/fec_ber_bf.xml
@@ -3,13 +3,29 @@
<name>BER</name>
<key>fec_ber_bf</key>
<import>from gnuradio import fec</import>
- <make>fec.ber_bf($berminerrors, $berlimit)</make>
+ <make>fec.ber_bf($test_mode, $berminerrors, $berlimit)</make>
+
+ <param>
+ <name>Test Mode</name>
+ <key>test_mode</key>
+ <value>False</value>
+ <type>enum</type>
+ <option>
+ <name>False</name>
+ <key>False</key>
+ </option>
+ <option>
+ <name>True</name>
+ <key>True</key>
+ </option>
+ </param>
<param>
<name>BER Min. Errors</name>
<key>berminerrors</key>
<value>100</value>
<type>int</type>
+ <hide>#if $test_mode() then 'part' else 'all'#</hide>
</param>
<param>
@@ -17,6 +33,7 @@
<key>berlimit</key>
<value>-7.0</value>
<type>float</type>
+ <hide>#if $test_mode() then 'part' else 'all'#</hide>
</param>
<sink>
diff --git a/gr-fec/include/gnuradio/fec/ber_bf.h b/gr-fec/include/gnuradio/fec/ber_bf.h
index 9f3691fa21..cc42bcebe6 100644
--- a/gr-fec/include/gnuradio/fec/ber_bf.h
+++ b/gr-fec/include/gnuradio/fec/ber_bf.h
@@ -43,7 +43,7 @@ namespace gr {
// gr::fec::ber_bf::sptr
typedef boost::shared_ptr<ber_bf> sptr;
- static sptr make(int berminerrors = 100, float ber_limit = -7.0);
+ static sptr make(bool test_mode = false, int berminerrors=100, float ber_limit=-7.0);
};
} /* namespace fec */
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;
- }
+ }
}
}
diff --git a/gr-fec/lib/ber_bf_impl.h b/gr-fec/lib/ber_bf_impl.h
index 326c6be03e..c7faf123ab 100644
--- a/gr-fec/lib/ber_bf_impl.h
+++ b/gr-fec/lib/ber_bf_impl.h
@@ -32,21 +32,22 @@ namespace gr {
{
private:
int d_total_errors;
+ int d_total;
+ bool d_test_mode;
int d_berminerrors;
float d_ber_limit;
- int d_total;
public:
- ber_bf_impl(int berminerrors = 100, float ber_limit = -7.0);
- ~ber_bf_impl();
+ ber_bf_impl(bool d_test_mode = false, int berminerrors=100, float ber_limit=-7.0);
+ ~ber_bf_impl();
- int general_work(int noutput_items,
- gr_vector_int& ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items);
+ int general_work(int noutput_items,
+ gr_vector_int& ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items);
- void forecast(int noutput_items,
- gr_vector_int& ninput_items_required);
+ void forecast(int noutput_items,
+ gr_vector_int& ninput_items_required);
};
} /* namespace fec */
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-21 11:57:30 +0000