diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-04-13 18:36:53 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-04-13 18:36:53 -0400 |
| commit | f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 (patch) | |
| tree | 7e846386b9eb1676f9a93fc4a1e55916b9accc97 /gr-atsc/src | |
| parent | 6a1e9783fec6ed827f49db27c171591d30f32933 (diff) | |
Removed whitespace and added dtools/bin/remove-whitespace as a tool to do this in the future.
The sed script was provided by Moritz Fischer.
Diffstat (limited to 'gr-atsc/src')
185 files changed, 1083 insertions, 1083 deletions
diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop.cc b/gr-atsc/src/lib/GrAtscBitTimingLoop.cc index 97b62cb931..8053736ee9 100644 --- a/gr-atsc/src/lib/GrAtscBitTimingLoop.cc +++ b/gr-atsc/src/lib/GrAtscBitTimingLoop.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -46,7 +46,7 @@ GrAtscBitTimingLoop::GrAtscBitTimingLoop () { d_timing_rate = DEFAULT_TIMING_RATE; loop.set_taps (DEFAULT_LOOP_TAP); - + history = 1500; // spare input samples in case we need them. #ifdef _BT_DIAG_OUTPUT_ @@ -55,7 +55,7 @@ GrAtscBitTimingLoop::GrAtscBitTimingLoop () perror ("loop.out"); exit (1); } - + fp_ps = fopen ("ps.out", "w"); if (fp_ps == 0){ perror ("ps.out"); @@ -79,13 +79,13 @@ GrAtscBitTimingLoop::forecast(VrSampleRange output, inputs[i].size=output.size*decimation + history-1; } return 0; -} +} inline double GrAtscBitTimingLoop::filter_error (double e) { static const double limit = 50 * FPLL_BTLOOP_COUPLING_CONST; - + // first limit if (e > limit) @@ -96,7 +96,7 @@ GrAtscBitTimingLoop::filter_error (double e) return loop.filter (e); } -int +int GrAtscBitTimingLoop::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { @@ -107,8 +107,8 @@ GrAtscBitTimingLoop::work (VrSampleRange output, void *ao[], // This is required because of our slightly variable decimation factor sync (output.index); - - // We are tasked with producing output.size output samples. + + // We are tasked with producing output.size output samples. // We will consume approximately 2 * output.size input samples. @@ -158,7 +158,7 @@ GrAtscBitTimingLoop::work (VrSampleRange output, void *ao[], if (!debug_no_update){ mu += filtered_timing_error * d_timing_rate; } - + #ifdef _BT_DIAG_OUTPUT_ float iodata[8]; iodata[0] = left; diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop.h b/gr-atsc/src/lib/GrAtscBitTimingLoop.h index 9fcffcffe7..fa64f4d372 100644 --- a/gr-atsc/src/lib/GrAtscBitTimingLoop.h +++ b/gr-atsc/src/lib/GrAtscBitTimingLoop.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -80,7 +80,7 @@ class GrAtscBitTimingLoop : public VrDecimatingSigProc<float,float> { double d_loop_filter_tap; double d_timing_rate; - + #ifdef _BT_DIAG_OUTPUT_ FILE *fp_loop; FILE *fp_ps; diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop2.cc b/gr-atsc/src/lib/GrAtscBitTimingLoop2.cc index 3f9cf106e9..c741a5bb20 100644 --- a/gr-atsc/src/lib/GrAtscBitTimingLoop2.cc +++ b/gr-atsc/src/lib/GrAtscBitTimingLoop2.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -45,7 +45,7 @@ GrAtscBitTimingLoop2::GrAtscBitTimingLoop2 () perror ("loop.out"); exit (1); } - + fp_ps = fopen ("ps.out", "w"); if (fp_ps == 0){ perror ("ps.out"); @@ -70,7 +70,7 @@ GrAtscBitTimingLoop2::forecast(VrSampleRange output, inputs[i].size=output.size*decimation + history-1; } return 0; -} +} inline float GrAtscBitTimingLoop2::filter_error (float e) @@ -78,7 +78,7 @@ GrAtscBitTimingLoop2::filter_error (float e) return e; // identity function } -int +int GrAtscBitTimingLoop2::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { @@ -89,8 +89,8 @@ GrAtscBitTimingLoop2::work (VrSampleRange output, void *ao[], // This is required because of our slightly variable decimation factor sync (output.index); - - // We are tasked with producing output.size output samples. + + // We are tasked with producing output.size output samples. // We will consume approximately 2 * output.size input samples. @@ -117,7 +117,7 @@ GrAtscBitTimingLoop2::work (VrSampleRange output, void *ao[], for (k = 0; k < output.size; k++){ left = right; - + iType middle_raw = produce_sample (in, ii); iType middle_dc = dc.filter (middle_raw); middle = middle_raw - middle_dc; @@ -127,7 +127,7 @@ GrAtscBitTimingLoop2::work (VrSampleRange output, void *ao[], right = right_raw - right_dc; if (use_right_p) // produce our output - out[k] = right; + out[k] = right; else out[k] = middle; } diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop2.h b/gr-atsc/src/lib/GrAtscBitTimingLoop2.h index c03e64a0c4..4f36c902e5 100644 --- a/gr-atsc/src/lib/GrAtscBitTimingLoop2.h +++ b/gr-atsc/src/lib/GrAtscBitTimingLoop2.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop3.cc b/gr-atsc/src/lib/GrAtscBitTimingLoop3.cc index 3ee2880e63..f9c1eb02e2 100644 --- a/gr-atsc/src/lib/GrAtscBitTimingLoop3.cc +++ b/gr-atsc/src/lib/GrAtscBitTimingLoop3.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -37,7 +37,7 @@ GrAtscBitTimingLoop3::GrAtscBitTimingLoop3 (double ratio_of_rx_clock_to_symbol_f { assert (ratio_of_rx_clock_to_symbol_freq >= 1.8); // sanity check - + history = 1500; // spare input samples in case we need them. } @@ -51,17 +51,17 @@ int GrAtscBitTimingLoop3::forecast(VrSampleRange output, VrSampleRange inputs[]) { assert (numberInputs == 1); - + /* dec:1 ratio with history */ inputs[0].index = d_next_input; inputs[0].size = ((unsigned long) (output.size * d_rx_clock_to_symbol_freq) + history - 1); return 0; -} +} -int +int GrAtscBitTimingLoop3::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { @@ -73,7 +73,7 @@ GrAtscBitTimingLoop3::work (VrSampleRange output, void *ao[], // This is required because of our slightly variable decimation factor sync (output.index); - // We are tasked with producing output.size output samples. + // We are tasked with producing output.size output samples. // We will consume approximately 2 * output.size input samples. int si = 0; // source index @@ -93,7 +93,7 @@ GrAtscBitTimingLoop3::work (VrSampleRange output, void *ao[], fprintf (stderr, "GrAtscBitTimingLoop3: ran short on data...\n"); break; } - + d_sssr.update (interp_sample, &seg_locked, &symbol_index, &timing_adjustment); out_sample[k] = interp_sample; tag.valid = seg_locked; diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop3.h b/gr-atsc/src/lib/GrAtscBitTimingLoop3.h index fd2ea03e5a..7e019e49c7 100644 --- a/gr-atsc/src/lib/GrAtscBitTimingLoop3.h +++ b/gr-atsc/src/lib/GrAtscBitTimingLoop3.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscConvert2xTo20.cc b/gr-atsc/src/lib/GrAtscConvert2xTo20.cc index ec74503e8b..1f540464dc 100644 --- a/gr-atsc/src/lib/GrAtscConvert2xTo20.cc +++ b/gr-atsc/src/lib/GrAtscConvert2xTo20.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -51,7 +51,7 @@ GrAtscConvert2xTo20::pre_initialize () fprintf (stderr, "GrAtscConvert2xTo20: argument to setSamplingFrequency = %g\n", getInputSamplingFrequencyN(0) / DEC_RATIO); - + int r; r = setSamplingFrequency (getInputSamplingFrequencyN (0) / DEC_RATIO); @@ -99,7 +99,7 @@ GrAtscConvert2xTo20::work (VrSampleRange output, void *ao[], int incr = (int) float_incr; si += incr; } - + d_next_input += si; d_frac_part = frac_part; return output.size; diff --git a/gr-atsc/src/lib/GrAtscConvert2xTo20.h b/gr-atsc/src/lib/GrAtscConvert2xTo20.h index eba6f715e9..05b1023e58 100644 --- a/gr-atsc/src/lib/GrAtscConvert2xTo20.h +++ b/gr-atsc/src/lib/GrAtscConvert2xTo20.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -29,7 +29,7 @@ class GrAtscConvert2xTo20 : public VrDecimatingSigProc<float,float> { gr_mmse_fir_interpolator d_interp; double d_frac_part; VrSampleIndex d_next_input; - + public: GrAtscConvert2xTo20 (); ~GrAtscConvert2xTo20 (); diff --git a/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.cc b/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.cc index 417e108d4a..09c3db4e0c 100644 --- a/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.cc +++ b/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -49,7 +49,7 @@ GrAtscDataSegToSoftDataSeg::GrAtscDataSegToSoftDataSeg () // used by the superclass's forecast routine to get us the correct // range on our inputs. // We're one-to-one input-to-output so set it to 1. - history = 1; + history = 1; // any other init here. } @@ -65,7 +65,7 @@ GrAtscDataSegToSoftDataSeg::~GrAtscDataSegToSoftDataSeg () * use a single input and output stream. */ -int +int GrAtscDataSegToSoftDataSeg::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { diff --git a/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.h b/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.h index 7579bedf1c..207324d557 100644 --- a/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.h +++ b/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscDeinterleaver.cc b/gr-atsc/src/lib/GrAtscDeinterleaver.cc index 357b9be38d..fd67d7a205 100644 --- a/gr-atsc/src/lib/GrAtscDeinterleaver.cc +++ b/gr-atsc/src/lib/GrAtscDeinterleaver.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -37,7 +37,7 @@ GrAtscDeinterleaver::GrAtscDeinterleaver () // used by the superclass's forecast routine to get us the correct // range on our inputs. // We're one-to-one input-to-output so set it to 1. - history = 1; + history = 1; // any other init here. } @@ -53,7 +53,7 @@ GrAtscDeinterleaver::~GrAtscDeinterleaver () * use a single input and output stream. */ -int +int GrAtscDeinterleaver::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { diff --git a/gr-atsc/src/lib/GrAtscDeinterleaver.h b/gr-atsc/src/lib/GrAtscDeinterleaver.h index c10e17dfb9..f0f9830b68 100644 --- a/gr-atsc/src/lib/GrAtscDeinterleaver.h +++ b/gr-atsc/src/lib/GrAtscDeinterleaver.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscDerandomizer.cc b/gr-atsc/src/lib/GrAtscDerandomizer.cc index 4935483c70..db3583a62c 100644 --- a/gr-atsc/src/lib/GrAtscDerandomizer.cc +++ b/gr-atsc/src/lib/GrAtscDerandomizer.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -37,7 +37,7 @@ GrAtscDerandomizer::GrAtscDerandomizer () // used by the superclass's forecast routine to get us the correct // range on our inputs. // We're one-to-one input-to-output so set it to 1. - history = 1; + history = 1; // any other init here. } @@ -53,7 +53,7 @@ GrAtscDerandomizer::~GrAtscDerandomizer () * use a single input and output stream. */ -int +int GrAtscDerandomizer::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { @@ -85,7 +85,7 @@ GrAtscDerandomizer::work (VrSampleRange output, void *ao[], if (in[i].pli.first_regular_seg_p ()) rand.reset (); - + rand.derandomize (out[i], in[i]); // take a look at the transport error bit in the pipeline info @@ -102,5 +102,5 @@ GrAtscDerandomizer::work (VrSampleRange output, void *ao[], // Note that for all intents and purposes, it is an error to // produce less than you are asked for. - return output.size; + return output.size; } diff --git a/gr-atsc/src/lib/GrAtscDerandomizer.h b/gr-atsc/src/lib/GrAtscDerandomizer.h index d1de3a54af..bd0d70d945 100644 --- a/gr-atsc/src/lib/GrAtscDerandomizer.h +++ b/gr-atsc/src/lib/GrAtscDerandomizer.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscEqualizer.cc b/gr-atsc/src/lib/GrAtscEqualizer.cc index b0a9d99871..27f64c2b76 100644 --- a/gr-atsc/src/lib/GrAtscEqualizer.cc +++ b/gr-atsc/src/lib/GrAtscEqualizer.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -28,7 +28,7 @@ typedef float dataType; typedef atsc::syminfo tagType; -static const int NUMBER_OF_OUTPUTS = 2; // # of output streams +static const int NUMBER_OF_OUTPUTS = 2; // # of output streams GrAtscEqualizer::GrAtscEqualizer (atsci_equalizer *equalizer) @@ -36,7 +36,7 @@ GrAtscEqualizer::GrAtscEqualizer (atsci_equalizer *equalizer) { // due to limitation of runtime, all inputs must be the same size assert (sizeof (dataType) == sizeof (tagType)); - + d_equalizer = equalizer; // 1 + number of extra input elements at which we look. This is @@ -63,19 +63,19 @@ GrAtscEqualizer::~GrAtscEqualizer () int GrAtscEqualizer::forecast (VrSampleRange output, - VrSampleRange inputs[]) + VrSampleRange inputs[]) { assert (numberInputs == 2); - + int ntaps = d_equalizer->ntaps (); int npretaps = d_equalizer->npretaps (); - + assert (ntaps >= 1); assert (npretaps >= 0 && npretaps < ntaps); - + inputs[0].index = output.index; // the equalizer data inputs[0].size = output.size + ntaps - 1; // history on data - + // FIXME if there's a problem, it's probably on the next line... int offset = ntaps - npretaps - 1; @@ -85,19 +85,19 @@ GrAtscEqualizer::forecast (VrSampleRange output, inputs[1].size = output.size; // N.B., no extra history on tags return 0; -} +} /* * This is the real work horse. We consume 2 input streams * and produce 2 output streams. */ -int +int GrAtscEqualizer::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { // assert (numberInputs == 2); - + // If we have state that persists across invocations (e.g., we have // instance variables that we modify), we must use the sync method // to indicate to the scheduler that our output must be computed in diff --git a/gr-atsc/src/lib/GrAtscEqualizer.h b/gr-atsc/src/lib/GrAtscEqualizer.h index b67e98400c..ff944deb7d 100644 --- a/gr-atsc/src/lib/GrAtscEqualizer.h +++ b/gr-atsc/src/lib/GrAtscEqualizer.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscFPLL.cc b/gr-atsc/src/lib/GrAtscFPLL.cc index ce5b183e63..df7d6b8c08 100644 --- a/gr-atsc/src/lib/GrAtscFPLL.cc +++ b/gr-atsc/src/lib/GrAtscFPLL.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -59,7 +59,7 @@ GrAtscFPLL::initialize () float Fs = getInputSamplingFrequencyN (0); float alpha = 1 - exp(-1.0 / Fs / 5e-6); - + afci.set_taps (alpha); afcq.set_taps (alpha); @@ -67,7 +67,7 @@ GrAtscFPLL::initialize () nco.set_phase (initial_phase); } -int +int GrAtscFPLL::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { @@ -109,7 +109,7 @@ GrAtscFPLL::work (VrSampleRange output, void *ao[], // static const float alpha = 0.037; // Max value // static const float alpha = 0.005; // takes about 5k samples to pull in, stddev = 323 // static const float alpha = 0.002; // takes about 15k samples to pull in, stddev = 69 - // or about 120k samples on noisy data, + // or about 120k samples on noisy data, static const float alpha = 0.001; static const float beta = alpha * alpha / 4; diff --git a/gr-atsc/src/lib/GrAtscFPLL.h b/gr-atsc/src/lib/GrAtscFPLL.h index f89411a508..597a4a891b 100644 --- a/gr-atsc/src/lib/GrAtscFPLL.h +++ b/gr-atsc/src/lib/GrAtscFPLL.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -37,7 +37,7 @@ * * Used as follows: * float float - * A/D --> GrFIRfilterFFF ----> GrAtscFPLL ----> + * A/D --> GrFIRfilterFFF ----> GrAtscFPLL ----> * * We use GrFIRfilterFFF to bandpass filter the signal of interest. * @@ -49,7 +49,7 @@ class GrAtscFPLL : public VrSigProc { typedef float iType; typedef float oType; - + public: GrAtscFPLL (double a_initial_freq); @@ -77,7 +77,7 @@ class GrAtscFPLL : public VrSigProc { gr_agc agc; // automatic gain control gr_single_pole_iir<float,float,float> afci; gr_single_pole_iir<float,float,float> afcq; - + #ifdef _FPLL_DIAG_OUTPUT_ FILE *fp; #endif diff --git a/gr-atsc/src/lib/GrAtscFieldSyncChecker.cc b/gr-atsc/src/lib/GrAtscFieldSyncChecker.cc index c52b18442b..d2c82d6d47 100644 --- a/gr-atsc/src/lib/GrAtscFieldSyncChecker.cc +++ b/gr-atsc/src/lib/GrAtscFieldSyncChecker.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -31,7 +31,7 @@ typedef atsc::syminfo iTagType; typedef float oDataType; typedef atsc::syminfo oTagType; -static const int NUMBER_OF_OUTPUTS = 2; // # of output streams +static const int NUMBER_OF_OUTPUTS = 2; // # of output streams GrAtscFieldSyncChecker::GrAtscFieldSyncChecker () @@ -45,7 +45,7 @@ GrAtscFieldSyncChecker::GrAtscFieldSyncChecker () // used by the superclass's forecast routine to get us the correct // range on our inputs. // We're one-to-one input-to-output so set it to 1. - history = 1; + history = 1; d_fsc = create_atsci_fs_checker (); } @@ -63,7 +63,7 @@ GrAtscFieldSyncChecker::~GrAtscFieldSyncChecker () * use a single input and output stream. */ -int +int GrAtscFieldSyncChecker::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { diff --git a/gr-atsc/src/lib/GrAtscFieldSyncChecker.h b/gr-atsc/src/lib/GrAtscFieldSyncChecker.h index e2f48281b2..28458a19b5 100644 --- a/gr-atsc/src/lib/GrAtscFieldSyncChecker.h +++ b/gr-atsc/src/lib/GrAtscFieldSyncChecker.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.cc b/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.cc index 4cbf171036..42f93aa8cf 100644 --- a/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.cc +++ b/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -29,7 +29,7 @@ typedef float iType; typedef float oType; -static const int NUMBER_OF_OUTPUTS = 2; // # of output streams +static const int NUMBER_OF_OUTPUTS = 2; // # of output streams GrAtscFieldSyncCorrelator::GrAtscFieldSyncCorrelator () @@ -39,7 +39,7 @@ GrAtscFieldSyncCorrelator::GrAtscFieldSyncCorrelator () // used by the superclass's forecast routine to get us the correct // range on our inputs. // We're one-to-one input-to-output so set it to 1. - history = 1; + history = 1; d_fsc = create_atsci_fs_correlator (); } @@ -57,7 +57,7 @@ GrAtscFieldSyncCorrelator::~GrAtscFieldSyncCorrelator () * use a single input and output stream. */ -int +int GrAtscFieldSyncCorrelator::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { diff --git a/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.h b/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.h index 9f5c43563a..1a16048b22 100644 --- a/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.h +++ b/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscFieldSyncDemux.cc b/gr-atsc/src/lib/GrAtscFieldSyncDemux.cc index 2394993255..e311acc8ab 100644 --- a/gr-atsc/src/lib/GrAtscFieldSyncDemux.cc +++ b/gr-atsc/src/lib/GrAtscFieldSyncDemux.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -50,13 +50,13 @@ GrAtscFieldSyncDemux::forecast (VrSampleRange output, /* dec:1 ratio with history */ assert (numberInputs == 2); - + for (unsigned int i = 0; i < numberInputs; i++) { inputs[i].index = d_next_input; inputs[i].size = output.size * decimation + history - 1; } return 0; -} +} inline static bool tag_is_seg_sync_or_field_sync (atsc::syminfo tag) @@ -103,12 +103,12 @@ GrAtscFieldSyncDemux::work (VrSampleRange output, void *ao[], str = "FIELD-2"; else str = "SEGMENT"; - + cerr << "GrAtscFieldSyncDemux: synced (" << str << ") at " << inputs[0].index + ii << " [delta = " << inputs[0].index + ii - d_lost_index << "]\n"; - + d_next_input += ii; // update for forecast return 0; // no work completed so far } @@ -117,7 +117,7 @@ GrAtscFieldSyncDemux::work (VrSampleRange output, void *ao[], d_next_input += ii; // update for forecast return 0; // no work completed so far } - + // We are in sync. Produce output... unsigned int k = 0; // output index @@ -135,7 +135,7 @@ GrAtscFieldSyncDemux::work (VrSampleRange output, void *ao[], // lost sync... // cerr << "GrAtscFieldSyncDemux: lost sync at " // << inputs[0].index + ii << endl; - + d_next_input += ii; // update for forecast return k; // return amount of work completed so far } @@ -146,7 +146,7 @@ GrAtscFieldSyncDemux::work (VrSampleRange output, void *ao[], ii += ATSC_DATA_SEGMENT_LENGTH; // skip over field sync continue; } - + if (atsc::tag_is_start_field_sync_2 (input_tags[ii])){ d_in_field2 = true; d_segment_number = 0; diff --git a/gr-atsc/src/lib/GrAtscFieldSyncDemux.h b/gr-atsc/src/lib/GrAtscFieldSyncDemux.h index 5796aa2335..f5bab9b875 100644 --- a/gr-atsc/src/lib/GrAtscFieldSyncDemux.h +++ b/gr-atsc/src/lib/GrAtscFieldSyncDemux.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscFieldSyncMux.cc b/gr-atsc/src/lib/GrAtscFieldSyncMux.cc index 8df36ba4ba..7ebab72ad7 100644 --- a/gr-atsc/src/lib/GrAtscFieldSyncMux.cc +++ b/gr-atsc/src/lib/GrAtscFieldSyncMux.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -54,7 +54,7 @@ init_field_sync_common (unsigned char *p, int mask, for (int j = 0; j < 63; j++) // PN63, toggled on field 2 p[i++] = bin_map[atsc_pn63[j] ^ mask]; - + for (int j = 0; j < 63; j++) // PN63 p[i++] = bin_map[atsc_pn63[j]]; @@ -124,7 +124,7 @@ save_last_symbols (unsigned char saved_symbols[N_SAVED_SYMBOLS], } -inline static bool +inline static bool last_regular_seg_p (const plinfo &pli) { return pli.regular_seg_p () && (pli.segno () == ATSC_DSEGS_PER_FIELD - 1); @@ -138,7 +138,7 @@ GrAtscFieldSyncMux::GrAtscFieldSyncMux () // 1 + number of extra input elements at which we look. This is // used by the superclass's forecast routine to get us the correct // range on our inputs. - history = 1; + history = 1; // any other init here. } @@ -160,7 +160,7 @@ GrAtscFieldSyncMux::pre_initialize () * exactly 1:1 with our input. */ -int +int GrAtscFieldSyncMux::forecast (VrSampleRange output, VrSampleRange inputs[]) { for(unsigned int i = 0; i < numberInputs; i++) { @@ -175,7 +175,7 @@ GrAtscFieldSyncMux::forecast (VrSampleRange output, VrSampleRange inputs[]) * multiple streams of input and output, but we almost always * use a single input and output stream. */ -int +int GrAtscFieldSyncMux::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { @@ -204,7 +204,7 @@ GrAtscFieldSyncMux::work (VrSampleRange output, void *ao[], for (unsigned int outdex = 0; outdex < output.size; outdex++){ assert (in[index].pli.regular_seg_p ()); - + if (!in[index].pli.first_regular_seg_p ()){ out[outdex] = in[index]; // just copy in to out @@ -242,5 +242,5 @@ GrAtscFieldSyncMux::work (VrSampleRange output, void *ao[], // Note that for all intents and purposes, it is an error to // produce less than you are asked for. - return output.size; + return output.size; } diff --git a/gr-atsc/src/lib/GrAtscFieldSyncMux.h b/gr-atsc/src/lib/GrAtscFieldSyncMux.h index 66dd4494a8..ae52b8e5c9 100644 --- a/gr-atsc/src/lib/GrAtscFieldSyncMux.h +++ b/gr-atsc/src/lib/GrAtscFieldSyncMux.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -46,7 +46,7 @@ public: int forecast (VrSampleRange output, VrSampleRange inputs[]); void pre_initialize (); - + static const int N_SAVED_SYMBOLS = 12; protected: diff --git a/gr-atsc/src/lib/GrAtscInterleaver.cc b/gr-atsc/src/lib/GrAtscInterleaver.cc index cd50a86799..2c8f0c7e83 100644 --- a/gr-atsc/src/lib/GrAtscInterleaver.cc +++ b/gr-atsc/src/lib/GrAtscInterleaver.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -37,7 +37,7 @@ GrAtscInterleaver::GrAtscInterleaver () // used by the superclass's forecast routine to get us the correct // range on our inputs. // We're one-to-one input-to-output so set it to 1. - history = 1; + history = 1; // any other init here. } @@ -53,7 +53,7 @@ GrAtscInterleaver::~GrAtscInterleaver () * use a single input and output stream. */ -int +int GrAtscInterleaver::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { @@ -97,5 +97,5 @@ GrAtscInterleaver::work (VrSampleRange output, void *ao[], // Note that for all intents and purposes, it is an error to // produce less than you are asked for. - return output.size; + return output.size; } diff --git a/gr-atsc/src/lib/GrAtscInterleaver.h b/gr-atsc/src/lib/GrAtscInterleaver.h index 07066133ae..76be38a21e 100644 --- a/gr-atsc/src/lib/GrAtscInterleaver.h +++ b/gr-atsc/src/lib/GrAtscInterleaver.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscRSDecoder.cc b/gr-atsc/src/lib/GrAtscRSDecoder.cc index c9092a298a..fd0122ad22 100644 --- a/gr-atsc/src/lib/GrAtscRSDecoder.cc +++ b/gr-atsc/src/lib/GrAtscRSDecoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -37,7 +37,7 @@ GrAtscRSDecoder::GrAtscRSDecoder () // used by the superclass's forecast routine to get us the correct // range on our inputs. // We're one-to-one input-to-output so set it to 1. - history = 1; + history = 1; // any other init here. } @@ -53,7 +53,7 @@ GrAtscRSDecoder::~GrAtscRSDecoder () * use a single input and output stream. */ -int +int GrAtscRSDecoder::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { @@ -77,5 +77,5 @@ GrAtscRSDecoder::work (VrSampleRange output, void *ao[], // Note that for all intents and purposes, it is an error to // produce less than you are asked for. - return output.size; + return output.size; } diff --git a/gr-atsc/src/lib/GrAtscRSDecoder.h b/gr-atsc/src/lib/GrAtscRSDecoder.h index 4586a20b26..d64102d101 100644 --- a/gr-atsc/src/lib/GrAtscRSDecoder.h +++ b/gr-atsc/src/lib/GrAtscRSDecoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscRSEncoder.cc b/gr-atsc/src/lib/GrAtscRSEncoder.cc index 2954779a12..249678427b 100644 --- a/gr-atsc/src/lib/GrAtscRSEncoder.cc +++ b/gr-atsc/src/lib/GrAtscRSEncoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -37,7 +37,7 @@ GrAtscRSEncoder::GrAtscRSEncoder () // used by the superclass's forecast routine to get us the correct // range on our inputs. // We're one-to-one input-to-output so set it to 1. - history = 1; + history = 1; // any other init here. } @@ -53,7 +53,7 @@ GrAtscRSEncoder::~GrAtscRSEncoder () * use a single input and output stream. */ -int +int GrAtscRSEncoder::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { @@ -80,5 +80,5 @@ GrAtscRSEncoder::work (VrSampleRange output, void *ao[], // Note that for all intents and purposes, it is an error to // produce less than you are asked for. - return output.size; + return output.size; } diff --git a/gr-atsc/src/lib/GrAtscRSEncoder.h b/gr-atsc/src/lib/GrAtscRSEncoder.h index 3f41d77979..29921d8b3c 100644 --- a/gr-atsc/src/lib/GrAtscRSEncoder.h +++ b/gr-atsc/src/lib/GrAtscRSEncoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscRandomizer.cc b/gr-atsc/src/lib/GrAtscRandomizer.cc index 3217b9b87d..c5172699cc 100644 --- a/gr-atsc/src/lib/GrAtscRandomizer.cc +++ b/gr-atsc/src/lib/GrAtscRandomizer.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -38,7 +38,7 @@ GrAtscRandomizer::GrAtscRandomizer () // used by the superclass's forecast routine to get us the correct // range on our inputs. // We're one-to-one input-to-output so set it to 1. - history = 1; + history = 1; // any other init here. } @@ -54,7 +54,7 @@ GrAtscRandomizer::~GrAtscRandomizer () * use a single input and output stream. */ -int +int GrAtscRandomizer::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { @@ -106,5 +106,5 @@ GrAtscRandomizer::work (VrSampleRange output, void *ao[], // Note that for all intents and purposes, it is an error to // produce less than you are asked for. - return output.size; + return output.size; } diff --git a/gr-atsc/src/lib/GrAtscRandomizer.h b/gr-atsc/src/lib/GrAtscRandomizer.h index 7a1908d01f..f56f7178e6 100644 --- a/gr-atsc/src/lib/GrAtscRandomizer.h +++ b/gr-atsc/src/lib/GrAtscRandomizer.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscSegSymSync.cc b/gr-atsc/src/lib/GrAtscSegSymSync.cc index 721f36c108..2d9419c259 100644 --- a/gr-atsc/src/lib/GrAtscSegSymSync.cc +++ b/gr-atsc/src/lib/GrAtscSegSymSync.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscSegSymSync.h b/gr-atsc/src/lib/GrAtscSegSymSync.h index 0f01a8de3f..750483f544 100644 --- a/gr-atsc/src/lib/GrAtscSegSymSync.h +++ b/gr-atsc/src/lib/GrAtscSegSymSync.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -48,7 +48,7 @@ public: GrAtscSegSymSync (); ~GrAtscSegSymSync (); - + /*! * \brief reset bit timing loop on channel change */ diff --git a/gr-atsc/src/lib/GrAtscSegSymSyncImpl.cc b/gr-atsc/src/lib/GrAtscSegSymSyncImpl.cc index a7925bf8fb..8e2cfc2085 100644 --- a/gr-atsc/src/lib/GrAtscSegSymSyncImpl.cc +++ b/gr-atsc/src/lib/GrAtscSegSymSyncImpl.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -33,7 +33,7 @@ GrAtscSegSymSyncImpl::GrAtscSegSymSyncImpl ( decimation = (int) rint (nominal_ratio_of_rx_clock_to_symbol_freq); history = 1500; // spare input samples in case we need them. - + d_sssr.reset (); d_interp.reset (); d_next_input = 0; diff --git a/gr-atsc/src/lib/GrAtscSegSymSyncImpl.h b/gr-atsc/src/lib/GrAtscSegSymSyncImpl.h index b1052cf5e0..650dab5690 100644 --- a/gr-atsc/src/lib/GrAtscSegSymSyncImpl.h +++ b/gr-atsc/src/lib/GrAtscSegSymSyncImpl.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -45,7 +45,7 @@ class GrAtscSegSymSyncImpl : public GrAtscSegSymSync { public: // the standard methods... - + GrAtscSegSymSyncImpl (double nominal_ratio_of_rx_clock_to_symbol_freq); virtual ~GrAtscSegSymSyncImpl (); @@ -58,7 +58,7 @@ public: VrSampleRange inputs[], void *i[]); void pre_initialize (); - + // reset on channel change diff --git a/gr-atsc/src/lib/GrAtscSegSymSyncImpl_export.h b/gr-atsc/src/lib/GrAtscSegSymSyncImpl_export.h index 569c0dd276..187f1a0395 100644 --- a/gr-atsc/src/lib/GrAtscSegSymSyncImpl_export.h +++ b/gr-atsc/src/lib/GrAtscSegSymSyncImpl_export.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscSymbolMapper.h b/gr-atsc/src/lib/GrAtscSymbolMapper.h index 41bea59174..a37703f1fd 100644 --- a/gr-atsc/src/lib/GrAtscSymbolMapper.h +++ b/gr-atsc/src/lib/GrAtscSymbolMapper.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -58,15 +58,15 @@ protected: template<class oType> -int +int GrAtscSymbolMapper<oType>::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { atsc_data_segment *in = ((atsc_data_segment **) ai)[0]; oType *out = ((oType **) ao)[0]; - + assert ((output.size % INTERP_FACTOR) == 0); - + static const float pilot_add = 1.25; static const float map[8] = { -7 + pilot_add, diff --git a/gr-atsc/src/lib/GrAtscTrellisEncoder.cc b/gr-atsc/src/lib/GrAtscTrellisEncoder.cc index 9def275d72..a0df3e9a78 100644 --- a/gr-atsc/src/lib/GrAtscTrellisEncoder.cc +++ b/gr-atsc/src/lib/GrAtscTrellisEncoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -43,7 +43,7 @@ GrAtscTrellisEncoder::GrAtscTrellisEncoder () // any other init here. - // Let the bottom end know we must produce output in multiples of 12 segments. + // Let the bottom end know we must produce output in multiples of 12 segments. setOutputSize (atsci_trellis_encoder::NCODERS); } @@ -58,7 +58,7 @@ GrAtscTrellisEncoder::~GrAtscTrellisEncoder () * use a single input and output stream. */ -int +int GrAtscTrellisEncoder::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { @@ -88,7 +88,7 @@ GrAtscTrellisEncoder::work (VrSampleRange output, void *ao[], << " sum = " << output.index + output.size << " \t[in = " << in << "]" << endl; -#endif +#endif assert (output.size % atsci_trellis_encoder::NCODERS == 0); @@ -140,5 +140,5 @@ GrAtscTrellisEncoder::work (VrSampleRange output, void *ao[], // Note that for all intents and purposes, it is an error to // produce less than you are asked for. - return output.size; + return output.size; } diff --git a/gr-atsc/src/lib/GrAtscTrellisEncoder.h b/gr-atsc/src/lib/GrAtscTrellisEncoder.h index ebe8dafa9a..e4de388ae7 100644 --- a/gr-atsc/src/lib/GrAtscTrellisEncoder.h +++ b/gr-atsc/src/lib/GrAtscTrellisEncoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/GrAtscViterbiDecoder.cc b/gr-atsc/src/lib/GrAtscViterbiDecoder.cc index 98e0a81a51..c89b3556bb 100644 --- a/gr-atsc/src/lib/GrAtscViterbiDecoder.cc +++ b/gr-atsc/src/lib/GrAtscViterbiDecoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -44,7 +44,7 @@ GrAtscViterbiDecoder::GrAtscViterbiDecoder () // any other init here. - // Let the bottom end know we must produce output in multiples of 12 segments. + // Let the bottom end know we must produce output in multiples of 12 segments. setOutputSize (atsci_viterbi_decoder::NCODERS); } @@ -59,7 +59,7 @@ GrAtscViterbiDecoder::~GrAtscViterbiDecoder () * use a single input and output stream. */ -int +int GrAtscViterbiDecoder::work (VrSampleRange output, void *ao[], VrSampleRange inputs[], void *ai[]) { @@ -126,10 +126,10 @@ GrAtscViterbiDecoder::work (VrSampleRange output, void *ao[], << " output.size = " << output.size << " sum = " << output.index + output.size << endl; #endif - + // Return the number of units we produced. // Note that for all intents and purposes, it is an error to // produce less than you are asked for. - return output.size; + return output.size; } diff --git a/gr-atsc/src/lib/GrAtscViterbiDecoder.h b/gr-atsc/src/lib/GrAtscViterbiDecoder.h index 4bc93e88af..1b3bdd84a0 100644 --- a/gr-atsc/src/lib/GrAtscViterbiDecoder.h +++ b/gr-atsc/src/lib/GrAtscViterbiDecoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc.i b/gr-atsc/src/lib/atsc.i index c26584cc22..6e5662ae68 100644 --- a/gr-atsc/src/lib/atsc.i +++ b/gr-atsc/src/lib/atsc.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2009 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_bit_timing_loop.cc b/gr-atsc/src/lib/atsc_bit_timing_loop.cc index d87a2c3fd2..7abd907cca 100644 --- a/gr-atsc/src/lib/atsc_bit_timing_loop.cc +++ b/gr-atsc/src/lib/atsc_bit_timing_loop.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -102,7 +102,7 @@ atsc_bit_timing_loop::work (int noutput_items, // ammount actually consumed d_si = 0; - + for (k = 0; k < noutput_items; k++){ if (!d_interp.update (in, input_size, &d_si, timing_adjustment, &interp_sample)){ fprintf (stderr, "GrAtscBitTimingLoop3: ran short on data...\n"); diff --git a/gr-atsc/src/lib/atsc_bit_timing_loop.h b/gr-atsc/src/lib/atsc_bit_timing_loop.h index 2adff26b86..8b352f7eb1 100644 --- a/gr-atsc/src/lib/atsc_bit_timing_loop.h +++ b/gr-atsc/src/lib/atsc_bit_timing_loop.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_consts.h b/gr-atsc/src/lib/atsc_consts.h index 160ad7633f..bbe2ec69aa 100644 --- a/gr-atsc/src/lib/atsc_consts.h +++ b/gr-atsc/src/lib/atsc_consts.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -28,7 +28,7 @@ static const double ATSC_DATA_SEGMENT_RATE = ATSC_SYMBOL_RATE / 832; // ~12.935 static const int ATSC_MPEG_DATA_LENGTH = 187; -static const int ATSC_MPEG_PKT_LENGTH = 188; // sync + data +static const int ATSC_MPEG_PKT_LENGTH = 188; // sync + data static const int ATSC_MPEG_RS_ENCODED_LENGTH = 207; static const int ATSC_DATA_SEGMENT_LENGTH = 832; // includes 4 sync symbols at beginning static const int ATSC_DSEGS_PER_FIELD = 312; // regular data segs / field diff --git a/gr-atsc/src/lib/atsc_deinterleaver.cc b/gr-atsc/src/lib/atsc_deinterleaver.cc index aee9cd58b7..f251c7f4eb 100644 --- a/gr-atsc/src/lib/atsc_deinterleaver.cc +++ b/gr-atsc/src/lib/atsc_deinterleaver.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_deinterleaver.h b/gr-atsc/src/lib/atsc_deinterleaver.h index 8cab62b627..e398dfcc7d 100644 --- a/gr-atsc/src/lib/atsc_deinterleaver.h +++ b/gr-atsc/src/lib/atsc_deinterleaver.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_depad.cc b/gr-atsc/src/lib/atsc_depad.cc index 5cf0c3de2b..9792a4e6a4 100644 --- a/gr-atsc/src/lib/atsc_depad.cc +++ b/gr-atsc/src/lib/atsc_depad.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2008,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_depad.h b/gr-atsc/src/lib/atsc_depad.h index b514efe28a..9d1a381bfd 100644 --- a/gr-atsc/src/lib/atsc_depad.h +++ b/gr-atsc/src/lib/atsc_depad.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_derandomizer.cc b/gr-atsc/src/lib/atsc_derandomizer.cc index 7dc4cf4c10..6642adb25c 100644 --- a/gr-atsc/src/lib/atsc_derandomizer.cc +++ b/gr-atsc/src/lib/atsc_derandomizer.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_derandomizer.h b/gr-atsc/src/lib/atsc_derandomizer.h index 54254d0c5c..1881a69a36 100644 --- a/gr-atsc/src/lib/atsc_derandomizer.h +++ b/gr-atsc/src/lib/atsc_derandomizer.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -35,7 +35,7 @@ ATSC_API atsc_derandomizer_sptr atsc_make_derandomizer(); * \brief "dewhiten" incoming mpeg transport stream packets * \ingroup atsc * - * input: atsc_mpeg_packet_no_sync; output: atsc_mpeg_packet; + * input: atsc_mpeg_packet_no_sync; output: atsc_mpeg_packet; */ class ATSC_API atsc_derandomizer : public gr_sync_block { diff --git a/gr-atsc/src/lib/atsc_ds_to_softds.cc b/gr-atsc/src/lib/atsc_ds_to_softds.cc index c589bbb9f9..a8f93bde4e 100644 --- a/gr-atsc/src/lib/atsc_ds_to_softds.cc +++ b/gr-atsc/src/lib/atsc_ds_to_softds.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_ds_to_softds.h b/gr-atsc/src/lib/atsc_ds_to_softds.h index 1021eed6fc..0ba61c7d6b 100644 --- a/gr-atsc/src/lib/atsc_ds_to_softds.h +++ b/gr-atsc/src/lib/atsc_ds_to_softds.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_equalizer.cc b/gr-atsc/src/lib/atsc_equalizer.cc index 3e68de9928..b8f31aeb42 100644 --- a/gr-atsc/src/lib/atsc_equalizer.cc +++ b/gr-atsc/src/lib/atsc_equalizer.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_equalizer.h b/gr-atsc/src/lib/atsc_equalizer.h index 773cd1a04e..32b449b623 100644 --- a/gr-atsc/src/lib/atsc_equalizer.h +++ b/gr-atsc/src/lib/atsc_equalizer.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_field_sync_demux.cc b/gr-atsc/src/lib/atsc_field_sync_demux.cc index 3b321eae69..2783e4a90b 100644 --- a/gr-atsc/src/lib/atsc_field_sync_demux.cc +++ b/gr-atsc/src/lib/atsc_field_sync_demux.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -52,7 +52,7 @@ 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_index(0), + d_next_input(0), d_lost_index(0), d_inputs0_index(0), d_inputs0_size(0), d_consume(0) { reset(); diff --git a/gr-atsc/src/lib/atsc_field_sync_demux.h b/gr-atsc/src/lib/atsc_field_sync_demux.h index 0e3a5003d1..ea9a5d1acd 100644 --- a/gr-atsc/src/lib/atsc_field_sync_demux.h +++ b/gr-atsc/src/lib/atsc_field_sync_demux.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_field_sync_mux.cc b/gr-atsc/src/lib/atsc_field_sync_mux.cc index 3d0e20a1c9..99fa5bff36 100644 --- a/gr-atsc/src/lib/atsc_field_sync_mux.cc +++ b/gr-atsc/src/lib/atsc_field_sync_mux.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -147,9 +147,9 @@ void atsc_field_sync_mux::forecast (int noutput_items, gr_vector_int &ninput_items_required) { unsigned ninputs = ninput_items_required.size(); - for (unsigned i = 0; i < ninputs; i++) + for (unsigned i = 0; i < ninputs; i++) ninput_items_required[i] = fixed_rate_noutput_to_ninput (noutput_items); - + } diff --git a/gr-atsc/src/lib/atsc_field_sync_mux.h b/gr-atsc/src/lib/atsc_field_sync_mux.h index d08a99b5ba..ce4514e9c3 100644 --- a/gr-atsc/src/lib/atsc_field_sync_mux.h +++ b/gr-atsc/src/lib/atsc_field_sync_mux.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_fpll.cc b/gr-atsc/src/lib/atsc_fpll.cc index 676a7453ee..c8d62c415f 100644 --- a/gr-atsc/src/lib/atsc_fpll.cc +++ b/gr-atsc/src/lib/atsc_fpll.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_fpll.h b/gr-atsc/src/lib/atsc_fpll.h index dac3cda866..0474b8f766 100644 --- a/gr-atsc/src/lib/atsc_fpll.h +++ b/gr-atsc/src/lib/atsc_fpll.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_fs_checker.cc b/gr-atsc/src/lib/atsc_fs_checker.cc index 6162c9ef67..f8c4e43d5b 100644 --- a/gr-atsc/src/lib/atsc_fs_checker.cc +++ b/gr-atsc/src/lib/atsc_fs_checker.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_fs_checker.h b/gr-atsc/src/lib/atsc_fs_checker.h index c08f06c9d4..d034fdd28f 100644 --- a/gr-atsc/src/lib/atsc_fs_checker.h +++ b/gr-atsc/src/lib/atsc_fs_checker.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_interleaver.cc b/gr-atsc/src/lib/atsc_interleaver.cc index a870914368..fff5b2fa66 100644 --- a/gr-atsc/src/lib/atsc_interleaver.cc +++ b/gr-atsc/src/lib/atsc_interleaver.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_interleaver.h b/gr-atsc/src/lib/atsc_interleaver.h index 00cd54c11a..3090d49de4 100644 --- a/gr-atsc/src/lib/atsc_interleaver.h +++ b/gr-atsc/src/lib/atsc_interleaver.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -31,7 +31,7 @@ typedef boost::shared_ptr<atsc_interleaver> atsc_interleaver_sptr; ATSC_API atsc_interleaver_sptr atsc_make_interleaver(); -/*! \brief Interleave RS encoded ATSC data ( atsc_mpeg_packet_rs_encoded --> atsc_mpeg_packet_rs_encoded)* +/*! \brief Interleave RS encoded ATSC data ( atsc_mpeg_packet_rs_encoded --> atsc_mpeg_packet_rs_encoded)* * \ingroup atsc * * input: atsc_mpeg_packet_rs_encoded; output: atsc_mpeg_packet_rs_encoded diff --git a/gr-atsc/src/lib/atsc_pad.cc b/gr-atsc/src/lib/atsc_pad.cc index 8a36307afe..317b16aca7 100644 --- a/gr-atsc/src/lib/atsc_pad.cc +++ b/gr-atsc/src/lib/atsc_pad.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -49,7 +49,7 @@ void atsc_pad::forecast (int noutput_items, gr_vector_int &ninput_items_required) { unsigned ninputs = ninput_items_required.size(); - for (unsigned i = 0; i < ninputs; i++) + for (unsigned i = 0; i < ninputs; i++) ninput_items_required[i] = noutput_items * ATSC_MPEG_PKT_LENGTH; } @@ -61,7 +61,7 @@ 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]; - + int i; for (i = 0; i < noutput_items; i++){ diff --git a/gr-atsc/src/lib/atsc_pad.h b/gr-atsc/src/lib/atsc_pad.h index 866c72552d..139d951a6c 100644 --- a/gr-atsc/src/lib/atsc_pad.h +++ b/gr-atsc/src/lib/atsc_pad.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -31,7 +31,7 @@ typedef boost::shared_ptr<atsc_pad> atsc_pad_sptr; ATSC_API atsc_pad_sptr atsc_make_pad(); /*! - * \brief pad mpeg ts packets from 188 byte char to + * \brief pad mpeg ts packets from 188 byte char to * to 256 byte atsc_mpeg_packet * \ingroup atsc * diff --git a/gr-atsc/src/lib/atsc_randomizer.cc b/gr-atsc/src/lib/atsc_randomizer.cc index cd797b8f5e..73375e84cd 100644 --- a/gr-atsc/src/lib/atsc_randomizer.cc +++ b/gr-atsc/src/lib/atsc_randomizer.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_randomizer.h b/gr-atsc/src/lib/atsc_randomizer.h index 1178f06c04..7d00efcf90 100644 --- a/gr-atsc/src/lib/atsc_randomizer.h +++ b/gr-atsc/src/lib/atsc_randomizer.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_rs_decoder.cc b/gr-atsc/src/lib/atsc_rs_decoder.cc index aa3f9369e5..e4bb6e57ab 100644 --- a/gr-atsc/src/lib/atsc_rs_decoder.cc +++ b/gr-atsc/src/lib/atsc_rs_decoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_rs_decoder.h b/gr-atsc/src/lib/atsc_rs_decoder.h index 4b8d6c1b46..9e4bf8d44e 100644 --- a/gr-atsc/src/lib/atsc_rs_decoder.h +++ b/gr-atsc/src/lib/atsc_rs_decoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_rs_encoder.cc b/gr-atsc/src/lib/atsc_rs_encoder.cc index f98ff664c3..7c4ec293b4 100644 --- a/gr-atsc/src/lib/atsc_rs_encoder.cc +++ b/gr-atsc/src/lib/atsc_rs_encoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_rs_encoder.h b/gr-atsc/src/lib/atsc_rs_encoder.h index d9812678a2..b0d69d95d2 100644 --- a/gr-atsc/src/lib/atsc_rs_encoder.h +++ b/gr-atsc/src/lib/atsc_rs_encoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_trellis_encoder.cc b/gr-atsc/src/lib/atsc_trellis_encoder.cc index 4cf81a045d..fa0a889aa8 100644 --- a/gr-atsc/src/lib/atsc_trellis_encoder.cc +++ b/gr-atsc/src/lib/atsc_trellis_encoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_trellis_encoder.h b/gr-atsc/src/lib/atsc_trellis_encoder.h index c848161187..da51f633d2 100644 --- a/gr-atsc/src/lib/atsc_trellis_encoder.h +++ b/gr-atsc/src/lib/atsc_trellis_encoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_types.h b/gr-atsc/src/lib/atsc_types.h index d505a51c1c..ed4dedace9 100644 --- a/gr-atsc/src/lib/atsc_types.h +++ b/gr-atsc/src/lib/atsc_types.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001,2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -33,7 +33,7 @@ * * Not all modules need all the info */ -class plinfo { +class plinfo { public: plinfo () : _flags (0), _segno (0) { } @@ -108,7 +108,7 @@ public: * confirm that \p X is plausible */ static void sanity_check (const plinfo &in); - + protected: unsigned short _flags; // bitmask @@ -213,7 +213,7 @@ class atsc_data_segment { /*! * Contains 832 bipolar floating point symbols. - * Nominal values are +/- {1, 3, 5, 7}. + * Nominal values are +/- {1, 3, 5, 7}. * This data type represents the input to the viterbi decoder. */ diff --git a/gr-atsc/src/lib/atsc_viterbi_decoder.cc b/gr-atsc/src/lib/atsc_viterbi_decoder.cc index 81ad9178ac..72b9a965bb 100644 --- a/gr-atsc/src/lib/atsc_viterbi_decoder.cc +++ b/gr-atsc/src/lib/atsc_viterbi_decoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006,2010 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsc_viterbi_decoder.h b/gr-atsc/src/lib/atsc_viterbi_decoder.h index 1a43b49521..de571db33d 100644 --- a/gr-atsc/src/lib/atsc_viterbi_decoder.h +++ b/gr-atsc/src/lib/atsc_viterbi_decoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_basic_trellis_encoder.cc b/gr-atsc/src/lib/atsci_basic_trellis_encoder.cc index 6b6fc19cbf..2ae481cbcd 100644 --- a/gr-atsc/src/lib/atsci_basic_trellis_encoder.cc +++ b/gr-atsc/src/lib/atsci_basic_trellis_encoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -55,7 +55,7 @@ int atsci_basic_trellis_encoder::encode (unsigned int input) { assert (input < 4); - int index = (state << 2) + input; + int index = (state << 2) + input; state = next_state[index]; return out_symbol[index]; } diff --git a/gr-atsc/src/lib/atsci_basic_trellis_encoder.h b/gr-atsc/src/lib/atsci_basic_trellis_encoder.h index c17e5653e4..a1bbbf5a0e 100644 --- a/gr-atsc/src/lib/atsci_basic_trellis_encoder.h +++ b/gr-atsc/src/lib/atsci_basic_trellis_encoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_data_interleaver.cc b/gr-atsc/src/lib/atsci_data_interleaver.cc index b20dde9418..a2eef0fea7 100644 --- a/gr-atsc/src/lib/atsci_data_interleaver.cc +++ b/gr-atsc/src/lib/atsci_data_interleaver.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -22,7 +22,7 @@ #include <atsci_data_interleaver.h> -void +void atsci_data_interleaver::interleave (atsc_mpeg_packet_rs_encoded &out, const atsc_mpeg_packet_rs_encoded &in) { @@ -37,7 +37,7 @@ atsci_data_interleaver::interleave (atsc_mpeg_packet_rs_encoded &out, } -void +void atsci_data_deinterleaver::deinterleave (atsc_mpeg_packet_rs_encoded &out, const atsc_mpeg_packet_rs_encoded &in) { @@ -47,7 +47,7 @@ atsci_data_deinterleaver::deinterleave (atsc_mpeg_packet_rs_encoded &out, // reset commutator if required using INPUT pipeline info if (in.pli.first_regular_seg_p ()) sync (); - + // remap OUTPUT pipeline info to reflect 52 data segment end-to-end delay plinfo::delay (out.pli, in.pli, 52); diff --git a/gr-atsc/src/lib/atsci_data_interleaver.h b/gr-atsc/src/lib/atsci_data_interleaver.h index e7f982db40..290607ea3d 100644 --- a/gr-atsc/src/lib/atsci_data_interleaver.h +++ b/gr-atsc/src/lib/atsci_data_interleaver.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_diag_output.h b/gr-atsc/src/lib/atsci_diag_output.h index 5e3239d678..09fd763d6a 100644 --- a/gr-atsc/src/lib/atsci_diag_output.h +++ b/gr-atsc/src/lib/atsci_diag_output.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_equalizer.cc b/gr-atsc/src/lib/atsci_equalizer.cc index fb04db7c24..4aec474957 100644 --- a/gr-atsc/src/lib/atsci_equalizer.cc +++ b/gr-atsc/src/lib/atsci_equalizer.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -53,7 +53,7 @@ atsci_equalizer::reset () d_offset_from_last_field_sync = 0; d_current_field = 0; } - + /* * Errrr.... Define to 1 if compiler handles tail recursion without pushing * unnecessary stack frames, else define to 0 for lame compilers. @@ -71,7 +71,7 @@ atsci_equalizer::reset () * Today's strategy: get it working. */ -void +void atsci_equalizer::filter (const float *input_samples, const atsc::syminfo *input_tags, float *output_samples, @@ -138,15 +138,15 @@ atsci_equalizer::filter (const float *input_samples, else { // we're lost... no field sync where we expected it cerr << "!!! atsci_equalizer: expected field sync, didn't find one\n"; - + d_locked_p = false; - d_offset_from_last_field_sync = 0; + d_offset_from_last_field_sync = 0; if (WINNING_COMPILER) filter (input_samples, input_tags, output_samples, nsamples); else goto lame_compiler_kludge; - + return; } @@ -206,7 +206,7 @@ atsci_equalizer::filter (const float *input_samples, int n = min (4 - seg_offset, nsamples); filter_data_seg_sync (input_samples, output_samples, n, seg_offset); - + d_offset_from_last_field_sync += n; nsamples -= n; @@ -227,7 +227,7 @@ atsci_equalizer::filter (const float *input_samples, // otherwise... we're in the normal zone int n = min (ATSC_DATA_SEGMENT_LENGTH - seg_offset, nsamples); - + filter_normal (input_samples, output_samples, n); d_offset_from_last_field_sync += n; @@ -235,7 +235,7 @@ atsci_equalizer::filter (const float *input_samples, if (nsamples <= 0) return; - + if (WINNING_COMPILER) filter (&input_samples[n], &input_tags[n], &output_samples[n], nsamples); diff --git a/gr-atsc/src/lib/atsci_equalizer.h b/gr-atsc/src/lib/atsci_equalizer.h index 853c52689a..a0a1fc6744 100644 --- a/gr-atsc/src/lib/atsci_equalizer.h +++ b/gr-atsc/src/lib/atsci_equalizer.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -53,7 +53,7 @@ public: // CREATORS atsci_equalizer (); virtual ~atsci_equalizer (); - + // MANIPULATORS /*! @@ -62,7 +62,7 @@ public: * Note, subclasses must invoke the superclass's method too! */ virtual void reset (); - + /*! * \brief produce \p nsamples of output from given inputs and tags * @@ -71,11 +71,11 @@ public: * to handle each sub-segment of the input data. * * \p input_samples must have (nsamples + ntaps() - 1) valid entries. - * input_samples[0] .. input_samples[nsamples - 1 + ntaps() - 1] are + * input_samples[0] .. input_samples[nsamples - 1 + ntaps() - 1] are * referenced to compute the output values. * * \p input_tags must have nsamples valid entries. - * input_tags[0] .. input_tags[nsamples - 1] are referenced to + * input_tags[0] .. input_tags[nsamples - 1] are referenced to * compute the output values. */ virtual void filter (const float *input_samples, @@ -94,10 +94,10 @@ public: virtual int ntaps () const = 0; /*! - * \brief how many taps are "in the future". + * \brief how many taps are "in the future". * * This allows us to handle what the ATSC folks call "pre-ghosts". - * What it really does is allow the caller to jack with the offset + * What it really does is allow the caller to jack with the offset * between the tags and the data so that everything magically works out. * * npretaps () must return a value between 0 and ntaps() - 1. @@ -107,7 +107,7 @@ public: * like 15% - 20% of ntaps (). */ virtual int npretaps () const = 0; - + protected: @@ -139,14 +139,14 @@ protected: float *output_samples, int nsamples, int offset) = 0; - + /*! * Input range is known to consist of only a field sync segment or a * portion of a field sync segment. \p nsamples will be in [1,832]. * \p offset will be in [0,831]. \p offset is the offset of the input * from the beginning of the data segment sync pattern. We consider the * 4 symbols of the immediately preceding data segment sync to be the - * first symbols of the field sync segment. \p which_field is in [0,1] + * first symbols of the field sync segment. \p which_field is in [0,1] * and specifies which field (duh). * * \p input_samples has (nsamples + ntaps() - 1) valid entries. diff --git a/gr-atsc/src/lib/atsci_equalizer_lms.cc b/gr-atsc/src/lib/atsci_equalizer_lms.cc index 6358b5334c..bab962e326 100644 --- a/gr-atsc/src/lib/atsci_equalizer_lms.cc +++ b/gr-atsc/src/lib/atsci_equalizer_lms.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -86,7 +86,7 @@ atsci_equalizer_lms::npretaps () const * input_samples[0] .. input_samples[nsamples - 1 + ntaps() - 1] may be * referenced to compute the output values. */ -void +void atsci_equalizer_lms::filter_normal (const float *input_samples, float *output_samples, int nsamples) @@ -106,7 +106,7 @@ atsci_equalizer_lms::filter_normal (const float *input_samples, * input_samples[0] .. input_samples[nsamples - 1 + ntaps() - 1] may be * referenced to compute the output values. */ -void +void atsci_equalizer_lms::filter_data_seg_sync (const float *input_samples, float *output_samples, int nsamples, @@ -119,24 +119,24 @@ atsci_equalizer_lms::filter_data_seg_sync (const float *input_samples, // cerr << "Seg Sync: offset " << offset << "\tnsamples\t" << nsamples << "\t pre, 5 -5 -5 5\t" << // output_samples[0] << "\t" << output_samples[1] << "\t" << output_samples[2] << "\t" << output_samples[3] << endl; - + } - + /*! * Input range is known to consist of only a field sync segment or a * portion of a field sync segment. \p nsamples will be in [1,832]. * \p offset will be in [0,831]. \p offset is the offset of the input * from the beginning of the data segment sync pattern. We consider the * 4 symbols of the immediately preceding data segment sync to be the - * first symbols of the field sync segment. \p which_field is in [0,1] + * first symbols of the field sync segment. \p which_field is in [0,1] * and specifies which field (duh). * * \p input_samples has (nsamples + ntaps() - 1) valid entries. * input_samples[0] .. input_samples[nsamples - 1 + ntaps() - 1] may be * referenced to compute the output values. */ -void +void atsci_equalizer_lms::filter_field_sync (const float *input_samples, float *output_samples, int nsamples, @@ -144,11 +144,11 @@ atsci_equalizer_lms::filter_field_sync (const float *input_samples, int which_field) { // Only the first 4 + 511 + 3 * 63 symbols are completely defined. - // Those after that the symbols are bilevel, so we could use decision feedback and use + // Those after that the symbols are bilevel, so we could use decision feedback and use // that to train, but for now, don't train on them. int n = min (nsamples, get_field_sync_training_sequence_length (offset)); - + // handle known training sequence adaptN (input_samples, get_field_sync_training_sequence (which_field, offset), output_samples, n); @@ -205,7 +205,7 @@ float atsci_equalizer_lms::adapt1 (const float input[], float ideal_output) { static const double BETA = 0.00005; // FIXME figure out what this ought to be - // FIXME add gear-shifting + // FIXME add gear-shifting double y = filter1 (input); double e = y - ideal_output; @@ -228,7 +228,7 @@ atsci_equalizer_lms::filterN (const float *input_samples, } -void +void atsci_equalizer_lms::adaptN (const float *input_samples, const float *training_pattern, float *output_samples, @@ -248,7 +248,7 @@ bin_map (int bit) static void init_field_sync_common (float *p, int mask) - + { int i = 0; @@ -265,7 +265,7 @@ init_field_sync_common (float *p, int mask) for (int j = 0; j < 63; j++) // PN63, toggled on field 2 p[i++] = bin_map (atsc_pn63[j] ^ mask); - + for (int j = 0; j < 63; j++) // PN63 p[i++] = bin_map (atsc_pn63[j]); @@ -281,7 +281,7 @@ get_data_seg_sync_training_sequence (int offset) } #endif -static int +static int get_field_sync_training_sequence_length (int offset) { return max (0, KNOWN_FIELD_SYNC_LENGTH - offset); diff --git a/gr-atsc/src/lib/atsci_equalizer_lms.h b/gr-atsc/src/lib/atsci_equalizer_lms.h index 8a39255c62..68aa34ca5c 100644 --- a/gr-atsc/src/lib/atsci_equalizer_lms.h +++ b/gr-atsc/src/lib/atsci_equalizer_lms.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -37,7 +37,7 @@ public: virtual void reset (); virtual int ntaps () const; virtual int npretaps () const; - + protected: FILE *trainingfile; virtual void filter_normal (const float *input_samples, @@ -48,7 +48,7 @@ protected: float *output_samples, int nsamples, int offset); - + virtual void filter_field_sync (const float *input_samples, float *output_samples, int nsamples, diff --git a/gr-atsc/src/lib/atsci_equalizer_lms2.cc b/gr-atsc/src/lib/atsci_equalizer_lms2.cc index f9fb57c7b8..2825aad507 100644 --- a/gr-atsc/src/lib/atsci_equalizer_lms2.cc +++ b/gr-atsc/src/lib/atsci_equalizer_lms2.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -43,22 +43,22 @@ static const int KNOWN_FIELD_SYNC_LENGTH = 4 + 511 + 3 * 63; static int get_field_sync_training_sequence_length (int offset); static const float *get_field_sync_training_sequence (int which_field, int offset); -static inline int -wrap (int d) +static inline int +wrap (int d) { assert (d >= 0 && d <= (2 * NFBTAPS)); - + if(d >= NFBTAPS) return d - NFBTAPS; return d; } -static inline float +static inline float slice (float d) { if (boost::math::isnan (d)) return 0.0; - + if (d >= 0.0){ if (d >= 4.0){ if (d >= 6.0) @@ -129,7 +129,7 @@ atsci_equalizer_lms2::npretaps () const * input_samples[0] .. input_samples[nsamples - 1 + ntaps() - 1] may be * referenced to compute the output values. */ -void +void atsci_equalizer_lms2::filter_normal (const float *input_samples, float *output_samples, int nsamples) @@ -149,7 +149,7 @@ atsci_equalizer_lms2::filter_normal (const float *input_samples, * input_samples[0] .. input_samples[nsamples - 1 + ntaps() - 1] may be * referenced to compute the output values. */ -void +void atsci_equalizer_lms2::filter_data_seg_sync (const float *input_samples, float *output_samples, int nsamples, @@ -162,24 +162,24 @@ atsci_equalizer_lms2::filter_data_seg_sync (const float *input_samples, // cerr << "Seg Sync: offset " << offset << "\tnsamples\t" << nsamples << "\t pre, 5 -5 -5 5\t" << // output_samples[0] << "\t" << output_samples[1] << "\t" << output_samples[2] << "\t" << output_samples[3] << endl; - + } - + /*! * Input range is known to consist of only a field sync segment or a * portion of a field sync segment. \p nsamples will be in [1,832]. * \p offset will be in [0,831]. \p offset is the offset of the input * from the beginning of the data segment sync pattern. We consider the * 4 symbols of the immediately preceding data segment sync to be the - * first symbols of the field sync segment. \p which_field is in [0,1] + * first symbols of the field sync segment. \p which_field is in [0,1] * and specifies which field (duh). * * \p input_samples has (nsamples + ntaps() - 1) valid entries. * input_samples[0] .. input_samples[nsamples - 1 + ntaps() - 1] may be * referenced to compute the output values. */ -void +void atsci_equalizer_lms2::filter_field_sync (const float *input_samples, float *output_samples, int nsamples, @@ -187,11 +187,11 @@ atsci_equalizer_lms2::filter_field_sync (const float *input_samples, int which_field) { // Only the first 4 + 511 + 3 * 63 symbols are completely defined. - // Those after that the symbols are bilevel, so we could use decision feedback and use + // Those after that the symbols are bilevel, so we could use decision feedback and use // that to train, but for now, don't train on them. int n = min (nsamples, get_field_sync_training_sequence_length (offset)); - + // handle known training sequence adaptN (input_samples, get_field_sync_training_sequence (which_field, offset), output_samples, n); @@ -268,7 +268,7 @@ float atsci_equalizer_lms2::adapt1 (const float input[], float ideal_output) { static const double BETA = 0.00005; // FIXME figure out what this ought to be - // FIXME add gear-shifting + // FIXME add gear-shifting double y = filter1 (input); double e = y - ideal_output; @@ -296,7 +296,7 @@ atsci_equalizer_lms2::filterN (const float *input_samples, } -void +void atsci_equalizer_lms2::adaptN (const float *input_samples, const float *training_pattern, float *output_samples, @@ -316,7 +316,7 @@ bin_map (int bit) static void init_field_sync_common (float *p, int mask) - + { int i = 0; @@ -333,7 +333,7 @@ init_field_sync_common (float *p, int mask) for (int j = 0; j < 63; j++) // PN63, toggled on field 2 p[i++] = bin_map (atsc_pn63[j] ^ mask); - + for (int j = 0; j < 63; j++) // PN63 p[i++] = bin_map (atsc_pn63[j]); @@ -349,7 +349,7 @@ get_data_seg_sync_training_sequence (int offset) } #endif -static int +static int get_field_sync_training_sequence_length (int offset) { return max (0, KNOWN_FIELD_SYNC_LENGTH - offset); diff --git a/gr-atsc/src/lib/atsci_equalizer_lms2.h b/gr-atsc/src/lib/atsci_equalizer_lms2.h index 7c60fc1745..d0f2660d5b 100644 --- a/gr-atsc/src/lib/atsci_equalizer_lms2.h +++ b/gr-atsc/src/lib/atsci_equalizer_lms2.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -37,7 +37,7 @@ public: virtual void reset (); virtual int ntaps () const; virtual int npretaps () const; - + protected: FILE *trainingfile; virtual void filter_normal (const float *input_samples, @@ -48,7 +48,7 @@ protected: float *output_samples, int nsamples, int offset); - + virtual void filter_field_sync (const float *input_samples, float *output_samples, int nsamples, diff --git a/gr-atsc/src/lib/atsci_equalizer_nop.cc b/gr-atsc/src/lib/atsci_equalizer_nop.cc index 9b2b53269d..5af2cc4e7a 100644 --- a/gr-atsc/src/lib/atsci_equalizer_nop.cc +++ b/gr-atsc/src/lib/atsci_equalizer_nop.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -38,7 +38,7 @@ atsci_equalizer_nop::reset () atsci_equalizer::reset (); // invoke superclass } -int +int atsci_equalizer_nop::ntaps () const { return 1; @@ -60,7 +60,7 @@ atsci_equalizer_nop::npretaps () const * input_samples[0] .. input_samples[nsamples - 1 + ntaps() - 1] may be * referenced to compute the output values. */ -void +void atsci_equalizer_nop::filter_normal (const float *input_samples, float *output_samples, int nsamples) @@ -81,7 +81,7 @@ atsci_equalizer_nop::filter_normal (const float *input_samples, * input_samples[0] .. input_samples[nsamples - 1 + ntaps() - 1] may be * referenced to compute the output values. */ -void +void atsci_equalizer_nop::filter_data_seg_sync (const float *input_samples, float *output_samples, int nsamples, @@ -92,21 +92,21 @@ atsci_equalizer_nop::filter_data_seg_sync (const float *input_samples, } } - + /*! * Input range is known to consist of only a field sync segment or a * portion of a field sync segment. \p nsamples will be in [1,832]. * \p offset will be in [0,831]. \p offset is the offset of the input * from the beginning of the data segment sync pattern. We consider the * 4 symbols of the immediately preceding data segment sync to be the - * first symbols of the field sync segment. \p which_field is in [0,1] + * first symbols of the field sync segment. \p which_field is in [0,1] * and specifies which field (duh). * * \p input_samples has (nsamples + ntaps() - 1) valid entries. * input_samples[0] .. input_samples[nsamples - 1 + ntaps() - 1] may be * referenced to compute the output values. */ -void +void atsci_equalizer_nop::filter_field_sync (const float *input_samples, float *output_samples, int nsamples, @@ -114,7 +114,7 @@ atsci_equalizer_nop::filter_field_sync (const float *input_samples, int which_field) { int i = 0; - + if (offset == 0 && nsamples > 0){ output_samples[0] = scale_and_train (input_samples[0]); i++; diff --git a/gr-atsc/src/lib/atsci_equalizer_nop.h b/gr-atsc/src/lib/atsci_equalizer_nop.h index 6d842601f6..d29fded640 100644 --- a/gr-atsc/src/lib/atsci_equalizer_nop.h +++ b/gr-atsc/src/lib/atsci_equalizer_nop.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -32,7 +32,7 @@ private: float scale (float input) { return input; } float scale_and_train (float input); - + public: atsci_equalizer_nop (); @@ -41,7 +41,7 @@ public: virtual void reset (); virtual int ntaps () const; virtual int npretaps () const; - + protected: virtual void filter_normal (const float *input_samples, float *output_samples, @@ -51,7 +51,7 @@ protected: float *output_samples, int nsamples, int offset); - + virtual void filter_field_sync (const float *input_samples, float *output_samples, int nsamples, diff --git a/gr-atsc/src/lib/atsci_exp2_lp.cc b/gr-atsc/src/lib/atsci_exp2_lp.cc index 38e62d929f..8f411977e2 100644 --- a/gr-atsc/src/lib/atsci_exp2_lp.cc +++ b/gr-atsc/src/lib/atsci_exp2_lp.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -35,8 +35,8 @@ using std::endl; * FILTER TYPE:LOW PASS 1H * PASSBAND RIPPLE IN -dB -.0100 * STOPBAND RIPPLE IN -dB -66.0000 - * PASSBAND CUTOFF FREQUENCY 5.69000 HERTZ - * STOPBAND CUTOFF FREQUENCY 6.12000 HERTZ + * PASSBAND CUTOFF FREQUENCY 5.69000 HERTZ + * STOPBAND CUTOFF FREQUENCY 6.12000 HERTZ * SAMPLING FREQUENCY 21.5200 HERTZ */ static const float atsci_exp2_lp2x[] = { @@ -48,8 +48,8 @@ static const float atsci_exp2_lp2x[] = { * FILTER TYPE:LOW PASS 1H * PASSBAND RIPPLE IN -dB -.0100 * STOPBAND RIPPLE IN -dB -66.0000 - * PASSBAND CUTOFF FREQUENCY 5.69000 HERTZ - * STOPBAND CUTOFF FREQUENCY 6.12000 HERTZ + * PASSBAND CUTOFF FREQUENCY 5.69000 HERTZ + * STOPBAND CUTOFF FREQUENCY 6.12000 HERTZ * SAMPLING FREQUENCY 20.0000 HERTZ */ static const float atsci_exp2_lp20[] = { @@ -61,7 +61,7 @@ static const float atsci_exp2_lp20[] = { // is A within 5% of TARGET? -static bool +static bool close_enough_p (double a, double target) { double delta = fabs (target * 0.05); // 5 percent @@ -69,7 +69,7 @@ close_enough_p (double a, double target) return fabs (target - a) <= delta; } -vector<float> +vector<float> atsci_exp2_lp::taps (double sampling_freq) { if (close_enough_p (sampling_freq, 20e6)){ diff --git a/gr-atsc/src/lib/atsci_exp2_lp.h b/gr-atsc/src/lib/atsci_exp2_lp.h index 12d08fa6d9..e04c425287 100644 --- a/gr-atsc/src/lib/atsci_exp2_lp.h +++ b/gr-atsc/src/lib/atsci_exp2_lp.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_exp2_lp20.dat b/gr-atsc/src/lib/atsci_exp2_lp20.dat index b810fac70a..d09c5aca26 100644 --- a/gr-atsc/src/lib/atsci_exp2_lp20.dat +++ b/gr-atsc/src/lib/atsci_exp2_lp20.dat @@ -3,8 +3,8 @@ * FILTER TYPE:LOW PASS 1H * PASSBAND RIPPLE IN -dB -.0100 * STOPBAND RIPPLE IN -dB -66.0000 - * PASSBAND CUTOFF FREQUENCY 5.69000 HERTZ - * STOPBAND CUTOFF FREQUENCY 6.12000 HERTZ + * PASSBAND CUTOFF FREQUENCY 5.69000 HERTZ + * STOPBAND CUTOFF FREQUENCY 6.12000 HERTZ * SAMPLING FREQUENCY 20.0000 HERTZ */ -.3137849271297455e-03, diff --git a/gr-atsc/src/lib/atsci_exp2_lp2x.dat b/gr-atsc/src/lib/atsci_exp2_lp2x.dat index 16b2b47dff..67dd204cb4 100644 --- a/gr-atsc/src/lib/atsci_exp2_lp2x.dat +++ b/gr-atsc/src/lib/atsci_exp2_lp2x.dat @@ -3,8 +3,8 @@ * FILTER TYPE:LOW PASS 1H * PASSBAND RIPPLE IN -dB -.0100 * STOPBAND RIPPLE IN -dB -66.0000 - * PASSBAND CUTOFF FREQUENCY 5.69000 HERTZ - * STOPBAND CUTOFF FREQUENCY 6.12000 HERTZ + * PASSBAND CUTOFF FREQUENCY 5.69000 HERTZ + * STOPBAND CUTOFF FREQUENCY 6.12000 HERTZ * SAMPLING FREQUENCY 21.5200 HERTZ */ diff --git a/gr-atsc/src/lib/atsci_fake_single_viterbi.cc b/gr-atsc/src/lib/atsci_fake_single_viterbi.cc index bf5cf9ab7a..6246a90505 100644 --- a/gr-atsc/src/lib/atsci_fake_single_viterbi.cc +++ b/gr-atsc/src/lib/atsci_fake_single_viterbi.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -46,7 +46,7 @@ char atsci_fake_single_viterbi::decode (float input) { int y2, y1; - + if (input < -4){ y2 = 0; y1 = 0; diff --git a/gr-atsc/src/lib/atsci_fake_single_viterbi.h b/gr-atsc/src/lib/atsci_fake_single_viterbi.h index b4cb6e3b36..561afb3d37 100644 --- a/gr-atsc/src/lib/atsci_fake_single_viterbi.h +++ b/gr-atsc/src/lib/atsci_fake_single_viterbi.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -30,7 +30,7 @@ */ class ATSC_API atsci_fake_single_viterbi { - + public: atsci_fake_single_viterbi (); @@ -49,4 +49,4 @@ protected: int post_coder_state; }; -#endif +#endif diff --git a/gr-atsc/src/lib/atsci_fs_checker.cc b/gr-atsc/src/lib/atsci_fs_checker.cc index 80af1239cf..7d321307cf 100644 --- a/gr-atsc/src/lib/atsci_fs_checker.cc +++ b/gr-atsc/src/lib/atsci_fs_checker.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_fs_checker.h b/gr-atsc/src/lib/atsci_fs_checker.h index cdcd541e89..7a426b742f 100644 --- a/gr-atsc/src/lib/atsci_fs_checker.h +++ b/gr-atsc/src/lib/atsci_fs_checker.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -31,7 +31,7 @@ * Processes input samples one at a time looking for * an occurence of either the field sync 1 or field sync 2 pattern. * - * Note that unlike atsci_fs_correlator, this class uses the symbol_num in + * Note that unlike atsci_fs_correlator, this class uses the symbol_num in * input_tag to avoid having to test each symbol position. * * For each sample processed, an output sample and an output tag are produced. @@ -66,5 +66,5 @@ public: //! return delay in samples from input to output virtual int delay () const = 0; }; - + #endif /* _ATSC_FS_CHECKER_H_ */ diff --git a/gr-atsc/src/lib/atsci_fs_checker_naive.cc b/gr-atsc/src/lib/atsci_fs_checker_naive.cc index ab50aff8bd..f14472aa26 100644 --- a/gr-atsc/src/lib/atsci_fs_checker_naive.cc +++ b/gr-atsc/src/lib/atsci_fs_checker_naive.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -85,7 +85,7 @@ atsci_fs_checker_naive::filter (float input_sample, atsc::syminfo input_tag, atsc::syminfo proto_tag = d_tag_sr[d_index]; // oldest tag in the queue if (proto_tag.symbol_num == 0){ // check for field sync pattern - + d_segment_num = (d_segment_num + 1) & atsc::SI_SEGMENT_NUM_MASK; // increment // check for a hit on the PN 511 pattern @@ -119,7 +119,7 @@ atsci_fs_checker_naive::filter (float input_sample, atsc::syminfo input_tag, } } - proto_tag.segment_num = d_segment_num; // fill in segment number and field number + proto_tag.segment_num = d_segment_num; // fill in segment number and field number proto_tag.field_num = d_field_num; // return oldest sample diff --git a/gr-atsc/src/lib/atsci_fs_checker_naive.h b/gr-atsc/src/lib/atsci_fs_checker_naive.h index 3ef507111f..21c628a1d2 100644 --- a/gr-atsc/src/lib/atsci_fs_checker_naive.h +++ b/gr-atsc/src/lib/atsci_fs_checker_naive.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -67,7 +67,7 @@ class ATSC_API atsci_fs_checker_naive : public atsci_fs_checker { //! return delay in samples from input to output int delay () const; - + }; diff --git a/gr-atsc/src/lib/atsci_fs_correlator.cc b/gr-atsc/src/lib/atsci_fs_correlator.cc index 9e76537a0a..efeb351766 100644 --- a/gr-atsc/src/lib/atsci_fs_correlator.cc +++ b/gr-atsc/src/lib/atsci_fs_correlator.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_fs_correlator.h b/gr-atsc/src/lib/atsci_fs_correlator.h index a6db7f5189..ff70245c99 100644 --- a/gr-atsc/src/lib/atsci_fs_correlator.h +++ b/gr-atsc/src/lib/atsci_fs_correlator.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -61,5 +61,5 @@ public: //! return delay in samples from input to output virtual int delay () const = 0; }; - + #endif /* _ATSC_FS_CORRELATOR_H_ */ diff --git a/gr-atsc/src/lib/atsci_fs_correlator_naive.cc b/gr-atsc/src/lib/atsci_fs_correlator_naive.cc index 695641c20e..ccf9035310 100644 --- a/gr-atsc/src/lib/atsci_fs_correlator_naive.cc +++ b/gr-atsc/src/lib/atsci_fs_correlator_naive.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_fs_correlator_naive.h b/gr-atsc/src/lib/atsci_fs_correlator_naive.h index 92e3f7499a..d8afc2ca62 100644 --- a/gr-atsc/src/lib/atsci_fs_correlator_naive.h +++ b/gr-atsc/src/lib/atsci_fs_correlator_naive.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -63,7 +63,7 @@ class ATSC_API atsci_fs_correlator_naive : public atsci_fs_correlator { //! return delay in samples from input to output int delay () const; - + }; diff --git a/gr-atsc/src/lib/atsci_pnXXX.cc b/gr-atsc/src/lib/atsci_pnXXX.cc index cfcf87f0b5..128582d2d8 100644 --- a/gr-atsc/src/lib/atsci_pnXXX.cc +++ b/gr-atsc/src/lib/atsci_pnXXX.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -45,7 +45,7 @@ const unsigned char atsc_pn511[511] = { 1,0,0,0, 1,1,0,0, 0,0,0,1, 1,1,1,0, 1,1,1,1, 1,1,0,1, 0,1,1,0, 1,0,1,0, 1,1,0,0, 1,0,0,1, 1,0,0,1, 0,0,0,1, 1,1,0,1, 1,1,0,0, 0,0,1,0, 1,1,0,1, - 0,0,0,0, 0,1,1,0, 1,1,0,0, 0,0,0,0, 1,0,0,1, 0,0,0,0, 0,0,0,1, 1,1,0 + 0,0,0,0, 0,1,1,0, 1,1,0,0, 0,0,0,0, 1,0,0,1, 0,0,0,0, 0,0,0,1, 1,1,0 }; const unsigned char atsc_pn63[63] = { diff --git a/gr-atsc/src/lib/atsci_pnXXX.h b/gr-atsc/src/lib/atsci_pnXXX.h index 58cb2d02db..612ed20341 100644 --- a/gr-atsc/src/lib/atsci_pnXXX.h +++ b/gr-atsc/src/lib/atsci_pnXXX.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_randomizer.cc b/gr-atsc/src/lib/atsci_randomizer.cc index 4a18e263a2..8766bbef05 100644 --- a/gr-atsc/src/lib/atsci_randomizer.cc +++ b/gr-atsc/src/lib/atsci_randomizer.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -48,19 +48,19 @@ void atsci_randomizer::initialize_output_map () { s_output_map_initialized_p = true; - + for (int i = 0; i < (1 << 14); i++) s_output_map[i] = slow_output_map (i << 2); } -void +void atsci_randomizer::reset () { d_state = PRELOAD_VALUE; } -void +void atsci_randomizer::randomize (atsc_mpeg_packet_no_sync &out, const atsc_mpeg_packet &in) { assert (in.data[0] == MPEG_SYNC_BYTE); // confirm it's there, then drop diff --git a/gr-atsc/src/lib/atsci_randomizer.h b/gr-atsc/src/lib/atsci_randomizer.h index 30c3235bb0..aedd0d8081 100644 --- a/gr-atsc/src/lib/atsci_randomizer.h +++ b/gr-atsc/src/lib/atsci_randomizer.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2001 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -26,16 +26,16 @@ #include <atsc_api.h> #include <atsc_types.h> -/*! +/*! * \brief ATSC data "whitener" * - * The data randomizer described in ATSC standard A/53B. + * The data randomizer described in ATSC standard A/53B. * See figure D4 on page 54. */ class ATSC_API atsci_randomizer { friend class qa_atsci_randomizer; - + public: atsci_randomizer(); @@ -60,12 +60,12 @@ class ATSC_API atsci_randomizer { static unsigned char slow_output_map (int st); static unsigned char fast_output_map (int st){ - return s_output_map[(st & 0xb23c) >> 2]; // Magic const with 8 bits set improves cache + return s_output_map[(st & 0xb23c) >> 2]; // Magic const with 8 bits set improves cache // utilization. The bits correspond to the taps - // used in output calculation. Others may be + // used in output calculation. Others may be // safely ignored. } - + //! return current output value unsigned char output (){ return fast_output_map (d_state); diff --git a/gr-atsc/src/lib/atsci_reed_solomon.cc b/gr-atsc/src/lib/atsci_reed_solomon.cc index e20e76d713..a4a40e3f17 100644 --- a/gr-atsc/src/lib/atsci_reed_solomon.cc +++ b/gr-atsc/src/lib/atsci_reed_solomon.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -60,7 +60,7 @@ atsci_reed_solomon::encode (atsc_mpeg_packet_rs_encoded &out, const atsc_mpeg_pa unsigned char tmp[K]; assert ((int)(amount_of_pad + sizeof (in.data)) == K); - + // add missing prefix zero padding to message memset (tmp, 0, amount_of_pad); memcpy (&tmp[amount_of_pad], in.data, sizeof (in.data)); @@ -79,14 +79,14 @@ atsci_reed_solomon::decode (atsc_mpeg_packet_no_sync &out, const atsc_mpeg_packe int ncorrections; assert ((int)(amount_of_pad + sizeof (in.data)) == N); - + // add missing prefix zero padding to message memset (tmp, 0, amount_of_pad); memcpy (&tmp[amount_of_pad], in.data, sizeof (in.data)); - // correct message... + // correct message... ncorrections = decode_rs_char (d_rs, tmp, 0, 0); - + // copy corrected message to output, skipping prefix zero padding memcpy (out.data, &tmp[amount_of_pad], sizeof (out.data)); diff --git a/gr-atsc/src/lib/atsci_reed_solomon.h b/gr-atsc/src/lib/atsci_reed_solomon.h index 6f53c77cab..8f6e26426b 100644 --- a/gr-atsc/src/lib/atsci_reed_solomon.h +++ b/gr-atsc/src/lib/atsci_reed_solomon.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine.cc b/gr-atsc/src/lib/atsci_root_raised_cosine.cc index 9409d2b9c3..f555d90ac6 100644 --- a/gr-atsc/src/lib/atsci_root_raised_cosine.cc +++ b/gr-atsc/src/lib/atsci_root_raised_cosine.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -24,7 +24,7 @@ #include <atsci_root_raised_cosine.h> #include <gr_firdes.h> -vector<float> +vector<float> atsc_root_raised_cosine::taps (double sampling_rate) { static const double symbol_rate = ATSC_SYMBOL_RATE/2; // 1/2 as wide because we're designing lp filter diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine.h b/gr-atsc/src/lib/atsci_root_raised_cosine.h index 12870faba7..f24606992c 100644 --- a/gr-atsc/src/lib/atsci_root_raised_cosine.h +++ b/gr-atsc/src/lib/atsci_root_raised_cosine.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.cc b/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.cc index a7c427d060..f795a41666 100644 --- a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.cc +++ b/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -29,7 +29,7 @@ using std::cerr; using std::endl; -vector<float> +vector<float> atsc_root_raised_cosine_bandpass::taps (double sampling_freq) { @@ -37,7 +37,7 @@ atsc_root_raised_cosine_bandpass::taps (double sampling_freq) cerr << "atsc_root_raised_cosine_bandpass::taps -- " << t.size () << endl; - // heterodyne the low pass coefficients up to the specified bandpass + // heterodyne the low pass coefficients up to the specified bandpass // center frequency. Note that when we do this, the filter bandwidth // is effectively twice the low pass (2.69 * 2 = 5.38) and hence // matches the diagram in the ATSC spec. diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h b/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h index 98329ab533..bdb33c28d2 100644 --- a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h +++ b/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_single_viterbi.cc b/gr-atsc/src/lib/atsci_single_viterbi.cc index f9d66ff8a2..a1bf2ea49d 100644 --- a/gr-atsc/src/lib/atsci_single_viterbi.cc +++ b/gr-atsc/src/lib/atsci_single_viterbi.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -70,11 +70,11 @@ atsci_single_viterbi::decode(float input) float min_metric = fabs(input - was_sent[index + 0]) + path_metrics[phase][transition_table[index + 0]]; - for (unsigned int symbol_sent = 1; symbol_sent < 4; symbol_sent++) - if( (fabs(input-was_sent[index+symbol_sent]) + + for (unsigned int symbol_sent = 1; symbol_sent < 4; symbol_sent++) + if( (fabs(input-was_sent[index+symbol_sent]) + path_metrics[phase][transition_table[index+symbol_sent]]) < min_metric) { - min_metric = fabs(input-was_sent[index+symbol_sent]) + + min_metric = fabs(input-was_sent[index+symbol_sent]) + path_metrics[phase][transition_table[index+symbol_sent]]; min_metric_symb = symbol_sent; } diff --git a/gr-atsc/src/lib/atsci_single_viterbi.h b/gr-atsc/src/lib/atsci_single_viterbi.h index cc752cb3a4..01b13fb25e 100644 --- a/gr-atsc/src/lib/atsci_single_viterbi.h +++ b/gr-atsc/src/lib/atsci_single_viterbi.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -30,7 +30,7 @@ */ class ATSC_API atsci_single_viterbi { - + public: atsci_single_viterbi (); @@ -55,4 +55,4 @@ protected: unsigned char phase; }; -#endif +#endif diff --git a/gr-atsc/src/lib/atsci_slicer_agc.h b/gr-atsc/src/lib/atsci_slicer_agc.h index 520fec44bf..8a3927b70a 100644 --- a/gr-atsc/src/lib/atsci_slicer_agc.h +++ b/gr-atsc/src/lib/atsci_slicer_agc.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -38,7 +38,7 @@ class ATSC_API atsci_slicer_agc { public: atsci_slicer_agc () : _gain(1), dc(0.0025) {}; - + float gain () { return _gain; } #if 1 @@ -59,7 +59,7 @@ class ATSC_API atsci_slicer_agc { #endif protected: - + static const float REFERENCE = 1.25; // pilot reference value static const float RATE = 1.0e-5; // adjustment rate float _gain; // current gain diff --git a/gr-atsc/src/lib/atsci_sliding_correlator.cc b/gr-atsc/src/lib/atsci_sliding_correlator.cc index bde8022e0e..877037db7d 100644 --- a/gr-atsc/src/lib/atsci_sliding_correlator.cc +++ b/gr-atsc/src/lib/atsci_sliding_correlator.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002,2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_sliding_correlator.h b/gr-atsc/src/lib/atsci_sliding_correlator.h index 64834a4e20..ffa2124ed3 100644 --- a/gr-atsc/src/lib/atsci_sliding_correlator.h +++ b/gr-atsc/src/lib/atsci_sliding_correlator.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -39,13 +39,13 @@ class ATSC_API atsci_sliding_correlator { ~atsci_sliding_correlator (){}; //! input hard decision bit, return correlation (0,511) - // Result is the number of wrong bits. + // Result is the number of wrong bits. // E.g., 0 -> perfect match; 511 -> all bits are wrong int input_bit (int bit); //! input sample, return correlation (0,511) - // Result is the number of wrong bits. + // Result is the number of wrong bits. // E.g., 0 -> perfect match; 511 -> all bits are wrong int input_int (int sample){ @@ -53,7 +53,7 @@ class ATSC_API atsci_sliding_correlator { } //! input sample, return correlation (0,511) - // Result is the number of wrong bits. + // Result is the number of wrong bits. // E.g., 0 -> perfect match; 511 -> all bits are wrong int input_float (float sample){ @@ -61,7 +61,7 @@ class ATSC_API atsci_sliding_correlator { } void reset () { input.reset (); } - + private: typedef unsigned long srblock; diff --git a/gr-atsc/src/lib/atsci_sssr.cc b/gr-atsc/src/lib/atsci_sssr.cc index 4ccee85dec..48c0c51fbf 100644 --- a/gr-atsc/src/lib/atsci_sssr.cc +++ b/gr-atsc/src/lib/atsci_sssr.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002,2008 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -47,7 +47,7 @@ sipp (bool digcorr_output) return -1; // no correlation } -/* +/* * ---------------------------------------------------------------- * Segment Sync Integrator... */ @@ -61,7 +61,7 @@ sssr::seg_sync_integrator::reset () for (int i = 0; i < ATSC_DATA_SEGMENT_LENGTH; i++) d_integrator[i] = SSI_MIN; } - + int sssr::seg_sync_integrator::update (int weight, int index) { @@ -78,7 +78,7 @@ sssr::seg_sync_integrator::find_max (int *v) { int best_value = d_integrator[0]; int best_index = 0; - + for (int i = 1; i < ATSC_DATA_SEGMENT_LENGTH; i++) if (d_integrator[i] > best_value){ best_value = d_integrator[i]; @@ -101,7 +101,7 @@ atsci_sssr::atsci_sssr () : d_debug_fp(0) { reset (); - + if (_SSSR_DIAG_OUTPUT_){ const char *file = "sssr.ssout"; if ((d_debug_fp = fopen (file, "wb")) == 0){ @@ -126,7 +126,7 @@ atsci_sssr::reset () for (int i = 0; i < ATSC_DATA_SEGMENT_LENGTH; i++) d_quad_output[i] = 0; - + d_timing_adjust = 0; d_counter = 0; d_symbol_index = 0; @@ -189,7 +189,7 @@ atsci_sssr::update (sssr::sample_t sample_in, // input static const double LOOP_FILTER_TAP = 0.00025; // 0.0005 works static const double ADJUSTMENT_GAIN = 1.0e-5 / (10 * ATSC_DATA_SEGMENT_LENGTH); - + atsci_interpolator::atsci_interpolator (double nominal_ratio_of_rx_clock_to_symbol_freq) : d_debug_fp(0) { @@ -239,10 +239,10 @@ atsci_interpolator::update ( return false; // FIXME Confirm that this is right. I think it is. It was (1-d_mu) - *output_sample = d_interp.interpolate (&input_samples[*index], d_mu); + *output_sample = d_interp.interpolate (&input_samples[*index], d_mu); double filter_out = 0; - + #if 0 filter_out = d_loop.filter (timing_adjustment); @@ -262,9 +262,9 @@ atsci_interpolator::update ( d_mu = d_mu + alpha * x; // conceptually "phase" d_w = d_w + beta * x; // conceptually "frequency" - + #endif - + double s = d_mu + d_w; double float_incr = floor (s); d_mu = s - float_incr; diff --git a/gr-atsc/src/lib/atsci_sssr.h b/gr-atsc/src/lib/atsci_sssr.h index 1dee54c1dd..f3b825b3c4 100644 --- a/gr-atsc/src/lib/atsci_sssr.h +++ b/gr-atsc/src/lib/atsci_sssr.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -48,7 +48,7 @@ namespace sssr { int d_sr; // 4 bit shift register public: - + // Constructor digital_correlator () { reset (); } @@ -73,7 +73,7 @@ namespace sssr { class ATSC_API seg_sync_integrator { signed char d_integrator[ATSC_DATA_SEGMENT_LENGTH]; - + public: // Constructor @@ -83,7 +83,7 @@ namespace sssr { //! called on channel change void reset (); - + //! update current tap with weight and return integrated correlation value int update (int weight, int index); @@ -91,7 +91,7 @@ namespace sssr { int find_max (int *value); }; - + // ---------------------------------------------------------------- //! quad filter (used to compute timing error) @@ -140,7 +140,7 @@ class ATSC_API atsci_sssr { bool d_seg_locked; FILE *d_debug_fp; - + bool incr_counter () { d_counter++; if (d_counter >= ATSC_DATA_SEGMENT_LENGTH){ @@ -149,7 +149,7 @@ class ATSC_API atsci_sssr { } return false; } - + void incr_symbol_index () { d_symbol_index++; if (d_symbol_index >= ATSC_DATA_SEGMENT_LENGTH) @@ -175,9 +175,9 @@ public: * track of where the segment sync's occur. \p timing_adjust is * returned to indicate how the interpolator timing needs to be * adjusted to track the transmitter's symbol timing. If \p seg_locked - * is true, then \p symbol_index is the index of this sample in - * the current segment. The symbols are numbered from 0 to 831, where - * symbols 0, 1, 2 and 3 correspond to the data segment sync pattern, + * is true, then \p symbol_index is the index of this sample in + * the current segment. The symbols are numbered from 0 to 831, where + * symbols 0, 1, 2 and 3 correspond to the data segment sync pattern, * nominally +5, -5, -5, +5. */ @@ -193,7 +193,7 @@ public: /*! * \brief interpolator control for segment and symbol sync recovery */ - + class ATSC_API atsci_interpolator { gri_mmse_fir_interpolator d_interp; gr_single_pole_iir<float,float,float> d_loop; // ``VCO'' loop filter @@ -235,7 +235,7 @@ public: double mu () const { return d_mu; } double w () const { return d_w; } int incr () const { return d_incr; } - + }; #endif /* _ATSC_SSSR_H_ */ diff --git a/gr-atsc/src/lib/atsci_syminfo.h b/gr-atsc/src/lib/atsci_syminfo.h index a8999e77a3..9f25e4902a 100644 --- a/gr-atsc/src/lib/atsci_syminfo.h +++ b/gr-atsc/src/lib/atsci_syminfo.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/atsci_sync_tag.h b/gr-atsc/src/lib/atsci_sync_tag.h index c644da39ff..bdb64c5d3d 100644 --- a/gr-atsc/src/lib/atsci_sync_tag.h +++ b/gr-atsc/src/lib/atsci_sync_tag.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -34,7 +34,7 @@ * type and all output streams share the same type. We'd use unsigned * char otherwise. */ - + namespace atsc_sync_tag { // Nothing special diff --git a/gr-atsc/src/lib/atsci_trellis_encoder.cc b/gr-atsc/src/lib/atsci_trellis_encoder.cc index 2ebccc371d..2b3e851bc1 100644 --- a/gr-atsc/src/lib/atsci_trellis_encoder.cc +++ b/gr-atsc/src/lib/atsci_trellis_encoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002,2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -65,7 +65,7 @@ atsci_trellis_encoder::reset () enc[i].reset (); } -void +void atsci_trellis_encoder::encode (atsc_data_segment out[NCODERS], const atsc_mpeg_packet_rs_encoded in[NCODERS]) { @@ -85,7 +85,7 @@ atsci_trellis_encoder::encode (atsc_data_segment out[NCODERS], } memset (out_copy, 0, sizeof (out_copy)); // FIXME, sanity check - + // do the deed... encode_helper (out_copy, in_copy); @@ -108,7 +108,7 @@ atsci_trellis_encoder::encode (atsc_data_segment out[NCODERS], * the correct answer. Maybe someday, when we've run out of better * things to do, rework to avoid the copying in encode. */ -void +void atsci_trellis_encoder::encode_helper (unsigned char output[OUTPUT_SIZE], const unsigned char input[INPUT_SIZE]) { @@ -123,7 +123,7 @@ atsci_trellis_encoder::encode_helper (unsigned char output[OUTPUT_SIZE], unsigned char symbol; int skip_encoder_bump; - /* FIXME, we may want special processing here + /* FIXME, we may want special processing here for a flag byte to keep track of which part of the field we're in? */ encoder = NCODERS - ENCODER_SEG_BUMP; @@ -136,7 +136,7 @@ atsci_trellis_encoder::encode_helper (unsigned char output[OUTPUT_SIZE], chunk += NCODERS) { /* Load a new chunk of bytes into the Trellis encoder buffers. They get loaded in an order that depends on where we are in the - segment sync progress (sigh). + segment sync progress (sigh). GRR! When the chunk reload happens at the same time as the segment boundary, we should bump the encoder NOW for the reload, rather than LATER during the bitshift transition!!! */ @@ -144,7 +144,7 @@ atsci_trellis_encoder::encode_helper (unsigned char output[OUTPUT_SIZE], encoder = (encoder + ENCODER_SEG_BUMP) % NCODERS; skip_encoder_bump = 1; } - + for (i = 0; i < NCODERS; i++) { /* for debug */ trellis_wherefrom[encoder] = chunk+i; trellis_buffer[encoder] = input [chunk+i]; @@ -193,7 +193,7 @@ atsci_trellis_encoder::encode_helper (unsigned char output[OUTPUT_SIZE], } /* Encoders */ } /* Bit shifts */ } /* Chunks */ - + /* Check up on ourselves */ #if 0 assertIntsEqual (0, (INPUT_SIZE * DIBITS_PER_BYTE) % NCODERS, "not %"); diff --git a/gr-atsc/src/lib/atsci_trellis_encoder.h b/gr-atsc/src/lib/atsci_trellis_encoder.h index 53be3fc22b..294ad860ff 100644 --- a/gr-atsc/src/lib/atsci_trellis_encoder.h +++ b/gr-atsc/src/lib/atsci_trellis_encoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -50,12 +50,12 @@ class ATSC_API atsci_trellis_encoder { void encode (atsc_data_segment out[NCODERS], const atsc_mpeg_packet_rs_encoded in[NCODERS]); - + protected: static const int SEGMENT_SIZE = ATSC_MPEG_RS_ENCODED_LENGTH; // 207 static const int INPUT_SIZE = (SEGMENT_SIZE * 12); static const int OUTPUT_SIZE = (ATSC_DATA_SEGMENT_LENGTH * 12); - + void encode_helper (unsigned char out[OUTPUT_SIZE], const unsigned char in[INPUT_SIZE]); diff --git a/gr-atsc/src/lib/atsci_viterbi_decoder.cc b/gr-atsc/src/lib/atsci_viterbi_decoder.cc index 5b9ae4e10a..8804f60076 100644 --- a/gr-atsc/src/lib/atsci_viterbi_decoder.cc +++ b/gr-atsc/src/lib/atsci_viterbi_decoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -49,7 +49,7 @@ atsci_viterbi_decoder::atsci_viterbi_decoder () * If anybody cares, it is possible to do it with less delay, but * this approach is at least somewhat understandable... */ - + // the -4 is for the 4 sync symbols int fifo_size = ATSC_DATA_SEGMENT_LENGTH - 4 - viterbi[0].delay (); for (int i = 0; i < NCODERS; i++) @@ -90,7 +90,7 @@ atsci_viterbi_decoder::decode (atsc_mpeg_packet_rs_encoded out[NCODERS], } memset (out_copy, 0, sizeof (out_copy)); // sanity check - + // do the deed... decode_helper (out_copy, in_copy); @@ -99,8 +99,8 @@ atsci_viterbi_decoder::decode (atsc_mpeg_packet_rs_encoded out[NCODERS], memcpy (&out[i].data[0], &out_copy[i * OUTPUT_SIZE/NCODERS], ATSC_MPEG_RS_ENCODED_LENGTH * sizeof (out_copy[0])); - - + + // adjust pipeline info to reflect 12 segment delay plinfo::delay (out[i].pli, in[i].pli, NCODERS); } @@ -150,13 +150,13 @@ atsci_viterbi_decoder::decode_helper (unsigned char out[OUTPUT_SIZE], #undef VERBOSE // printf ("@@@ DIBITS @@@\n"); - + /* Now run each of the 12 Trellis encoders over their subset of the input symbols */ for (encoder = 0; encoder < NCODERS; encoder++) { dbi = 0; /* Reinitialize dibit index for new encoder */ fifo_t *dibit_fifo = fifo[encoder]; - + /* Feed all the incoming symbols into one encoder; pump them into the relevant dibits. */ for (i = 0; i < enco_which_max; i++) { diff --git a/gr-atsc/src/lib/atsci_viterbi_decoder.h b/gr-atsc/src/lib/atsci_viterbi_decoder.h index 1243feeb5a..f339ce79a1 100644 --- a/gr-atsc/src/lib/atsci_viterbi_decoder.h +++ b/gr-atsc/src/lib/atsci_viterbi_decoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -61,20 +61,20 @@ public: const atsc_soft_data_segment in[NCODERS]); - + protected: typedef interleaver_fifo<unsigned char> fifo_t; static const int SEGMENT_SIZE = ATSC_MPEG_RS_ENCODED_LENGTH; // 207 static const int OUTPUT_SIZE = (SEGMENT_SIZE * 12); static const int INPUT_SIZE = (ATSC_DATA_SEGMENT_LENGTH * 12); - + void decode_helper (unsigned char out[OUTPUT_SIZE], const float in[INPUT_SIZE]); - + single_viterbi_t viterbi[NCODERS]; - fifo_t *fifo[NCODERS]; + fifo_t *fifo[NCODERS]; bool debug; }; diff --git a/gr-atsc/src/lib/atsci_viterbi_gen.cc b/gr-atsc/src/lib/atsci_viterbi_gen.cc index ea5c3fa871..bff3c47736 100644 --- a/gr-atsc/src/lib/atsci_viterbi_gen.cc +++ b/gr-atsc/src/lib/atsci_viterbi_gen.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002,2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -71,7 +71,7 @@ static const int bit2[8] = {0, 99, 2, 98, 4, 97, 6, 96}; /* Detailed Debugging */ int debug_dec = 0; -/* +/* * Build indirect data structures to say which symbols go into which * encoder, and then where the resulting dibits from the encoders go. */ @@ -116,7 +116,7 @@ build_decode_structures (char *fileout) chunk += ENCODERS) { /* Associate data bytes with the Trellis encoders. They get loaded or stored in an order that depends on where we are in the - segment sync progress (sigh). + segment sync progress (sigh). GRR! When the chunk reload happens at the same time as the segment boundary, we should bump the encoder NOW for the reload, rather than LATER during the bitshift transition!!! */ @@ -124,7 +124,7 @@ build_decode_structures (char *fileout) encoder = (encoder + ENCODER_SEG_BUMP) % ENCODERS; skip_encoder_bump = 1; } - + /* Remember where the data bytes are going to go, once we've accumulated them from the 12 interleaved decoders */ for (i = 0; i < ENCODERS; i++) { @@ -175,7 +175,7 @@ build_decode_structures (char *fileout) encoder++; if (encoder >= ENCODERS) encoder = 0; } /* Encoders */ } /* Bit shifts */ - + #if 0 /* Now dump out the chunk of 12 data bytes that the twelve decoders have accumulated. */ @@ -190,7 +190,7 @@ build_decode_structures (char *fileout) } /* Dumping encoder bytes */ #endif } /* Chunks */ - + /* Now print the resulting data structures in C++ */ if (!freopen(fileout, "w", stdout)) @@ -215,7 +215,7 @@ build_decode_structures (char *fileout) printf ("};\n\n"); enco_which_max = enco_dibits[0] - enco_which_dibits[0]; - for (i = 0; i < ENCODERS; i++) + for (i = 0; i < ENCODERS; i++) if (enco_which_max != enco_dibits[i] - enco_which_dibits[i]) { cerr << "Encoder " << i << " has different max_dibits " << enco_dibits[i] - enco_which_dibits[i] << " than " << enco_which_max; @@ -248,7 +248,7 @@ build_decode_structures (char *fileout) int usage() -{ +{ cerr << "atsc_viterbi_gen: Usage:\n"; cerr << " ./atsc_viterbi_gen -o atsc_viterbi_mux.cc\n"; cerr << "That's all, folks!\n"; @@ -257,7 +257,7 @@ usage() int -main(int argc, char **argv) +main(int argc, char **argv) { if (argc != 3) return usage(); if (argv[1][0] != '-' diff --git a/gr-atsc/src/lib/atsci_vsbtx_lp.cc b/gr-atsc/src/lib/atsci_vsbtx_lp.cc index 224d29ac1a..704cd00ca4 100644 --- a/gr-atsc/src/lib/atsci_vsbtx_lp.cc +++ b/gr-atsc/src/lib/atsci_vsbtx_lp.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -39,7 +39,7 @@ static const float atsc_vsbtx_lp2x[] = { // is a within 5% of target? -static bool +static bool close_enough_p (double a, double target) { double delta = fabs (target * 0.05); // 5 percent @@ -47,7 +47,7 @@ close_enough_p (double a, double target) return fabs (target - a) <= delta; } -vector<float> +vector<float> atsc_vsbtx_lp::taps (double sampling_freq) { if (close_enough_p (sampling_freq, 2 * ATSC_SYMBOL_RATE)){ diff --git a/gr-atsc/src/lib/atsci_vsbtx_lp.dat b/gr-atsc/src/lib/atsci_vsbtx_lp.dat index 448fda7a28..0fa54d42b5 100644 --- a/gr-atsc/src/lib/atsci_vsbtx_lp.dat +++ b/gr-atsc/src/lib/atsci_vsbtx_lp.dat @@ -3,9 +3,9 @@ * FILTER TYPE:LOW PASS 1H * PASSBAND RIPPLE IN -dB -.0100 * STOPBAND RIPPLE IN -dB -76.0000 - * PASSBAND CUTOFF FREQUENCY .250000 HERTZ - * STOPBAND CUTOFF FREQUENCY .360000 HERTZ - * SAMPLING FREQUENCY 1.00000 HERTZ + * PASSBAND CUTOFF FREQUENCY .250000 HERTZ + * STOPBAND CUTOFF FREQUENCY .360000 HERTZ + * SAMPLING FREQUENCY 1.00000 HERTZ */ /* * gain of 2 diff --git a/gr-atsc/src/lib/atsci_vsbtx_lp.h b/gr-atsc/src/lib/atsci_vsbtx_lp.h index d3bb0c9d1f..b892641c9d 100644 --- a/gr-atsc/src/lib/atsci_vsbtx_lp.h +++ b/gr-atsc/src/lib/atsci_vsbtx_lp.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/convolutional_interleaver.h b/gr-atsc/src/lib/convolutional_interleaver.h index 0b5ae6f4b3..35a31d4879 100644 --- a/gr-atsc/src/lib/convolutional_interleaver.h +++ b/gr-atsc/src/lib/convolutional_interleaver.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -40,7 +40,7 @@ class convolutional_interleaver { //! reset interleaver (flushes contents and resets commutator) void reset (); - + //! sync interleaver (resets commutator, but doesn't flush fifos) void sync () { m_commutator = 0; } @@ -79,7 +79,7 @@ convolutional_interleaver<symbol_type>::convolutional_interleaver ( m_fifo_size_incr = fifo_size_incr; m_fifo.resize (nbanks); - + if (interleave_p){ // configure as interleaver for (int i = 0; i < nbanks; i++) m_fifo[i] = new interleaver_fifo<symbol_type>(i * fifo_size_incr); diff --git a/gr-atsc/src/lib/create_atsci_equalizer.cc b/gr-atsc/src/lib/create_atsci_equalizer.cc index bc4eecfb30..f784116d29 100644 --- a/gr-atsc/src/lib/create_atsci_equalizer.cc +++ b/gr-atsc/src/lib/create_atsci_equalizer.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/create_atsci_equalizer.h b/gr-atsc/src/lib/create_atsci_equalizer.h index fd26237d88..b291e0bbdf 100644 --- a/gr-atsc/src/lib/create_atsci_equalizer.h +++ b/gr-atsc/src/lib/create_atsci_equalizer.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/create_atsci_fs_checker.cc b/gr-atsc/src/lib/create_atsci_fs_checker.cc index 107e35ce7f..5b9a4092c4 100644 --- a/gr-atsc/src/lib/create_atsci_fs_checker.cc +++ b/gr-atsc/src/lib/create_atsci_fs_checker.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/create_atsci_fs_checker.h b/gr-atsc/src/lib/create_atsci_fs_checker.h index 23451757ab..42119a6d49 100644 --- a/gr-atsc/src/lib/create_atsci_fs_checker.h +++ b/gr-atsc/src/lib/create_atsci_fs_checker.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/create_atsci_fs_correlator.cc b/gr-atsc/src/lib/create_atsci_fs_correlator.cc index 6f65a7e7dc..414b2d7f43 100644 --- a/gr-atsc/src/lib/create_atsci_fs_correlator.cc +++ b/gr-atsc/src/lib/create_atsci_fs_correlator.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/create_atsci_fs_correlator.h b/gr-atsc/src/lib/create_atsci_fs_correlator.h index 7b663fd565..b9b037403a 100644 --- a/gr-atsc/src/lib/create_atsci_fs_correlator.h +++ b/gr-atsc/src/lib/create_atsci_fs_correlator.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/fpll_btloop_coupling.h b/gr-atsc/src/lib/fpll_btloop_coupling.h index e17425d04a..9a1a99d86d 100644 --- a/gr-atsc/src/lib/fpll_btloop_coupling.h +++ b/gr-atsc/src/lib/fpll_btloop_coupling.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/gen_encoder.py b/gr-atsc/src/lib/gen_encoder.py index 4356cdc6ac..6c8fabf7ad 100755 --- a/gr-atsc/src/lib/gen_encoder.py +++ b/gr-atsc/src/lib/gen_encoder.py @@ -1,24 +1,24 @@ #!/usr/bin/python # # Copyright 2002 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -# +# def output(input, state): x2 = (input >> 1) & 0x1 @@ -43,7 +43,7 @@ def next_state(input, state): s1 = x2 ^ s0 t1 = u0 u1 = t0 ^ x1 - + return (s1 << 2) | (t1 << 1) | u1 print "@@@ NEXT @@@" @@ -60,4 +60,4 @@ for i in range (32): state = (i >> 2) & 0x7 input = i & 0x3 print output (input, state) - + diff --git a/gr-atsc/src/lib/interleaver_fifo.h b/gr-atsc/src/lib/interleaver_fifo.h index 6d1a445806..cacac85a39 100644 --- a/gr-atsc/src/lib/interleaver_fifo.h +++ b/gr-atsc/src/lib/interleaver_fifo.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -40,7 +40,7 @@ class interleaver_fifo { //! reset interleaver (flushes contents and resets commutator) void reset (); - + //! stuff a symbol into the fifo and return the oldest symbol_type stuff (symbol_type input){ if (m_size == 0) diff --git a/gr-atsc/src/lib/plinfo.cc b/gr-atsc/src/lib/plinfo.cc index 905037b4b4..30e192907a 100644 --- a/gr-atsc/src/lib/plinfo.cc +++ b/gr-atsc/src/lib/plinfo.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002,2006 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -28,7 +28,7 @@ plinfo::delay (plinfo &out, const plinfo &in, int nsegs_of_delay) { assert (in.regular_seg_p ()); assert (nsegs_of_delay >= 0); - + int s = in.segno (); if (in.in_field2_p ()) s += ATSC_DSEGS_PER_FIELD; diff --git a/gr-atsc/src/lib/qa_atsci.cc b/gr-atsc/src/lib/qa_atsci.cc index 262b528417..8dc940bcb1 100644 --- a/gr-atsc/src/lib/qa_atsci.cc +++ b/gr-atsc/src/lib/qa_atsci.cc @@ -1,18 +1,18 @@ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -58,6 +58,6 @@ qa_atsc::suite () s->addTest (qa_atsci_viterbi_decoder::suite ()); s->addTest (qa_atsci_fs_correlator::suite ()); s->addTest (qa_atsci_equalizer_nop::suite ()); - + return s; } diff --git a/gr-atsc/src/lib/qa_atsci.h b/gr-atsc/src/lib/qa_atsci.h index abf3aab58a..86aca2d32b 100644 --- a/gr-atsc/src/lib/qa_atsci.h +++ b/gr-atsc/src/lib/qa_atsci.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.cc b/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.cc index c7ed016d46..4a8137424c 100644 --- a/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.cc +++ b/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.h b/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.h index 1ac4867ba5..e413d0d3d3 100644 --- a/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.h +++ b/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/qa_atsci_data_interleaver.cc b/gr-atsc/src/lib/qa_atsci_data_interleaver.cc index e76a2f1f50..6069e86808 100644 --- a/gr-atsc/src/lib/qa_atsci_data_interleaver.cc +++ b/gr-atsc/src/lib/qa_atsci_data_interleaver.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -62,7 +62,7 @@ qa_atsci_data_interleaver::print_packet (FILE *fp, for (int i = 0; i < 8; i++) fprintf (fp, "%02X", p[i]); - + fprintf (fp, " ... "); p = &in.data[191]; for (int i = 0; i < 8; i++) @@ -102,7 +102,7 @@ qa_atsci_data_interleaver::t0 () atsc_mpeg_packet_rs_encoded zero; memset (&zero, 0, sizeof (zero)); - + for (int frame = 0; frame < 4; frame++){ for (int field = 0; field < 2; field++){ for (int segment = 0; segment < 312; segment++, counter++){ @@ -149,9 +149,9 @@ qa_atsci_data_interleaver::t1 () atsc_mpeg_packet_rs_encoded zero; memset (&zero, 0, sizeof (zero)); - + static const int NCRAP = 13; - + // push NCRAP segments of crap into the interleaver, // but don't change the deinterleaver state @@ -164,7 +164,7 @@ qa_atsci_data_interleaver::t1 () // now run the normal test. // we should get good segments after NCRAP + 52 - + int starting_counter = 3141; counter = starting_counter; diff --git a/gr-atsc/src/lib/qa_atsci_data_interleaver.h b/gr-atsc/src/lib/qa_atsci_data_interleaver.h index c5088bb5a9..6b9408c9a4 100644 --- a/gr-atsc/src/lib/qa_atsci_data_interleaver.h +++ b/gr-atsc/src/lib/qa_atsci_data_interleaver.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -45,7 +45,7 @@ class qa_atsci_data_interleaver : public CppUnit::TestCase { private: atsci_data_interleaver outbound; atsci_data_deinterleaver inbound; - + void t0 (); void t1 (); diff --git a/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc b/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc index 85584f55f0..7039eeb8ea 100644 --- a/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc +++ b/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -83,7 +83,7 @@ init_field_sync_tags (atsc::syminfo *tags, int fieldnum) static void init_field_sync_common (float *p, int mask) - + { int i = 0; @@ -100,7 +100,7 @@ init_field_sync_common (float *p, int mask) for (int j = 0; j < 63; j++) // PN63, toggled on field 2 p[i++] = bin_map (atsc_pn63[j] ^ mask); - + for (int j = 0; j < 63; j++) // PN63 p[i++] = bin_map (atsc_pn63[j]); diff --git a/gr-atsc/src/lib/qa_atsci_equalizer_nop.h b/gr-atsc/src/lib/qa_atsci_equalizer_nop.h index a0d23da08f..244daf8b3f 100644 --- a/gr-atsc/src/lib/qa_atsci_equalizer_nop.h +++ b/gr-atsc/src/lib/qa_atsci_equalizer_nop.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc index 1f5ba6b591..2cc646dafd 100644 --- a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc +++ b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -39,7 +39,7 @@ static const int NN = 200; static const int MAXDIBIT = 3; void -qa_atsci_fake_single_viterbi::encode_block (unsigned char *out, unsigned char *in, +qa_atsci_fake_single_viterbi::encode_block (unsigned char *out, unsigned char *in, unsigned int n) { for (unsigned int i = 0; i < n; i++) { @@ -49,7 +49,7 @@ qa_atsci_fake_single_viterbi::encode_block (unsigned char *out, unsigned char *i void -qa_atsci_fake_single_viterbi::decode_block (unsigned char *out, unsigned char *in, +qa_atsci_fake_single_viterbi::decode_block (unsigned char *out, unsigned char *in, unsigned int n) { for (unsigned int i = 0; i < n; i++) { @@ -79,9 +79,9 @@ qa_atsci_fake_single_viterbi::t0 () int i; // printf (" Delay is %d.\n", delay); - + srandom (27); // reproducable sequence of "random" values - + for (int nt = 0; nt < NTRIALS; nt++){ // load block with random data and encode diff --git a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.h b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.h index 60a8d964e0..47805952c9 100644 --- a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.h +++ b/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -33,7 +33,7 @@ class qa_atsci_fake_single_viterbi : public CppUnit::TestCase { private: atsci_fake_single_viterbi decoder; atsci_basic_trellis_encoder encoder; - + CPPUNIT_TEST_SUITE (qa_atsci_fake_single_viterbi); CPPUNIT_TEST (t0); CPPUNIT_TEST_SUITE_END (); diff --git a/gr-atsc/src/lib/qa_atsci_fs_correlator.cc b/gr-atsc/src/lib/qa_atsci_fs_correlator.cc index ebfc564de5..591c840502 100644 --- a/gr-atsc/src/lib/qa_atsci_fs_correlator.cc +++ b/gr-atsc/src/lib/qa_atsci_fs_correlator.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -52,7 +52,7 @@ bin_map (int bit) static void init_field_sync_common (float *p, int mask) - + { int i = 0; @@ -69,7 +69,7 @@ init_field_sync_common (float *p, int mask) for (int j = 0; j < 63; j++) // PN63, toggled on field 2 p[i++] = bin_map(atsc_pn63[j] ^ mask); - + for (int j = 0; j < 63; j++) // PN63 p[i++] = bin_map(atsc_pn63[j]); @@ -191,9 +191,9 @@ qa_atsci_fs_correlator::util (int which_field, int nerrs1, int nerrs2) float input[ISIZE]; fsc->reset (); // known starting conditions - + // build input - + for (i = 0; i < PAD; i++) input[i] = uniform () * 7; @@ -205,7 +205,7 @@ qa_atsci_fs_correlator::util (int which_field, int nerrs1, int nerrs2) input[i] = uniform () * 7; // run the input and check - + for (i = 0; i < ISIZE; i++){ fsc->filter (input[i], &output_sample, &output_tag); if (i == delay + PAD){ // should be field sync diff --git a/gr-atsc/src/lib/qa_atsci_fs_correlator.h b/gr-atsc/src/lib/qa_atsci_fs_correlator.h index 9d984d94f6..4785f096ec 100644 --- a/gr-atsc/src/lib/qa_atsci_fs_correlator.h +++ b/gr-atsc/src/lib/qa_atsci_fs_correlator.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -30,7 +30,7 @@ class atsci_fs_correlator; class qa_atsci_fs_correlator : public CppUnit::TestCase { private: atsci_fs_correlator *fsc; - + public: void setUp (); @@ -47,7 +47,7 @@ private: private: void util (int which_field, int nerr1, int nerr2); - + void t0 (); void t1 (); void t2 (); diff --git a/gr-atsc/src/lib/qa_atsci_randomizer.cc b/gr-atsc/src/lib/qa_atsci_randomizer.cc index b2d0bde8ab..c12582dfd0 100644 --- a/gr-atsc/src/lib/qa_atsci_randomizer.cc +++ b/gr-atsc/src/lib/qa_atsci_randomizer.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -93,7 +93,7 @@ qa_atsci_randomizer::t3_reset () } randomizer.reset (); // reset LFSR - + // and now should repeat expected values for (unsigned int i = 0; i < NELEMENTS (expected_initial_values); i++){ @@ -110,7 +110,7 @@ qa_atsci_randomizer::t4_high_level () atsc_mpeg_packet in[N]; atsc_mpeg_packet_no_sync middle[N]; atsc_mpeg_packet out[N]; - + memset (in, 0, sizeof (in)); memset (middle, 0, sizeof (middle)); memset (out, 0, sizeof (out)); diff --git a/gr-atsc/src/lib/qa_atsci_randomizer.h b/gr-atsc/src/lib/qa_atsci_randomizer.h index f1b1a1b26b..16d12754ff 100644 --- a/gr-atsc/src/lib/qa_atsci_randomizer.h +++ b/gr-atsc/src/lib/qa_atsci_randomizer.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -30,7 +30,7 @@ class qa_atsci_randomizer : public CppUnit::TestCase { private: atsci_randomizer randomizer; - + public: void setUp (){ @@ -56,7 +56,7 @@ class qa_atsci_randomizer : public CppUnit::TestCase { void t2_initial_values (); void t3_reset (); void t4_high_level (); - + }; #endif /* _QA_ATSC_RANDOMIZER_H_ */ diff --git a/gr-atsc/src/lib/qa_atsci_reed_solomon.cc b/gr-atsc/src/lib/qa_atsci_reed_solomon.cc index b08c8af52a..81766f856a 100644 --- a/gr-atsc/src/lib/qa_atsci_reed_solomon.cc +++ b/gr-atsc/src/lib/qa_atsci_reed_solomon.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/qa_atsci_reed_solomon.h b/gr-atsc/src/lib/qa_atsci_reed_solomon.h index 22f1743de8..95d642e72d 100644 --- a/gr-atsc/src/lib/qa_atsci_reed_solomon.h +++ b/gr-atsc/src/lib/qa_atsci_reed_solomon.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc index 95e595026b..ca0cf74647 100644 --- a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc +++ b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -40,7 +40,7 @@ static const int NN = 200; static const int MAXDIBIT = 3; void -qa_atsci_single_viterbi::encode_block (unsigned char *out, unsigned char *in, +qa_atsci_single_viterbi::encode_block (unsigned char *out, unsigned char *in, unsigned int n) { for (unsigned int i = 0; i < n; i++) { @@ -50,7 +50,7 @@ qa_atsci_single_viterbi::encode_block (unsigned char *out, unsigned char *in, void -qa_atsci_single_viterbi::decode_block (unsigned char *out, unsigned char *in, +qa_atsci_single_viterbi::decode_block (unsigned char *out, unsigned char *in, unsigned int n, float noise_factor) { for (unsigned int i = 0; i < n; i++) { @@ -76,9 +76,9 @@ qa_atsci_single_viterbi::t0 () int i; // printf (" Delay is %d.\n", delay); - + srandom (27); // reproducable sequence of "random" values - + for (int nt = 0; nt < NTRIALS; nt++){ // load block with random data and encode @@ -154,9 +154,9 @@ qa_atsci_single_viterbi::t1 () int i; // printf (" Delay is %d.\n", delay); - + srandom (1); // reproducable sequence of "random" values - + for (int nt = 0; nt < NTRIALS; nt++){ // test up to the error correction capacity of the code @@ -180,7 +180,7 @@ qa_atsci_single_viterbi::t1 () // If we munge any or all of the three bits of the symbol, // our decoder frequently gets the wrong data even with a single // error. - // + // // Let's see what it can do with just the two low-order bits. // // ALSO: Don't let any error be within 12 spots of another @@ -198,7 +198,7 @@ qa_atsci_single_viterbi::t1 () // Don't insert errors in the first delay slot, since we // don't have valid history to correct them. Also, don't // insert burst errors (adjacent errors), or errors within 2, - // since we can't reliably correct them. Also we must not choose + // since we can't reliably correct them. Also we must not choose // the same location twice when inserting an error. do { diff --git a/gr-atsc/src/lib/qa_atsci_single_viterbi.h b/gr-atsc/src/lib/qa_atsci_single_viterbi.h index 057c29e8e6..07585de22a 100644 --- a/gr-atsc/src/lib/qa_atsci_single_viterbi.h +++ b/gr-atsc/src/lib/qa_atsci_single_viterbi.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -33,7 +33,7 @@ class qa_atsci_single_viterbi : public CppUnit::TestCase { private: atsci_single_viterbi decoder; atsci_basic_trellis_encoder encoder; - + CPPUNIT_TEST_SUITE (qa_atsci_single_viterbi); CPPUNIT_TEST (t0); CPPUNIT_TEST (t1); diff --git a/gr-atsc/src/lib/qa_atsci_sliding_correlator.cc b/gr-atsc/src/lib/qa_atsci_sliding_correlator.cc index 0c5d98701b..4b215ba855 100644 --- a/gr-atsc/src/lib/qa_atsci_sliding_correlator.cc +++ b/gr-atsc/src/lib/qa_atsci_sliding_correlator.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/lib/qa_atsci_sliding_correlator.h b/gr-atsc/src/lib/qa_atsci_sliding_correlator.h index 6e74173260..bdcd09319a 100644 --- a/gr-atsc/src/lib/qa_atsci_sliding_correlator.h +++ b/gr-atsc/src/lib/qa_atsci_sliding_correlator.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -33,7 +33,7 @@ class qa_atsci_sliding_correlator : public CppUnit::TestCase { public: - void setUp (void) + void setUp (void) { corr.reset (); } @@ -44,7 +44,7 @@ class qa_atsci_sliding_correlator : public CppUnit::TestCase { private: atsci_sliding_correlator corr; - + void t0 (); }; diff --git a/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc b/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc index 390776e823..d3a3482f0a 100644 --- a/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc +++ b/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -45,7 +45,7 @@ qa_atsci_trellis_encoder::t0 () atsc_mpeg_packet_rs_encoded in[NCODERS]; atsc_data_segment out[NCODERS]; - + memset (in, 0, sizeof (in)); memset (out, 0, sizeof (out)); @@ -59,7 +59,7 @@ qa_atsci_trellis_encoder::t0 () printf ("%d\n", t); } } - + enc.reset (); enc.encode (out, in); diff --git a/gr-atsc/src/lib/qa_atsci_trellis_encoder.h b/gr-atsc/src/lib/qa_atsci_trellis_encoder.h index 42b33239d7..fcd1143305 100644 --- a/gr-atsc/src/lib/qa_atsci_trellis_encoder.h +++ b/gr-atsc/src/lib/qa_atsci_trellis_encoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -33,7 +33,7 @@ class qa_atsci_trellis_encoder : public CppUnit::TestCase { public: - void setUp (void) + void setUp (void) { enc.reset (); } @@ -45,7 +45,7 @@ class qa_atsci_trellis_encoder : public CppUnit::TestCase { private: atsci_trellis_encoder enc; - + void t0 (); void t1 (); }; diff --git a/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc b/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc index 4632ec40a8..8902b6eb8a 100644 --- a/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc +++ b/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -75,7 +75,7 @@ qa_atsci_viterbi_decoder::t0 () atsc_mpeg_packet_rs_encoded decoder_out[NCODERS]; atsc_mpeg_packet_rs_encoded decoder_out_pad[NCODERS]; - + memset (encoder_in, 0, sizeof (encoder_in)); memset (encoder_out, 0, sizeof (encoder_out)); memset (decoder_out_pad, 0, sizeof (decoder_out_pad)); @@ -88,7 +88,7 @@ qa_atsci_viterbi_decoder::t0 () encoder_in[i].data[j] = t; } } - + fflush (stdout); printf ("@@@ ENCODER INPUT @@@\n"); for (int i = 0; i < NCODERS; i++){ @@ -113,7 +113,7 @@ qa_atsci_viterbi_decoder::t0 () viterbi.reset (); // this has only the previous (non-existant) output - viterbi.decode (decoder_out_pad, decoder_in); + viterbi.decode (decoder_out_pad, decoder_in); // now we'll see the real output pad_decoder_input (decoder_in_pad); @@ -166,7 +166,7 @@ qa_atsci_viterbi_decoder::t1 () viterbi.reset (); // this has only the previous (non-existant) output - viterbi.decode (decoder_out_pad, decoder_in); + viterbi.decode (decoder_out_pad, decoder_in); // now we'll see the real output pad_decoder_input (decoder_in_pad); diff --git a/gr-atsc/src/lib/qa_atsci_viterbi_decoder.h b/gr-atsc/src/lib/qa_atsci_viterbi_decoder.h index 3e74d2bb6a..440c79caf2 100644 --- a/gr-atsc/src/lib/qa_atsci_viterbi_decoder.h +++ b/gr-atsc/src/lib/qa_atsci_viterbi_decoder.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -33,7 +33,7 @@ class qa_atsci_viterbi_decoder : public CppUnit::TestCase { public: - void setUp (void) + void setUp (void) { viterbi.reset (); } @@ -45,7 +45,7 @@ class qa_atsci_viterbi_decoder : public CppUnit::TestCase { private: atsci_viterbi_decoder viterbi; - + void t0 (); void t1 (); }; diff --git a/gr-atsc/src/lib/qa_convolutional_interleaver.cc b/gr-atsc/src/lib/qa_convolutional_interleaver.cc index fff6e61c95..bfe86f0eaa 100644 --- a/gr-atsc/src/lib/qa_convolutional_interleaver.cc +++ b/gr-atsc/src/lib/qa_convolutional_interleaver.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -79,7 +79,7 @@ qa_convolutional_interleaver::t2 () int icount = 6000; int dcount = 6000; - + int end_to_end_delay = intl->end_to_end_delay (); for (int i = 0; i < end_to_end_delay; i++){ CPPUNIT_ASSERT_EQUAL (0, deintl->transform (intl->transform (icount++))); @@ -98,7 +98,7 @@ qa_convolutional_interleaver::t3 () int icount = 6000; int dcount = 6000; - + int end_to_end_delay = intl->end_to_end_delay (); for (int i = 0; i < end_to_end_delay; i++){ CPPUNIT_ASSERT_EQUAL (0, deintl->transform (intl->transform (icount++))); @@ -117,10 +117,10 @@ qa_convolutional_interleaver::t4 () int icount = 6000; int dcount = 6000; - + int end_to_end_delay = intl->end_to_end_delay (); CPPUNIT_ASSERT_EQUAL (10608, end_to_end_delay); - + for (int i = 0; i < end_to_end_delay; i++){ CPPUNIT_ASSERT_EQUAL (0, deintl->transform (intl->transform (icount++))); } diff --git a/gr-atsc/src/lib/qa_convolutional_interleaver.h b/gr-atsc/src/lib/qa_convolutional_interleaver.h index 3f96065e00..b60181d732 100644 --- a/gr-atsc/src/lib/qa_convolutional_interleaver.h +++ b/gr-atsc/src/lib/qa_convolutional_interleaver.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -32,7 +32,7 @@ class qa_convolutional_interleaver : public CppUnit::TestCase { private: convolutional_interleaver<int> *intl; convolutional_interleaver<int> *deintl; - + CPPUNIT_TEST_SUITE (qa_convolutional_interleaver); CPPUNIT_TEST (t0); CPPUNIT_TEST (t1); diff --git a/gr-atsc/src/lib/qa_interleaver_fifo.cc b/gr-atsc/src/lib/qa_interleaver_fifo.cc index 3c3aad43c4..a9de97ff39 100644 --- a/gr-atsc/src/lib/qa_interleaver_fifo.cc +++ b/gr-atsc/src/lib/qa_interleaver_fifo.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -38,7 +38,7 @@ qa_interleaver_fifo::t1 () fifo = new interleaver_fifo<int>(1); CPPUNIT_ASSERT_EQUAL (0, fifo->stuff (2)); - + for (int i = 1; i < 10; i++) CPPUNIT_ASSERT_EQUAL (i * 2, fifo->stuff ((i + 1) * 2)); } diff --git a/gr-atsc/src/lib/qa_interleaver_fifo.h b/gr-atsc/src/lib/qa_interleaver_fifo.h index bd29baaed6..9783548ca6 100644 --- a/gr-atsc/src/lib/qa_interleaver_fifo.h +++ b/gr-atsc/src/lib/qa_interleaver_fifo.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -31,7 +31,7 @@ class qa_interleaver_fifo : public CppUnit::TestCase { private: interleaver_fifo<int> *fifo; - + public: void tearDown (){ diff --git a/gr-atsc/src/lib/test_atsci.cc b/gr-atsc/src/lib/test_atsci.cc index 031ca42ae4..bf0a7eafca 100644 --- a/gr-atsc/src/lib/test_atsci.cc +++ b/gr-atsc/src/lib/test_atsci.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2002,2006,2010,2011 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -25,7 +25,7 @@ #include <cppunit/XmlOutputter.h> #include <qa_atsci.h> -int +int main (int argc, char **argv) { CppUnit::TextTestRunner runner; @@ -34,7 +34,7 @@ main (int argc, char **argv) runner.addTest (qa_atsc::suite ()); runner.setOutputter(xmlout); - + bool was_successful = runner.run ("", false); return was_successful ? 0 : 1; diff --git a/gr-atsc/src/python/CMakeLists.txt b/gr-atsc/src/python/CMakeLists.txt index 4c2442ba0b..d38d6d8038 100644 --- a/gr-atsc/src/python/CMakeLists.txt +++ b/gr-atsc/src/python/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright 2011-2012 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-atsc/src/python/README b/gr-atsc/src/python/README index 6c23b46fd0..74d6ba134c 100644 --- a/gr-atsc/src/python/README +++ b/gr-atsc/src/python/README @@ -7,7 +7,7 @@ station frequency from the fcc video database, and sample rate to 6.4e6. 2) Capture data - adjust gain (-g) frequency (-f) and which side the tvrx is on to fit your local setup: -uhd_rx_cfile.py -s --samp-rate=6.4e6 -g 65 -f 503e6 atsc_data_6-4m_complex +uhd_rx_cfile.py -s --samp-rate=6.4e6 -g 65 -f 503e6 atsc_data_6-4m_complex You probably still need fast disks to take the data, like a raid-0 set of striped sata drives. Make sure there are no or very few Ou overruns. Saving diff --git a/gr-atsc/src/python/atsc_utils.py b/gr-atsc/src/python/atsc_utils.py index 1e74d22ed5..fced6d1902 100644 --- a/gr-atsc/src/python/atsc_utils.py +++ b/gr-atsc/src/python/atsc_utils.py @@ -1,23 +1,23 @@ # # Copyright 2006 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -# +# import random import sys @@ -42,7 +42,7 @@ def make_fake_transport_stream_packet(npkts): for n in range(186): r[i + n] = random.randint(0, 255) i = i + 186 - + return r diff --git a/gr-atsc/src/python/btl-fsd.py b/gr-atsc/src/python/btl-fsd.py index 37f3f9806d..826e71016c 100755 --- a/gr-atsc/src/python/btl-fsd.py +++ b/gr-atsc/src/python/btl-fsd.py @@ -1,24 +1,24 @@ #!/usr/bin/env python # # Copyright 2004,2005,2007 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -# +# from gnuradio import gr from gnuradio import atsc diff --git a/gr-atsc/src/python/fpll.py b/gr-atsc/src/python/fpll.py index 24bc7277f0..aed975557a 100755 --- a/gr-atsc/src/python/fpll.py +++ b/gr-atsc/src/python/fpll.py @@ -1,24 +1,24 @@ #!/usr/bin/env python # # Copyright 2004,2005 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -# +# from gnuradio import gr, atsc import math, os @@ -36,7 +36,7 @@ def main(): # 1/2 as wide because we're designing lp filter - symbol_rate = atsc.ATSC_SYMBOL_RATE/2. + symbol_rate = atsc.ATSC_SYMBOL_RATE/2. NTAPS = 279 tt = gr.firdes.root_raised_cosine (1.0, input_rate, symbol_rate, .115, NTAPS) # heterodyne the low pass coefficients up to the specified bandpass diff --git a/gr-atsc/src/python/interp.py b/gr-atsc/src/python/interp.py index b17b3a3122..8a3cc8d4c5 100755 --- a/gr-atsc/src/python/interp.py +++ b/gr-atsc/src/python/interp.py @@ -1,31 +1,31 @@ #!/usr/bin/env /usr/bin/python # # Copyright 2004,2007 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -# +# # This module starts the atsc processing chain taking the captured # off-air signal created with: # # uhd_rx_cfile.py --samp-rate=6.4e6 # -f <center of tv signal channel freq> # -g <appropriate gain for best signal / noise> -# +# # All this module does is multiply the sample rate by 3, from 6.4e6 to # 19.2e6 complex samples / sec, then lowpass filter with a cutoff of 3.2MHz # and a transition band width of .5MHz. Center of the tv channels is diff --git a/gr-atsc/src/python/interp_short.py b/gr-atsc/src/python/interp_short.py index 732ca831d5..c5ea337f9a 100755 --- a/gr-atsc/src/python/interp_short.py +++ b/gr-atsc/src/python/interp_short.py @@ -1,24 +1,24 @@ #!/usr/bin/env /usr/bin/python # # Copyright 2004 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -# +# # This module starts the atsc processing chain taking the captured # off-air signal created with: # diff --git a/gr-atsc/src/python/qa_atsc.py b/gr-atsc/src/python/qa_atsc.py index 63621bd908..c6b8d2e957 100755 --- a/gr-atsc/src/python/qa_atsc.py +++ b/gr-atsc/src/python/qa_atsc.py @@ -1,24 +1,24 @@ #!/usr/bin/env python # # Copyright 2004,2006,2007 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -# +# from gnuradio import gr, gr_unittest import atsc # qa code needs to run without being installed @@ -44,7 +44,7 @@ class memoize(object): """ Make a fake transport stream that's big enough for our purposes. We generate 8 full fields. This is relatively expensive. It -takes about 2 seconds to execute. +takes about 2 seconds to execute. """ make_transport_stream = \ memoize(lambda : tuple(make_fake_transport_stream_packet(8 * atsc.ATSC_DSEGS_PER_FIELD))) @@ -75,11 +75,11 @@ class vector_source_ts(gr.hier_block2): def __init__(self, ts): """ Pad tranport stream packets to 256 bytes and reformat appropriately. - + @param ts: MPEG transport stream. @type ts: sequence of ints in [0,255]; len(ts) % 188 == 0 """ - + src = gr.vector_source_b(pad_transport_stream(ts)) s2v = gr.stream_to_vector(gr.sizeof_char, atsc.sizeof_atsc_mpeg_packet) @@ -163,7 +163,7 @@ class qa_atsc(gr_unittest.TestCase): def test_loopback_002(self): """ Loopback randomizer/rs_encoder/interleaver to - deinterleaver/rs_decoder/derandomizer + deinterleaver/rs_decoder/derandomizer """ src_data = make_transport_stream() interleaver_delay = 52 @@ -188,7 +188,7 @@ class qa_atsc(gr_unittest.TestCase): """ Loopback randomizer/rs_encoder/interleaver/trellis_encoder via ds_to_softds to - viterbi_decoder/deinterleaver/rs_decoder/derandomizer + viterbi_decoder/deinterleaver/rs_decoder/derandomizer """ src_data = make_transport_stream() interleaver_delay = 52 @@ -211,7 +211,7 @@ class qa_atsc(gr_unittest.TestCase): result_data = dst.data ()[((interleaver_delay+viterbi_delay)*atsc.ATSC_MPEG_PKT_LENGTH):len(dst.data())] self.assertEqual (expected_result, result_data) - + if __name__ == '__main__': gr_unittest.main() diff --git a/gr-atsc/src/python/viterbi-out.py b/gr-atsc/src/python/viterbi-out.py index eedbaa5d64..67edd99b25 100755 --- a/gr-atsc/src/python/viterbi-out.py +++ b/gr-atsc/src/python/viterbi-out.py @@ -1,24 +1,24 @@ #!/usr/bin/env python # # Copyright 2004,2006,2007 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -# +# from gnuradio import gr, atsc import sys, os @@ -46,7 +46,7 @@ def main(args): tb.connect(src, viterbi, deinter, rs_dec, derand, depad, dst) tb.run () - + if __name__ == '__main__': main(sys.argv[1:]) diff --git a/gr-atsc/src/python/xlate.py b/gr-atsc/src/python/xlate.py index e37af9a227..68e280a8ce 100755 --- a/gr-atsc/src/python/xlate.py +++ b/gr-atsc/src/python/xlate.py @@ -1,24 +1,24 @@ #!/usr/bin/env /usr/bin/python # # Copyright 2004,2007 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -# +# # This module upconverts the 19.2e6 sample rate signal from a center # of 0 to 5.75e6 and converts to float, to prepare the signal for # the old gnuradio 0.9 block (bit timing loop, field sync checker, |