[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Wed, 21 Jan 2015 21:18:28 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit e01958524eac3cb69eab5f45a3ab956c0b66af73
Merge: 8d33354 35d62c6
Author: Johnathan Corgan <address@hidden>
Date: Wed Jan 21 13:08:04 2015 -0800
Merge branch 'master' into next
gr-dtv/examples/file_atsc_tx.grc | 984 +++++++++++++++++++++
gr-dtv/grc/CMakeLists.txt | 8 +-
gr-dtv/grc/dtv_atsc_field_sync_mux.xml | 22 +
gr-dtv/grc/dtv_atsc_interleaver.xml | 22 +
gr-dtv/grc/dtv_atsc_pad.xml | 21 +
gr-dtv/grc/dtv_atsc_randomizer.xml | 22 +
gr-dtv/grc/dtv_atsc_rs_encoder.xml | 22 +
gr-dtv/grc/dtv_atsc_trellis_encoder.xml | 22 +
gr-dtv/grc/dtv_block_tree.xml | 8 +-
gr-dtv/include/gnuradio/dtv/CMakeLists.txt | 8 +-
gr-dtv/include/gnuradio/dtv/atsc_field_sync_mux.h | 49 +
gr-dtv/include/gnuradio/dtv/atsc_interleaver.h | 49 +
gr-dtv/include/gnuradio/dtv/atsc_pad.h | 49 +
gr-dtv/include/gnuradio/dtv/atsc_randomizer.h | 50 ++
gr-dtv/include/gnuradio/dtv/atsc_rs_encoder.h | 50 ++
gr-dtv/include/gnuradio/dtv/atsc_trellis_encoder.h | 49 +
gr-dtv/lib/CMakeLists.txt | 9 +-
gr-dtv/lib/atsc/atsc_basic_trellis_encoder.cc | 64 ++
gr-dtv/lib/atsc/atsc_basic_trellis_encoder.h | 63 ++
gr-dtv/lib/atsc/atsc_field_sync_mux_impl.cc | 220 +++++
gr-dtv/lib/atsc/atsc_field_sync_mux_impl.h | 59 ++
gr-dtv/lib/atsc/atsc_interleaver_impl.cc | 110 +++
gr-dtv/lib/atsc/atsc_interleaver_impl.h | 50 ++
gr-dtv/lib/atsc/atsc_pad_impl.cc | 66 ++
gr-dtv/lib/atsc/atsc_pad_impl.h | 44 +
gr-dtv/lib/atsc/atsc_randomizer_impl.cc | 97 ++
gr-dtv/lib/atsc/atsc_randomizer_impl.h | 52 ++
gr-dtv/lib/atsc/atsc_rs_encoder_impl.cc | 104 +++
gr-dtv/lib/atsc/atsc_rs_encoder_impl.h | 53 ++
gr-dtv/lib/atsc/atsc_trellis_encoder_impl.cc | 243 +++++
gr-dtv/lib/atsc/atsc_trellis_encoder_impl.h | 59 ++
gr-dtv/swig/dtv_swig.i | 20 +-
32 files changed, 2743 insertions(+), 5 deletions(-)