diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-09-12 14:16:50 -0600 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-09-12 14:19:29 -0600 |
| commit | f7cdfff6a85ce52b1d7c0b5131645fcb77405fe8 (patch) | |
| tree | 908af9bf8d1c512e22116cb3afbc89eb5883cc93 /gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc | |
| parent | a867a290194228d09ba93f0f46e3a4e4523f5396 (diff) | |
| parent | af4323d1e471476efa255e3df745397f7c8a1b71 (diff) | |
Merge remote-tracking branch 'upstream/next' into gtk3
Diffstat (limited to 'gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc')
| -rw-r--r-- | gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc b/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc index 4f38581e5b..688ad7a40c 100644 --- a/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc +++ b/gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc @@ -24,7 +24,6 @@ #include <gnuradio/io_signature.h> #include "dvbs2_physical_cc_impl.h" -#include <stdio.h> namespace gr { namespace dtv { @@ -54,7 +53,7 @@ namespace gr { type = 0; if (rate == C2_9_VLSNR) { frame_size = (FRAME_SIZE_NORMAL - NORMAL_PUNCTURING) + (EXTRA_PILOT_SYMBOLS_SET1 * 2); - type = 1; /* force pilots on for VL-SNR */ + pilots = PILOTS_ON; /* force pilots on for VL-SNR */ } } @@ -63,16 +62,16 @@ namespace gr { type = 2; if (rate == C1_5_VLSNR_SF2 || rate == C11_45_VLSNR_SF2) { frame_size = ((FRAME_SIZE_SHORT - SHORT_PUNCTURING_SET1) * 2) + EXTRA_PILOT_SYMBOLS_SET1; - type = 1; /* force pilots on for VL-SNR */ + pilots = PILOTS_ON; /* force pilots on for VL-SNR */ } if (rate == C1_5_VLSNR || rate == C4_15_VLSNR || rate == C1_3_VLSNR) { frame_size = (FRAME_SIZE_SHORT - SHORT_PUNCTURING_SET2) + EXTRA_PILOT_SYMBOLS_SET2; - type = 1; /* force pilots on for VL-SNR */ + pilots = PILOTS_ON; /* force pilots on for VL-SNR */ } } else { frame_size = FRAME_SIZE_MEDIUM - MEDIUM_PUNCTURING + EXTRA_PILOT_SYMBOLS_SET1; - type = 1; /* force pilots on for VL-SNR */ + pilots = PILOTS_ON; /* force pilots on for VL-SNR */ } pilot_mode = pilots; @@ -80,8 +79,8 @@ namespace gr { type |= 1; } if (goldcode < 0 || goldcode > 262141) { - fprintf(stderr, "Gold Code must be between 0 and 262141 inclusive.\n"); - fprintf(stderr, "Gold Code set to 0.\n"); + GR_LOG_WARN(d_logger, "Gold Code must be between 0 and 262141 inclusive."); + GR_LOG_WARN(d_logger, "Gold Code set to 0."); goldcode = 0; } gold_code = goldcode; @@ -808,8 +807,7 @@ namespace gr { int consumed = 0; int produced = 0; int slot_count, n; - int group; - int symbols = 0; + int group, symbols; gr_complex tempin, tempout; if (vlsnr_set == VLSNR_OFF) { @@ -873,6 +871,7 @@ namespace gr { n = 0; slot_count = 10; group = 0; + symbols = 0; for (int plh = 0; plh < 90; plh++) { out[produced++] = m_pl[plh]; out[produced++] = m_zero; @@ -1079,6 +1078,7 @@ namespace gr { n = 0; slot_count = 10; group = 0; + symbols = 0; for (int plh = 0; plh < 90; plh++) { out[produced++] = m_pl[plh]; out[produced++] = m_zero; |