diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-06-27 13:29:52 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-06-27 13:29:52 -0700 |
| commit | d2f4ce96bd086ef093b5db7e0606cad79f595e7f (patch) | |
| tree | cc94a19dac9c9da11f357f1bdf786fcf44330045 /gr-dtv | |
| parent | 1e02521a72304f898b3523148f35038f53bbb056 (diff) | |
| parent | 9e011f1d116daaf5abdd8d05a83341390159a21b (diff) | |
Merge branch 'next' into python3
Diffstat (limited to 'gr-dtv')
4 files changed, 11 insertions, 9 deletions
diff --git a/gr-dtv/include/gnuradio/dtv/catv_frame_sync_enc_bb.h b/gr-dtv/include/gnuradio/dtv/catv_frame_sync_enc_bb.h index 99ea428aed..5f75af8c00 100644 --- a/gr-dtv/include/gnuradio/dtv/catv_frame_sync_enc_bb.h +++ b/gr-dtv/include/gnuradio/dtv/catv_frame_sync_enc_bb.h @@ -29,11 +29,11 @@ namespace gr { namespace dtv { /*! - * \brief Frame Sync Encoder. Adds a 42-bit frame sync pattern with control word. + * \brief Frame Sync Encoder. Adds a 42-bit (64QAM) or 40-bit (256QAM) frame sync pattern with control word. * \ingroup dtv * - * Input: Scrambled FEC Frame packets of 60 * 128 7-bit symbols.\n - * Output: Scrambled FEC Frame packets of 60 * 128 7-bit symbols with 42-bit FSYNC word. + * Input: Scrambled FEC Frame packets of 60 * 128 (64QAM) or 88 * 128 (256QAM) 7-bit symbols.\n + * Output: Scrambled FEC Frame packets of 60 * 128 (64QAM) or 88 * 128 (256QAM) 7-bit symbols with 42-bit (64QAM) or 40-bit (256QAM) FSYNC word. */ class DTV_API catv_frame_sync_enc_bb : virtual public gr::block { @@ -43,6 +43,7 @@ namespace gr { /*! * \brief Create an ITU-T J.83B Frame Sync Encoder. * + * \param constellation 64QAM or 256QAM constellation. \n * \param ctrlword convolutional interleaver control word. */ static sptr make(catv_constellation_t constellation, int ctrlword); diff --git a/gr-dtv/include/gnuradio/dtv/catv_randomizer_bb.h b/gr-dtv/include/gnuradio/dtv/catv_randomizer_bb.h index cf9ad39c6d..a088153510 100644 --- a/gr-dtv/include/gnuradio/dtv/catv_randomizer_bb.h +++ b/gr-dtv/include/gnuradio/dtv/catv_randomizer_bb.h @@ -33,7 +33,7 @@ namespace gr { * \ingroup dtv * * Input: Interleaved MPEG-2 + RS parity bitstream packets of 128 7-bit symbols.\n - * Output: Scrambled FEC Frame packets of 60 * 128 7-bit symbols. + * Output: Scrambled FEC Frame packets of 60 * 128 (64QAM) or 88 * 128 (256QAM) 7-bit symbols. */ class DTV_API catv_randomizer_bb : virtual public gr::sync_block { @@ -43,6 +43,7 @@ namespace gr { /*! * \brief Create an ITU-T J.83B randomizer. * + * \param constellation 64QAM or 256QAM constellation. */ static sptr make(catv_constellation_t constellation); }; diff --git a/gr-dtv/include/gnuradio/dtv/catv_trellis_enc_bb.h b/gr-dtv/include/gnuradio/dtv/catv_trellis_enc_bb.h index e048af80ee..3f9d0fc927 100644 --- a/gr-dtv/include/gnuradio/dtv/catv_trellis_enc_bb.h +++ b/gr-dtv/include/gnuradio/dtv/catv_trellis_enc_bb.h @@ -29,11 +29,11 @@ namespace gr { namespace dtv { /*! - * \brief Trellis Encoder. 14/15 code rate. + * \brief Trellis Encoder. 14/15 (64QAM) or 19/20 (256QAM) code rate. * \ingroup dtv * - * Input: Scrambled FEC Frame packets of 60 * 128 7-bit symbols with 42-bit FSYNC word.\n - * Output: Four 7-bit symbols (28 bits) Trellis encoded to 30 bits (14/15 code rate). + * Input: Scrambled FEC Frame packets of 60 * 128 (64QAM) or 88 * 128 (256QAM) 7-bit symbols with 42-bit (64QAM) or 40-bit (256QAM) FSYNC word.\n + * Output: Four 7-bit symbols (28 bits) Trellis encoded to 30 bits (64QAM, 14/15 code rate) or 38 data bits Trellis encoded to 40 bits (256QAM, 19/20 code rate). */ class DTV_API catv_trellis_enc_bb : virtual public gr::block { @@ -43,6 +43,7 @@ namespace gr { /*! * \brief Create an ITU-T J.83B Trellis Encoder. * + * \param constellation 64QAM or 256QAM constellation. */ static sptr make(catv_constellation_t constellation); }; diff --git a/gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc b/gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc index 3dd4881a77..f3b16be580 100644 --- a/gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc +++ b/gr-dtv/lib/catv/catv_frame_sync_enc_bb_impl.cc @@ -112,9 +112,8 @@ namespace gr { for (int n = 6; n >= 0; n--) { out[i++] = b & (1 << n) ? 1 : 0; } - b = 0x00; for (int n = 6; n >= 0; n--) { - out[i++] = b & (1 << n) ? 1 : 0; + out[i++] = 0; } } else { |