diff options
| author | Martin Braun <martin.braun@ettus.com> | 2020-01-09 12:34:08 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2020-01-10 19:21:38 -0800 |
| commit | e0598e54b7202dfc0f37b402a2997e650c52b316 (patch) | |
| tree | 3de3104b057a0173881ec00333180bd1427e9214 /gr-dtv | |
| parent | 4fd06de424850a0b70f6e8e959edcda9fe01f060 (diff) | |
Fix all formatting issues
This fixes every leftover file in the GNU Radio source tree to match our
clang-format definition.
Diffstat (limited to 'gr-dtv')
| -rw-r--r-- | gr-dtv/include/gnuradio/dtv/atsc_consts.h | 5 | ||||
| -rw-r--r-- | gr-dtv/lib/atsc/atsc_equalizer_impl.h | 3 | ||||
| -rw-r--r-- | gr-dtv/lib/atsc/atsc_fs_checker_impl.h | 8 | ||||
| -rw-r--r-- | gr-dtv/lib/atsc/atsc_pnXXX_impl.h | 6 |
4 files changed, 12 insertions, 10 deletions
diff --git a/gr-dtv/include/gnuradio/dtv/atsc_consts.h b/gr-dtv/include/gnuradio/dtv/atsc_consts.h index e5d6450d1c..0dcf700201 100644 --- a/gr-dtv/include/gnuradio/dtv/atsc_consts.h +++ b/gr-dtv/include/gnuradio/dtv/atsc_consts.h @@ -38,8 +38,9 @@ static constexpr int MPEG_TRANSPORT_ERROR_BIT = 0x80; // top bit of byte after S // ATSC specific constants static constexpr double ATSC_SYMBOL_RATE = 4.5e6 / 286 * 684; // ~10.76 MHz static constexpr double ATSC_DATA_SEGMENT_RATE = ATSC_SYMBOL_RATE / 832; // ~12.935 kHz -static constexpr int ATSC_DATA_SEGMENT_LENGTH = 832; // includes 4 sync symbols at beginning -static constexpr int ATSC_DSEGS_PER_FIELD = 312; // regular data segs / field +static constexpr int ATSC_DATA_SEGMENT_LENGTH = + 832; // includes 4 sync symbols at beginning +static constexpr int ATSC_DSEGS_PER_FIELD = 312; // regular data segs / field } /* namespace dtv */ } /* namespace gr */ diff --git a/gr-dtv/lib/atsc/atsc_equalizer_impl.h b/gr-dtv/lib/atsc/atsc_equalizer_impl.h index 787a93b6da..44db09e101 100644 --- a/gr-dtv/lib/atsc/atsc_equalizer_impl.h +++ b/gr-dtv/lib/atsc/atsc_equalizer_impl.h @@ -34,7 +34,8 @@ class atsc_equalizer_impl : public atsc_equalizer { private: static constexpr int NTAPS = 64; - static constexpr int NPRETAPS = (int)(NTAPS * 0.8); // probably should be either .2 or .8 + static constexpr int NPRETAPS = + (int)(NTAPS * 0.8); // probably should be either .2 or .8 // the length of the field sync pattern that we know unequivocally static constexpr int KNOWN_FIELD_SYNC_LENGTH = 4 + 511 + 3 * 63; diff --git a/gr-dtv/lib/atsc/atsc_fs_checker_impl.h b/gr-dtv/lib/atsc/atsc_fs_checker_impl.h index b14cba00e5..553f465ad2 100644 --- a/gr-dtv/lib/atsc/atsc_fs_checker_impl.h +++ b/gr-dtv/lib/atsc/atsc_fs_checker_impl.h @@ -33,10 +33,10 @@ class atsc_fs_checker_impl : public atsc_fs_checker { private: static constexpr int SRSIZE = 1024; // must be power of two - int d_index; // points at oldest sample - float d_sample_sr[SRSIZE]; // sample shift register - atsc::syminfo d_tag_sr[SRSIZE]; // tag shift register - unsigned char d_bit_sr[SRSIZE]; // binary decision shift register + int d_index; // points at oldest sample + float d_sample_sr[SRSIZE]; // sample shift register + atsc::syminfo d_tag_sr[SRSIZE]; // tag shift register + unsigned char d_bit_sr[SRSIZE]; // binary decision shift register int d_field_num; int d_segment_num; diff --git a/gr-dtv/lib/atsc/atsc_pnXXX_impl.h b/gr-dtv/lib/atsc/atsc_pnXXX_impl.h index 7f25b7c0b5..c08a5fc4a9 100644 --- a/gr-dtv/lib/atsc/atsc_pnXXX_impl.h +++ b/gr-dtv/lib/atsc/atsc_pnXXX_impl.h @@ -60,8 +60,8 @@ constexpr unsigned char atsc_pn511[511] = { }; constexpr unsigned char atsc_pn63[63] = { 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1, 1, - 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, - 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, - 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0 }; + 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, + 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, + 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0 }; #endif /* INCLUDED_DTV_ATSC_PNXXX_H */ |