summaryrefslogtreecommitdiff
path: root/gr-dtv/lib
diff options
context:
space:
mode:
authorandriy gelman <andriy.gelman@gmail.com>2018-02-21 17:57:55 -0500
committerMarcus Müller <marcus@hostalia.de>2018-04-28 15:54:32 +0200
commit3d244b94cf4612a87e0d95e5ab24da4a5fc6aae2 (patch)
treeb4423e82d710ff8e1a7ec8a7ffbd1e795d9adcdc /gr-dtv/lib
parente0beb54aac18de2f1c3f5076213f03bbe096cd59 (diff)
Clean-up: Remove unused private variables (Issue #1621, #1622, #1624)
Diffstat (limited to 'gr-dtv/lib')
-rw-r--r--gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc1
-rw-r--r--gr-dtv/lib/atsc/atsc_rs_decoder_impl.h1
-rw-r--r--gr-dtv/lib/atsc/atsc_sync_impl.cc2
-rw-r--r--gr-dtv/lib/atsc/atsc_sync_impl.h1
-rw-r--r--gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h1
-rw-r--r--gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc2
-rw-r--r--gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h1
-rw-r--r--gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc3
-rw-r--r--gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h4
-rw-r--r--gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc2
-rw-r--r--gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h1
-rw-r--r--gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h1
12 files changed, 4 insertions, 16 deletions
diff --git a/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc
index b8ee91a52d..a0ca0c1c07 100644
--- a/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc
@@ -38,7 +38,6 @@ namespace gr {
static const int rs_init_nroots = 20;
static const int N = (1 << rs_init_symsize) - 1; // 255
- static const int K = N - rs_init_nroots; // 235
static const int amount_of_pad = N - ATSC_MPEG_RS_ENCODED_LENGTH; // 48
diff --git a/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h
index adbc4879a9..c657e699dc 100644
--- a/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h
+++ b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h
@@ -39,7 +39,6 @@ namespace gr {
int d_nerrors_corrrected_count;
int d_bad_packet_count;
int d_total_packets;
- int d_total_bits;
void *d_rs;
public:
diff --git a/gr-dtv/lib/atsc/atsc_sync_impl.cc b/gr-dtv/lib/atsc/atsc_sync_impl.cc
index b4de5fca56..fe2f0ea3eb 100644
--- a/gr-dtv/lib/atsc/atsc_sync_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_sync_impl.cc
@@ -49,7 +49,7 @@ namespace gr {
: gr::block("dtv_atsc_sync",
io_signature::make(1, 1, sizeof(float)),
io_signature::make(1, 1, sizeof(atsc_soft_data_segment))),
- d_next_input(0), d_rx_clock_to_symbol_freq(rate/ATSC_SYMBOL_RATE),
+ d_rx_clock_to_symbol_freq(rate/ATSC_SYMBOL_RATE),
d_si(0)
{
d_loop.set_taps(LOOP_FILTER_TAP);
diff --git a/gr-dtv/lib/atsc/atsc_sync_impl.h b/gr-dtv/lib/atsc/atsc_sync_impl.h
index 670cb311e1..cf5fccd1b3 100644
--- a/gr-dtv/lib/atsc/atsc_sync_impl.h
+++ b/gr-dtv/lib/atsc/atsc_sync_impl.h
@@ -37,7 +37,6 @@ namespace gr {
gr::filter::single_pole_iir<float,float,float> d_loop; // ``VCO'' loop filter
gr::filter::mmse_fir_interpolator_ff d_interp;
- unsigned long long d_next_input;
double d_rx_clock_to_symbol_freq;
int d_si;
double d_w; // ratio of PERIOD of Tx to Rx clocks
diff --git a/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h
index ef4faab313..e52aea7fa0 100644
--- a/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h
+++ b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h
@@ -49,7 +49,6 @@ namespace gr {
class atsc_viterbi_decoder_impl : public atsc_viterbi_decoder
{
private:
- int last_start;
typedef interleaver_fifo<unsigned char> fifo_t;
static const int SEGMENT_SIZE = ATSC_MPEG_RS_ENCODED_LENGTH; // 207
diff --git a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc
index e29ec8cfe2..ee440bc789 100644
--- a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.cc
@@ -43,7 +43,7 @@ namespace gr {
: sync_interpolator("dvbt_convolutional_interleaver",
io_signature::make(1, 1, sizeof (unsigned char) * I * blocks),
io_signature::make(1, 1, sizeof (unsigned char)), I * blocks),
- d_blocks(blocks), d_I(I), d_M(M)
+ d_I(I), d_M(M)
{
//Positions are shift registers (FIFOs)
//of length i*M
diff --git a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h
index 2de1fab282..391e0ef77c 100644
--- a/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_convolutional_interleaver_impl.h
@@ -31,7 +31,6 @@ namespace gr {
class dvbt_convolutional_interleaver_impl : public dvbt_convolutional_interleaver
{
private:
- int d_blocks;
int d_I;
int d_M;
std::vector< std::deque<unsigned char> * > d_shift;
diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc
index e26c0eb8d9..5384b6ac87 100644
--- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc
@@ -131,8 +131,7 @@ namespace gr {
io_signature::make(1, 1, sizeof (unsigned char) * noutput)),
config(constellation, hierarchy, coderate, coderate),
d_ninput(ninput), d_noutput(noutput),
- d_reg(0),
- d_bitcount(0)
+ d_reg(0)
{
//Determine k - input of encoder
d_k = config.d_cr_k;
diff --git a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h
index d472b1f60c..7c31c1897d 100644
--- a/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_inner_coder_impl.h
@@ -40,10 +40,6 @@ namespace gr {
int d_reg;
- //counts the bits in the bytes
- //in input stream
- int d_bitcount;
-
// Code rate k/n
int d_k;
int d_n;
diff --git a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc
index 079d948163..afd338a8fc 100644
--- a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc
@@ -235,7 +235,7 @@ namespace gr {
: block("dvbt_ofdm_sym_acquisition",
io_signature::make(1, 1, sizeof (gr_complex) * blocks),
io_signature::make(1, 1, sizeof (gr_complex) * blocks * fft_length)),
- d_blocks(blocks), d_fft_length(fft_length), d_cp_length(cp_length), d_snr(snr), \
+ d_fft_length(fft_length), d_cp_length(cp_length), d_snr(snr), \
d_phase(0.0), d_phaseinc(0.0), d_cp_found(0), d_nextphaseinc(0), d_nextpos(0), \
d_initial_acquisition(0), d_cp_start(0), \
d_to_consume(0), d_to_out(0), d_consumed(0), d_out(0)
diff --git a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h
index 0964361b1e..e4fe1dc50a 100644
--- a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h
@@ -29,7 +29,6 @@ namespace gr {
class dvbt_ofdm_sym_acquisition_impl : public dvbt_ofdm_sym_acquisition
{
private:
- int d_blocks;
int d_fft_length;
int d_cp_length;
float d_snr;
diff --git a/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h b/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h
index 2d9b24809d..39a45c4521 100644
--- a/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h
+++ b/gr-dtv/lib/dvbt/dvbt_reed_solomon_dec_impl.h
@@ -41,7 +41,6 @@ namespace gr {
int d_nerrors_corrected_count;
int d_bad_packet_count;
int d_total_packets;
- int d_total_bits;
void *d_rs; /* Reed-Solomon characteristics structure */
int decode(unsigned char &out, const unsigned char &in);
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-21 07:23:16 +0000