diff options
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/src/lib/atsc_bit_timing_loop.cc | 2 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsc_depad.cc | 2 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsc_field_sync_demux.cc | 8 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsc_field_sync_mux.cc | 2 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsc_pad.cc | 6 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsci_equalizer_lms.cc | 5 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsci_equalizer_lms2.cc | 5 |
7 files changed, 15 insertions, 15 deletions
diff --git a/gr-atsc/src/lib/atsc_bit_timing_loop.cc b/gr-atsc/src/lib/atsc_bit_timing_loop.cc index dbd864be5..a661e708b 100644 --- a/gr-atsc/src/lib/atsc_bit_timing_loop.cc +++ b/gr-atsc/src/lib/atsc_bit_timing_loop.cc @@ -88,7 +88,7 @@ atsc_bit_timing_loop::work (int noutput_items, // We are tasked with producing output.size output samples. // We will consume approximately 2 * output.size input samples. - unsigned int k; // output index + int k; // output index float interp_sample; int symbol_index; diff --git a/gr-atsc/src/lib/atsc_depad.cc b/gr-atsc/src/lib/atsc_depad.cc index c72067e61..f1e830568 100644 --- a/gr-atsc/src/lib/atsc_depad.cc +++ b/gr-atsc/src/lib/atsc_depad.cc @@ -51,7 +51,7 @@ atsc_depad::work (int noutput_items, const atsc_mpeg_packet *in = (const atsc_mpeg_packet *) input_items[0]; unsigned char *out = (unsigned char *) output_items[0]; - unsigned int i; + int i; for (i = 0; i < noutput_items/ATSC_MPEG_PKT_LENGTH; i++){ memcpy(&out[i * ATSC_MPEG_PKT_LENGTH], in[i].data, ATSC_MPEG_PKT_LENGTH); diff --git a/gr-atsc/src/lib/atsc_field_sync_demux.cc b/gr-atsc/src/lib/atsc_field_sync_demux.cc index 333df92fb..b6195c6df 100644 --- a/gr-atsc/src/lib/atsc_field_sync_demux.cc +++ b/gr-atsc/src/lib/atsc_field_sync_demux.cc @@ -52,8 +52,8 @@ atsc_field_sync_demux::atsc_field_sync_demux() gr_make_io_signature(2, 2, sizeof(float)), gr_make_io_signature(1, 1, sizeof(atsc_soft_data_segment))), d_locked(false), d_in_field2(true), d_segment_number(0), - d_next_input(0), d_lost_index(0), d_inputs0_size(0), - d_inputs0_index(0), d_consume(0) + d_next_input(0), d_lost_index(0), d_inputs0_index(0), + d_inputs0_size(0), d_consume(0) { reset(); } @@ -102,7 +102,7 @@ atsc_field_sync_demux::work (int noutput_items, assert(sizeof(float) == sizeof(atsc::syminfo)); - int ii = 0; // input index + unsigned int ii = 0; // input index // Are we in sync? if (!tag_is_seg_sync_or_field_sync (input_tags[0])){ // No ... @@ -155,7 +155,7 @@ atsc_field_sync_demux::work (int noutput_items, while (k < noutput_items){ - if (d_inputs0_size - ii < ATSC_DATA_SEGMENT_LENGTH){ + if (d_inputs0_size - ii < static_cast<unsigned int>(ATSC_DATA_SEGMENT_LENGTH)){ // We're out of input data. cerr << "atsc_field_sync_demux: ran out of input data\n"; d_next_input += ii; // update for forecast diff --git a/gr-atsc/src/lib/atsc_field_sync_mux.cc b/gr-atsc/src/lib/atsc_field_sync_mux.cc index 4d17fcaf7..526599aed 100644 --- a/gr-atsc/src/lib/atsc_field_sync_mux.cc +++ b/gr-atsc/src/lib/atsc_field_sync_mux.cc @@ -162,7 +162,7 @@ atsc_field_sync_mux::work (int noutput_items, atsc_data_segment *out = (atsc_data_segment *) output_items[0]; unsigned int index = 0; - for (unsigned int outdex = 0; outdex < noutput_items; outdex++){ + for (int outdex = 0; outdex < noutput_items; outdex++){ assert (in[index].pli.regular_seg_p ()); diff --git a/gr-atsc/src/lib/atsc_pad.cc b/gr-atsc/src/lib/atsc_pad.cc index 17f50e1f8..cd1353e26 100644 --- a/gr-atsc/src/lib/atsc_pad.cc +++ b/gr-atsc/src/lib/atsc_pad.cc @@ -61,10 +61,8 @@ atsc_pad::work (int noutput_items, { const unsigned char *in = (const unsigned char *) input_items[0]; atsc_mpeg_packet *out = (atsc_mpeg_packet *) output_items[0]; - - // size with padding (256) - unsigned int ATSC_MPEG_PKT = sizeof(atsc_mpeg_packet); - unsigned int i; + + int i; for (i = 0; i < noutput_items; i++){ for (int j = 0; j < ATSC_MPEG_PKT_LENGTH; j++) diff --git a/gr-atsc/src/lib/atsci_equalizer_lms.cc b/gr-atsc/src/lib/atsci_equalizer_lms.cc index 723a5d37d..6358b5334 100644 --- a/gr-atsc/src/lib/atsci_equalizer_lms.cc +++ b/gr-atsc/src/lib/atsci_equalizer_lms.cc @@ -37,7 +37,7 @@ static const int NPRETAPS = (int) (NTAPS * 0.8); // probably should be either .2 // the length of the field sync pattern that we know unequivocally static const int KNOWN_FIELD_SYNC_LENGTH = 4 + 511 + 3 * 63; -static const float *get_data_seg_sync_training_sequence (int offset); +// static const float *get_data_seg_sync_training_sequence (int offset); static int get_field_sync_training_sequence_length (int offset); static const float *get_field_sync_training_sequence (int which_field, int offset); @@ -272,13 +272,14 @@ init_field_sync_common (float *p, int mask) assert (i == KNOWN_FIELD_SYNC_LENGTH); } - +#if 0 static const float * get_data_seg_sync_training_sequence (int offset) { static const float training_data[4] = { +5, -5, -5, +5 }; return &training_data[offset]; } +#endif static int get_field_sync_training_sequence_length (int offset) diff --git a/gr-atsc/src/lib/atsci_equalizer_lms2.cc b/gr-atsc/src/lib/atsci_equalizer_lms2.cc index b8124fa92..345f6209f 100644 --- a/gr-atsc/src/lib/atsci_equalizer_lms2.cc +++ b/gr-atsc/src/lib/atsci_equalizer_lms2.cc @@ -38,7 +38,7 @@ static const int NFBTAPS = 192; // the length of the field sync pattern that we know unequivocally static const int KNOWN_FIELD_SYNC_LENGTH = 4 + 511 + 3 * 63; -static const float *get_data_seg_sync_training_sequence (int offset); +// static const float *get_data_seg_sync_training_sequence (int offset); static int get_field_sync_training_sequence_length (int offset); static const float *get_field_sync_training_sequence (int which_field, int offset); @@ -339,13 +339,14 @@ init_field_sync_common (float *p, int mask) assert (i == KNOWN_FIELD_SYNC_LENGTH); } - +#if 0 static const float * get_data_seg_sync_training_sequence (int offset) { static const float training_data[4] = { +5, -5, -5, +5 }; return &training_data[offset]; } +#endif static int get_field_sync_training_sequence_length (int offset) |