summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gr-blocks/lib/pack_k_bits_bb_impl.h1
-rw-r--r--gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc2
-rw-r--r--gr-fec/include/gnuradio/fec/tpc_decoder.h12
-rwxr-xr-xgr-fec/include/gnuradio/fec/tpc_encoder.h20
-rw-r--r--gr-fec/lib/async_decoder_impl.cc12
-rw-r--r--gr-fec/lib/async_decoder_impl.h2
-rw-r--r--gr-fec/lib/async_encoder_impl.cc8
-rw-r--r--gr-fec/lib/tpc_decoder.cc30
-rwxr-xr-xgr-fec/lib/tpc_encoder.cc17
-rw-r--r--grc/gui/PropsDialog.py2
10 files changed, 53 insertions, 53 deletions
diff --git a/gr-blocks/lib/pack_k_bits_bb_impl.h b/gr-blocks/lib/pack_k_bits_bb_impl.h
index 38cf1e7517..2cf4f28fc3 100644
--- a/gr-blocks/lib/pack_k_bits_bb_impl.h
+++ b/gr-blocks/lib/pack_k_bits_bb_impl.h
@@ -32,7 +32,6 @@ namespace gr {
class pack_k_bits_bb_impl : public pack_k_bits_bb
{
private:
- unsigned d_k; // number of relevent bits to pack from k input bytes
kernel::pack_k_bits *d_pack;
public:
diff --git a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
index c3702e0020..a09af908c9 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
@@ -1321,7 +1321,7 @@ namespace gr {
int temp, offset_bits = 0;
unsigned char b, value;
unsigned int shift[6];
- int plen = FRAME_SIZE_SHORT - NBCH_1_4;
+ int plen = FRAME_SIZE_SHORT - NBCH_1_2;
const unsigned char *d;
unsigned char *p;
unsigned char *l1post = l1_interleave;
diff --git a/gr-fec/include/gnuradio/fec/tpc_decoder.h b/gr-fec/include/gnuradio/fec/tpc_decoder.h
index 2f509df2ae..aa09430bf7 100644
--- a/gr-fec/include/gnuradio/fec/tpc_decoder.h
+++ b/gr-fec/include/gnuradio/fec/tpc_decoder.h
@@ -51,12 +51,12 @@ class FEC_API tpc_decoder : public generic_decoder {
int get_output_size();
int get_input_size();
- unsigned int d_krow;
- unsigned int d_kcol;
-
std::vector<int> d_rowpolys;
std::vector<int> d_colpolys;
+ unsigned int d_krow;
+ unsigned int d_kcol;
+
int d_bval;
int d_qval;
@@ -80,8 +80,8 @@ class FEC_API tpc_decoder : public generic_decoder {
int outputSize;
int inputSize;
- int codeword_M;
- int codeword_N;
+ uint32_t codeword_M;
+ uint32_t codeword_N;
int mInit, nInit;
@@ -100,7 +100,7 @@ class FEC_API tpc_decoder : public generic_decoder {
std::vector<float> output_c_rows;
std::vector<float> output_c_cols;
- int numInitLoadIter;
+ uint32_t numInitLoadIter;
int numInitRemaining;
int output_c_col_idx;
diff --git a/gr-fec/include/gnuradio/fec/tpc_encoder.h b/gr-fec/include/gnuradio/fec/tpc_encoder.h
index 3828640634..ab737654c0 100755
--- a/gr-fec/include/gnuradio/fec/tpc_encoder.h
+++ b/gr-fec/include/gnuradio/fec/tpc_encoder.h
@@ -43,14 +43,14 @@ class FEC_API tpc_encoder : public generic_encoder {
int get_output_size();
int get_input_size();
- unsigned int d_krow;
- unsigned int d_kcol;
-
std::vector<int> d_rowpolys;
std::vector<int> d_colpolys;
- int d_bval;
- int d_qval;
+ unsigned int d_krow;
+ unsigned int d_kcol;
+
+ unsigned int d_bval;
+ unsigned int d_qval;
// store the state transitions & outputs
int rowNumStates;
@@ -64,10 +64,10 @@ class FEC_API tpc_encoder : public generic_encoder {
std::vector<int> colTail;
int rowEncoder_K;
- int rowEncoder_n;
+ size_t rowEncoder_n;
int rowEncoder_m;
int colEncoder_K;
- int colEncoder_n;
+ size_t colEncoder_n;
int colEncoder_m;
int outputSize;
int inputSize;
@@ -78,7 +78,7 @@ class FEC_API tpc_encoder : public generic_encoder {
std::vector< std::vector<uint8_t> > rowEncodedBits;
std::vector<unsigned char> rowToEncode;
- int numRowsToEncode;
+ size_t numRowsToEncode;
std::vector<uint8_t> rowEncoded_block;
std::vector< std::vector<uint8_t> > colEncodedBits;
@@ -91,8 +91,8 @@ class FEC_API tpc_encoder : public generic_encoder {
std::vector< std::vector<int> > transOutputVec,
std::vector< std::vector<int> > transNextStateVec,
std::vector<int> tail,
- int KK,
- int nn);
+ size_t KK,
+ size_t nn);
FILE *fp;
diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc
index 2cdea6a1a6..b5ae04be17 100644
--- a/gr-fec/lib/async_decoder_impl.cc
+++ b/gr-fec/lib/async_decoder_impl.cc
@@ -113,7 +113,7 @@ namespace gr {
// bits added on to the transmitted frame.
int diff = d_decoder->rate()*d_decoder->get_input_size() - d_decoder->get_output_size();
- int nbits_in = pmt::length(bits);
+ size_t nbits_in = pmt::length(bits);
size_t nbits_out = 0;
size_t nblocks = 1;
bool variable_frame_size = d_decoder->set_frame_size(nbits_out);
@@ -157,13 +157,13 @@ namespace gr {
}
if(d_decoder->get_shift() != 0) {
- for(int n = 0; n < nbits_in; n++)
+ for(size_t n = 0; n < nbits_in; n++)
d_tmp_f32[n] += d_decoder->get_shift();
}
if(strncmp(d_decoder->get_input_conversion(), "uchar", 5) == 0) {
//volk_32f_s32f_convert_8i(d_tmp_u8, d_tmp_f32, 1, nbits_in);
- for(int n = 0; n < nbits_in; n++)
+ for(size_t n = 0; n < nbits_in; n++)
d_tmp_u8[n] = static_cast<uint8_t>(d_tmp_f32[n]);
d_decoder->generic_work((void*)d_tmp_u8, (void*)u8out);
@@ -186,7 +186,7 @@ namespace gr {
pmt::pmt_t bits(pmt::cdr(msg));
size_t o0 = 0;
- int nbits_in = pmt::length(bits);
+ size_t nbits_in = pmt::length(bits);
int nbits_out = nbits_in*d_decoder->rate();
int nbytes_out = nbits_out/8;
@@ -210,13 +210,13 @@ namespace gr {
}
if(d_decoder->get_shift() != 0) {
- for(int n = 0; n < nbits_in; n++)
+ for(size_t n = 0; n < nbits_in; n++)
d_tmp_f32[n] += d_decoder->get_shift();
}
if(strncmp(d_decoder->get_input_conversion(), "uchar", 5) == 0) {
//volk_32f_s32f_convert_8i(d_tmp_u8, d_tmp_f32, 1.0, nbits_in);
- for(int n = 0; n < nbits_in; n++)
+ for(size_t n = 0; n < nbits_in; n++)
d_tmp_u8[n] = static_cast<uint8_t>(d_tmp_f32[n]);
d_decoder->generic_work((void*)d_tmp_u8, (void*)d_bits_out);
diff --git a/gr-fec/lib/async_decoder_impl.h b/gr-fec/lib/async_decoder_impl.h
index c3c7a7c3ff..53dc84fbe3 100644
--- a/gr-fec/lib/async_decoder_impl.h
+++ b/gr-fec/lib/async_decoder_impl.h
@@ -44,7 +44,7 @@ namespace gr {
bool d_packed;
bool d_rev_pack;
- int d_max_bits_in;
+ size_t d_max_bits_in;
float *d_tmp_f32;
int8_t *d_tmp_u8;
uint8_t *d_bits_out;
diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc
index 106ad25cc4..b3396e7b21 100644
--- a/gr-fec/lib/async_encoder_impl.cc
+++ b/gr-fec/lib/async_encoder_impl.cc
@@ -111,14 +111,14 @@ namespace gr {
const uint8_t* bits_in = pmt::u8vector_elements(bits, o0);
bool variable_framesize = d_encoder->set_frame_size(nbits_in);
- size_t nbits_out = 0;
- size_t nblocks = 1;
+ int nbits_out = 0;
+ int nblocks = 1;
if( variable_framesize ){
nbits_out = d_encoder->get_output_size();
} else {
nblocks = nbits_in / d_encoder->get_input_size();
if( nblocks * d_encoder->get_input_size() != nbits_in ){
- printf("nblocks: %d, in_block_size: %d, got_input_size: %d\n",
+ printf("nblocks: %u, in_block_size: %d, got_input_size: %d\n",
nblocks, d_encoder->get_input_size(), nbits_in);
throw std::runtime_error("input does not divide into code block size!");
}
@@ -135,7 +135,7 @@ namespace gr {
d_encoder->generic_work((void*)d_bits_in, (void*)bits_out);
}
else {
- for(size_t i=0; i<nblocks; i++){
+ for(int i=0; i<nblocks; i++){
d_encoder->generic_work((void*) &bits_in[i*d_encoder->get_input_size()], (void*)&bits_out[i*d_encoder->get_output_size()]);
}
}
diff --git a/gr-fec/lib/tpc_decoder.cc b/gr-fec/lib/tpc_decoder.cc
index ded12fe29d..700721dbf0 100644
--- a/gr-fec/lib/tpc_decoder.cc
+++ b/gr-fec/lib/tpc_decoder.cc
@@ -213,11 +213,11 @@ void tpc_decoder::siso_decode_row() {
// this initialization is saying that the likelihood that the reverse sweep
// starts at state=0 is 100%, b/c state 1, 2, 3's likelihood's are basically -inf
// this implies that the forward trellis terminated at the 0 state
-// for(state=1; state<max_states_row; state++) {
-// beta_row[LL+rowEncoder_K-1][state] = -MAXLOG;
-// }
- // filling w/ 0xCCCC yields a value close to -MAXLOG, and memset is faster than for loops
- memset(&beta_row[LL+rowEncoder_K-1][1], 0xCCCC, sizeof(float)*(max_states_row-1));
+ // for(state=1; state<max_states_row; state++) {
+ // beta_row[LL+rowEncoder_K-1][state] = -MAXLOG;
+ // }
+ // filling w/ 0xCC yields a value close to -MAXLOG, and memset is faster than for loops
+ memset(&beta_row[LL+rowEncoder_K-1][1], 0xCC, sizeof(float)*(max_states_row-1));
// initialize alpha_prime_row (current time instant), alpha_prime_row then gets updated
// by shifting in alpha_row at the end of each time instant of processing
@@ -226,10 +226,10 @@ void tpc_decoder::siso_decode_row() {
// the initialization below is saying that the likelihood of starting at state=0 is
// 100%, b/c state 1, 2, 3's likelihoods are basically -inf
// as with the beta_row array, this implies that the forward trellis started at state=0
-// for (state=1;state<max_states_row;state++) {
-// alpha_prime_row[state] = -MAXLOG;
-// }
- memset(&alpha_prime_row[1], 0xCCCC, sizeof(float)*(max_states_row-1));
+ // for (state=1;state<max_states_row;state++) {
+ // alpha_prime_row[state] = -MAXLOG;
+ // }
+ memset(&alpha_prime_row[1], 0xCC, sizeof(float)*(max_states_row-1));
// compute the beta_row matrix first, which is the reverse sweep (hence we start at the last
// time instant-1 and work our way back to t=0). we start at last time instant-1 b/c
@@ -304,7 +304,7 @@ void tpc_decoder::siso_decode_row() {
// for (state=0;state<max_states_row;state++) {
// alpha_row[state] = -MAXLOG;
// }
- memset(&alpha_row[0], 0xCCCC, max_states_row*sizeof(float));
+ memset(&alpha_row[0], 0xCC, max_states_row*sizeof(float));
// assign inputs
if (k-1 < LL)
@@ -426,7 +426,7 @@ void tpc_decoder::siso_decode_col() {
// for(state=1; state<max_states_col; state++) {
// beta_col[LL+colEncoder_K-1][state] = -MAXLOG;
// }
- memset(&beta_col[LL+colEncoder_K-1][1], 0xCCCC, sizeof(float)*(max_states_col-1));
+ memset(&beta_col[LL+colEncoder_K-1][1], 0xCC, sizeof(float)*(max_states_col-1));
// initialize alpha_prime_col (current time instant), alpha_prime_col then gets updated
// by shifting in alpha_col at the end of each time instant of processing
@@ -438,7 +438,7 @@ void tpc_decoder::siso_decode_col() {
// for (state=1;state<max_states_col;state++) {
// alpha_prime_col[state] = -MAXLOG;
// }
- memset(&alpha_prime_col[1], 0xCCCC, sizeof(float)*(max_states_col-1));
+ memset(&alpha_prime_col[1], 0xCC, sizeof(float)*(max_states_col-1));
// compute the beta_col matrix first, which is the reverse sweep (hence we start at the last
// time instant-1 and work our way back to t=0). we start at last time instant-1 b/c
@@ -513,7 +513,7 @@ void tpc_decoder::siso_decode_col() {
// for (state=0;state<max_states_col;state++) {
// alpha_col[state] = -MAXLOG;
// }
- memset(&alpha_col[0], 0xCCCC, max_states_col*sizeof(float));
+ memset(&alpha_col[0], 0xCC, max_states_col*sizeof(float));
// assign inputs
if (k-1 < LL)
@@ -752,8 +752,8 @@ template <typename T> int tpc_decoder::sgn(T val) {
void tpc_decoder::generic_work(void *inBuffer, void *outBuffer) {
const float *inPtr = (const float *) inBuffer;
unsigned char *out = (unsigned char *) outBuffer;
-
- int m, n, ii;
+
+ unsigned int m, n, ii;
int iter;
for(ii=0; ii<numInitLoadIter; ii++) {
diff --git a/gr-fec/lib/tpc_encoder.cc b/gr-fec/lib/tpc_encoder.cc
index 5973218a1c..941bd7bdca 100755
--- a/gr-fec/lib/tpc_encoder.cc
+++ b/gr-fec/lib/tpc_encoder.cc
@@ -116,12 +116,12 @@ void tpc_encoder::block_conv_encode( std::vector<uint8_t> &output,
std::vector< std::vector<int> > transOutputVec,
std::vector< std::vector<int> > transNextStateVec,
std::vector<int> tail,
- int KK,
- int nn)
+ size_t KK,
+ size_t nn)
{
- int outsym, ii, jj;
+ size_t outsym, ii, jj;
int state = 0;
- int LL = input.size();
+ size_t LL = input.size();
std::vector<int> binVec(nn,0);
@@ -164,7 +164,7 @@ void tpc_encoder::generic_work(void *inBuffer, void *outBuffer) {
const uint8_t *in = (const uint8_t *) inBuffer;
uint8_t *out = (uint8_t *) outBuffer;
- int ii, jj; // indexing var
+ size_t ii, jj; // indexing var
//DEBUG_PRINT_UCHAR_ARRAY(in, inputSize);
@@ -209,8 +209,8 @@ void tpc_encoder::generic_work(void *inBuffer, void *outBuffer) {
}
// encode the column data
- int numDataColsToEncode = d_krow;
- int numCheckColsToEncode = numColsToEncode-numDataColsToEncode;
+ size_t numDataColsToEncode = d_krow;
+ size_t numCheckColsToEncode = numColsToEncode-numDataColsToEncode;
for(ii=0; ii<numDataColsToEncode; ii++) {
// populate colToEncode
for(jj=0; jj<d_kcol; jj++) {
@@ -288,7 +288,8 @@ void tpc_encoder::generic_work(void *inBuffer, void *outBuffer) {
// skip B zeros & do the first row
inputDataPtr = &inputWithPad[d_bval];
- int firstRowRemainingBits = d_krow-d_bval;
+ if(d_bval > d_krow){ throw std::runtime_error("bval must be < krow"); }
+ size_t firstRowRemainingBits = d_krow-d_bval;
for(ii=0; ii<firstRowRemainingBits; ii++) {
*outputDataPtr++ = (uint8_t)(*inputDataPtr++);
}
diff --git a/grc/gui/PropsDialog.py b/grc/gui/PropsDialog.py
index 083e42d026..d706a0d7b7 100644
--- a/grc/gui/PropsDialog.py
+++ b/grc/gui/PropsDialog.py
@@ -201,7 +201,7 @@ class PropsDialog(gtk.Dialog):
return False # forward the keypress
def _handle_response(self, widget, response):
- if response == gtk.RESPONSE_APPLY:
+ if response in (gtk.RESPONSE_APPLY, gtk.RESPONSE_ACCEPT):
for tab, label, vbox in self._params_boxes:
vbox.forall(lambda c: c.apply_pending_changes())
self.set_response_sensitive(gtk.RESPONSE_APPLY, False)
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-27 21:36:30 +0000