diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 10:19:13 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 10:19:13 -0700 |
| commit | 09d8b895447b1507b80a27053b51361ea1684175 (patch) | |
| tree | 93edf8d2ebedb3ffcf02edd79b16516c6333f0fb /gr-dtv/lib/dvb/dvb_bbheader_bb_impl.h | |
| parent | 090103c760a308101e2cbf3630f6bf46a2bb4d8e (diff) | |
| parent | 7a1403796abd4f9df1483482ce06b169a3212be8 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-atsc/lib/qa_atsci_fake_single_viterbi.cc
gr-atsc/lib/qa_atsci_single_viterbi.cc
Diffstat (limited to 'gr-dtv/lib/dvb/dvb_bbheader_bb_impl.h')
| -rw-r--r-- | gr-dtv/lib/dvb/dvb_bbheader_bb_impl.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.h b/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.h index 97e0751757..76f3369922 100644 --- a/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.h +++ b/gr-dtv/lib/dvb/dvb_bbheader_bb_impl.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2015 Free Software Foundation, Inc. + * Copyright 2015,2016 Free Software Foundation, Inc. * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -53,15 +53,18 @@ namespace gr { unsigned char crc; unsigned int input_mode; unsigned int extra; + unsigned int frame_size; + unsigned char bsave; int inband_type_b; int fec_blocks; int fec_block; int ts_rate; bool dvbs2x; bool alternate; + bool nibble; FrameFormat m_format[1]; unsigned char crc_tab[256]; - void add_bbheader(unsigned char *, int, int); + void add_bbheader(unsigned char *, int, int, bool); void build_crc8_table(void); int add_crc8_bits(unsigned char *, int); void add_inband_type_b(unsigned char *, int); |