[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/03: gr-dtv: Add DVB-T transmitter update
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/03: gr-dtv: Add DVB-T transmitter updated files. |
|
Date: |
Wed, 27 May 2015 17:25:38 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 3c7e13e463dd474353f88d514b19000a0e813459
Author: Ron Economos <address@hidden>
Date: Thu May 14 03:25:31 2015 -0700
gr-dtv: Add DVB-T transmitter updated files.
---
gr-dtv/examples/README.dvbt | 4 ++++
gr-dtv/grc/CMakeLists.txt | 8 +++++++
gr-dtv/grc/dtv_block_tree.xml | 11 +++++++++
gr-dtv/include/gnuradio/dtv/CMakeLists.txt | 9 ++++++++
gr-dtv/include/gnuradio/dtv/dvb_config.h | 12 ++++++++++
gr-dtv/include/gnuradio/dtv/dvbt2_config.h | 11 ---------
gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h | 2 +-
.../gnuradio/dtv/dvbt2_freqinterleaver_cc.h | 3 ++-
gr-dtv/include/gnuradio/dtv/dvbt2_miso_cc.h | 3 ++-
gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h | 3 ++-
gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h | 3 ++-
.../include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h | 3 ++-
gr-dtv/lib/CMakeLists.txt | 10 +++++++++
gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc | 4 ++--
gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc | 4 ++--
gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc | 4 ++--
gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc | 4 ++--
gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc | 4 ++--
gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.h | 2 +-
gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc | 4 ++--
gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h | 2 +-
gr-dtv/swig/dtv_swig.i | 26 ++++++++++++++++++++++
26 files changed, 109 insertions(+), 35 deletions(-)
diff --git a/gr-dtv/examples/README.dvbt b/gr-dtv/examples/README.dvbt
new file mode 100644
index 0000000..88986c7
--- /dev/null
+++ b/gr-dtv/examples/README.dvbt
@@ -0,0 +1,4 @@
+Additional information and links to test streams for the
+DVB-T flow graphs can be found here:
+
+https://github.com/drmpeg/dtv-utils
diff --git a/gr-dtv/grc/CMakeLists.txt b/gr-dtv/grc/CMakeLists.txt
index ce2d718..2187e28 100644
--- a/gr-dtv/grc/CMakeLists.txt
+++ b/gr-dtv/grc/CMakeLists.txt
@@ -52,6 +52,14 @@ install(FILES
dtv_dvbs2_interleaver_bb.xml
dtv_dvbs2_modulator_bc.xml
dtv_dvbs2_physical_cc.xml
+ dtv_dvbt_energy_dispersal.xml
+ dtv_dvbt_reed_solomon_enc.xml
+ dtv_dvbt_convolutional_interleaver.xml
+ dtv_dvbt_inner_coder.xml
+ dtv_dvbt_bit_inner_interleaver.xml
+ dtv_dvbt_symbol_inner_interleaver.xml
+ dtv_dvbt_map.xml
+ dtv_dvbt_reference_signals.xml
DESTINATION ${GRC_BLOCKS_DIR}
COMPONENT "dtv_python"
)
diff --git a/gr-dtv/grc/dtv_block_tree.xml b/gr-dtv/grc/dtv_block_tree.xml
index 770b7ec..1f05bc7 100644
--- a/gr-dtv/grc/dtv_block_tree.xml
+++ b/gr-dtv/grc/dtv_block_tree.xml
@@ -75,5 +75,16 @@
<block>dtv_dvbs2_modulator_bc</block>
<block>dtv_dvbs2_physical_cc</block>
</cat>
+ <cat>
+ <name>DVB-T</name>
+ <block>dtv_dvbt_energy_dispersal</block>
+ <block>dtv_dvbt_reed_solomon_enc</block>
+ <block>dtv_dvbt_convolutional_interleaver</block>
+ <block>dtv_dvbt_inner_coder</block>
+ <block>dtv_dvbt_bit_inner_interleaver</block>
+ <block>dtv_dvbt_symbol_inner_interleaver</block>
+ <block>dtv_dvbt_map</block>
+ <block>dtv_dvbt_reference_signals</block>
+ </cat>
</cat>
</cat>
diff --git a/gr-dtv/include/gnuradio/dtv/CMakeLists.txt
b/gr-dtv/include/gnuradio/dtv/CMakeLists.txt
index 9726449..d1eff3f 100644
--- a/gr-dtv/include/gnuradio/dtv/CMakeLists.txt
+++ b/gr-dtv/include/gnuradio/dtv/CMakeLists.txt
@@ -39,6 +39,7 @@ install(FILES
atsc_trellis_encoder.h
atsc_field_sync_mux.h
dvb_config.h
+ dvbt_config.h
dvbs2_config.h
dvbt2_config.h
dvb_bbheader_bb.h
@@ -57,6 +58,14 @@ install(FILES
dvbs2_interleaver_bb.h
dvbs2_modulator_bc.h
dvbs2_physical_cc.h
+ dvbt_energy_dispersal.h
+ dvbt_reed_solomon_enc.h
+ dvbt_convolutional_interleaver.h
+ dvbt_inner_coder.h
+ dvbt_bit_inner_interleaver.h
+ dvbt_symbol_inner_interleaver.h
+ dvbt_map.h
+ dvbt_reference_signals.h
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/dtv
COMPONENT "dtv_devel"
)
diff --git a/gr-dtv/include/gnuradio/dtv/dvb_config.h
b/gr-dtv/include/gnuradio/dtv/dvb_config.h
index d08c9c8..9405f96 100644
--- a/gr-dtv/include/gnuradio/dtv/dvb_config.h
+++ b/gr-dtv/include/gnuradio/dtv/dvb_config.h
@@ -38,6 +38,7 @@ namespace gr {
C3_4,
C4_5,
C5_6,
+ C7_8,
C8_9,
C9_10,
C13_45,
@@ -97,6 +98,16 @@ namespace gr {
MOD_OTHER,
};
+ enum dvb_guardinterval_t {
+ GI_1_32 = 0,
+ GI_1_16,
+ GI_1_8,
+ GI_1_4,
+ GI_1_128,
+ GI_19_128,
+ GI_19_256,
+ };
+
} // namespace dtv
} // namespace gr
@@ -104,6 +115,7 @@ typedef gr::dtv::dvb_standard_t dvb_standard_t;
typedef gr::dtv::dvb_code_rate_t dvb_code_rate_t;
typedef gr::dtv::dvb_framesize_t dvb_framesize_t;
typedef gr::dtv::dvb_constellation_t dvb_constellation_t;
+typedef gr::dtv::dvb_guardinterval_t dvb_guardinterval_t;
#endif /* INCLUDED_DTV_DVB_CONFIG_H */
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_config.h
b/gr-dtv/include/gnuradio/dtv/dvbt2_config.h
index 928690c..906d953 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_config.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_config.h
@@ -64,16 +64,6 @@ namespace gr {
FFTSIZE_16K_T2GI = 11,
};
- enum dvbt2_guardinterval_t {
- GI_1_32 = 0,
- GI_1_16,
- GI_1_8,
- GI_1_4,
- GI_1_128,
- GI_19_128,
- GI_19_256,
- };
-
enum dvbt2_papr_t {
PAPR_OFF = 0,
PAPR_ACE,
@@ -153,7 +143,6 @@ typedef gr::dtv::dvbt2_inputmode_t dvbt2_inputmode_t;
typedef gr::dtv::dvbt2_extended_carrier_t dvbt2_extended_carrier_t;
typedef gr::dtv::dvbt2_preamble_t dvbt2_preamble_t;
typedef gr::dtv::dvbt2_fftsize_t dvbt2_fftsize_t;
-typedef gr::dtv::dvbt2_guardinterval_t dvbt2_guardinterval_t;
typedef gr::dtv::dvbt2_papr_t dvbt2_papr_t;
typedef gr::dtv::dvbt2_l1constellation_t dvbt2_l1constellation_t;
typedef gr::dtv::dvbt2_pilotpattern_t dvbt2_pilotpattern_t;
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h
b/gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h
index abead6a..bf6e4db 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_framemapper_cc.h
@@ -65,7 +65,7 @@ namespace gr {
* \param l1scrambled scramble L1 post signalling (on or off).
* \param inband In-band type B signalling (on or off).
*/
- static sptr make(dvb_framesize_t framesize, dvb_code_rate_t rate,
dvb_constellation_t constellation, dvbt2_rotation_t rotation, int fecblocks,
int tiblocks, dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize,
dvbt2_guardinterval_t guardinterval, dvbt2_l1constellation_t l1constellation,
dvbt2_pilotpattern_t pilotpattern, int t2frames, int numdatasyms, dvbt2_papr_t
paprmode, dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_inputmode_t
inputmode, dvbt2_reservedbias [...]
+ static sptr make(dvb_framesize_t framesize, dvb_code_rate_t rate,
dvb_constellation_t constellation, dvbt2_rotation_t rotation, int fecblocks,
int tiblocks, dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize,
dvb_guardinterval_t guardinterval, dvbt2_l1constellation_t l1constellation,
dvbt2_pilotpattern_t pilotpattern, int t2frames, int numdatasyms, dvbt2_papr_t
paprmode, dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_inputmode_t
inputmode, dvbt2_reservedbiasbi [...]
};
} // namespace dtv
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_freqinterleaver_cc.h
b/gr-dtv/include/gnuradio/dtv/dvbt2_freqinterleaver_cc.h
index cfb352b..766fe03 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_freqinterleaver_cc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_freqinterleaver_cc.h
@@ -22,6 +22,7 @@
#define INCLUDED_DTV_DVBT2_FREQINTERLEAVER_CC_H
#include <gnuradio/dtv/api.h>
+#include <gnuradio/dtv/dvb_config.h>
#include <gnuradio/dtv/dvbt2_config.h>
#include <gnuradio/sync_block.h>
@@ -52,7 +53,7 @@ namespace gr {
* \param version DVB-T2 specification version.
* \param preamble P1 symbol preamble format.
*/
- static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_pilotpattern_t pilotpattern, dvbt2_guardinterval_t
guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version,
dvbt2_preamble_t preamble);
+ static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval,
int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version,
dvbt2_preamble_t preamble);
};
} // namespace dtv
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_miso_cc.h
b/gr-dtv/include/gnuradio/dtv/dvbt2_miso_cc.h
index 1268ae8..c16e711 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_miso_cc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_miso_cc.h
@@ -22,6 +22,7 @@
#define INCLUDED_DTV_DVBT2_MISO_CC_H
#include <gnuradio/dtv/api.h>
+#include <gnuradio/dtv/dvb_config.h>
#include <gnuradio/dtv/dvbt2_config.h>
#include <gnuradio/sync_block.h>
@@ -51,7 +52,7 @@ namespace gr {
* \param numdatasyms number of OFDM symbols in a T2 frame.
* \param paprmode PAPR reduction mode.
*/
- static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_pilotpattern_t pilotpattern, dvbt2_guardinterval_t
guardinterval, int numdatasyms, dvbt2_papr_t paprmode);
+ static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval,
int numdatasyms, dvbt2_papr_t paprmode);
};
} // namespace dtv
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h
b/gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h
index dd15026..84e0d4a 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_p1insertion_cc.h
@@ -22,6 +22,7 @@
#define INCLUDED_DTV_DVBT2_P1INSERTION_CC_H
#include <gnuradio/dtv/api.h>
+#include <gnuradio/dtv/dvb_config.h>
#include <gnuradio/dtv/dvbt2_config.h>
#include <gnuradio/block.h>
@@ -51,7 +52,7 @@ namespace gr {
* \param showlevels print peak IQ levels.
* \param vclip set peak IQ level threshold.
*/
- static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_guardinterval_t guardinterval, int numdatasyms, dvbt2_preamble_t
preamble, dvbt2_showlevels_t showlevels, float vclip);
+ static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_preamble_t
preamble, dvbt2_showlevels_t showlevels, float vclip);
};
} // namespace dtv
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h
b/gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h
index 728a665..5a39dfa 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_paprtr_cc.h
@@ -22,6 +22,7 @@
#define INCLUDED_DTV_DVBT2_PAPRTR_CC_H
#include <gnuradio/dtv/api.h>
+#include <gnuradio/dtv/dvb_config.h>
#include <gnuradio/dtv/dvbt2_config.h>
#include <gnuradio/sync_block.h>
@@ -54,7 +55,7 @@ namespace gr {
* \param iterations PAPR algorithm number of iterations.
* \param vlength input and output vector length.
*/
- static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_pilotpattern_t pilotpattern, dvbt2_guardinterval_t
guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version,
float vclip, int iterations, int vlength);
+ static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval,
int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, float vclip,
int iterations, int vlength);
};
} // namespace dtv
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h
b/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h
index f74005a..19ae6d9 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h
@@ -22,6 +22,7 @@
#define INCLUDED_DTV_DVBT2_PILOTGENERATOR_CC_H
#include <gnuradio/dtv/api.h>
+#include <gnuradio/dtv/dvb_config.h>
#include <gnuradio/dtv/dvbt2_config.h>
#include <gnuradio/block.h>
@@ -56,7 +57,7 @@ namespace gr {
* \param bandwidth sin(x)/x equalization bandwidth.
* \param vlength output vector length.
*/
- static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_pilotpattern_t pilotpattern, dvbt2_guardinterval_t
guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version,
dvbt2_preamble_t preamble, dvbt2_misogroup_t misogroup, dvbt2_equalization_t
equalization, dvbt2_bandwidth_t bandwidth, int vlength);
+ static sptr make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval,
int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version,
dvbt2_preamble_t preamble, dvbt2_misogroup_t misogroup, dvbt2_equalization_t
equalization, dvbt2_bandwidth_t bandwidth, int vlength);
};
} // namespace dtv
diff --git a/gr-dtv/lib/CMakeLists.txt b/gr-dtv/lib/CMakeLists.txt
index 65f50e4..f2128e9 100644
--- a/gr-dtv/lib/CMakeLists.txt
+++ b/gr-dtv/lib/CMakeLists.txt
@@ -94,6 +94,16 @@ list(APPEND dtv_sources
dvbs2/dvbs2_interleaver_bb_impl.cc
dvbs2/dvbs2_modulator_bc_impl.cc
dvbs2/dvbs2_physical_cc_impl.cc
+ dvbt/dvbt_energy_dispersal_impl.cc
+ dvbt/dvbt_reed_solomon.cc
+ dvbt/dvbt_reed_solomon_enc_impl.cc
+ dvbt/dvbt_convolutional_interleaver_impl.cc
+ dvbt/dvbt_configure.cc
+ dvbt/dvbt_inner_coder_impl.cc
+ dvbt/dvbt_bit_inner_interleaver_impl.cc
+ dvbt/dvbt_symbol_inner_interleaver_impl.cc
+ dvbt/dvbt_map_impl.cc
+ dvbt/dvbt_reference_signals_impl.cc
)
if(ENABLE_GR_CTRLPORT)
diff --git a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
index a09af90..aef610f 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc
@@ -30,7 +30,7 @@ namespace gr {
namespace dtv {
dvbt2_framemapper_cc::sptr
- dvbt2_framemapper_cc::make(dvb_framesize_t framesize, dvb_code_rate_t
rate, dvb_constellation_t constellation, dvbt2_rotation_t rotation, int
fecblocks, int tiblocks, dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_guardinterval_t guardinterval, dvbt2_l1constellation_t
l1constellation, dvbt2_pilotpattern_t pilotpattern, int t2frames, int
numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, dvbt2_preamble_t
preamble, dvbt2_inputmode_t inputmode, dvbt2_rese [...]
+ dvbt2_framemapper_cc::make(dvb_framesize_t framesize, dvb_code_rate_t
rate, dvb_constellation_t constellation, dvbt2_rotation_t rotation, int
fecblocks, int tiblocks, dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvb_guardinterval_t guardinterval, dvbt2_l1constellation_t
l1constellation, dvbt2_pilotpattern_t pilotpattern, int t2frames, int
numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, dvbt2_preamble_t
preamble, dvbt2_inputmode_t inputmode, dvbt2_reserv [...]
{
return gnuradio::get_initial_sptr
(new dvbt2_framemapper_cc_impl(framesize, rate, constellation,
rotation, fecblocks, tiblocks, carriermode, fftsize, guardinterval,
l1constellation, pilotpattern, t2frames, numdatasyms, paprmode, version,
preamble, inputmode, reservedbiasbits, l1scrambled, inband));
@@ -39,7 +39,7 @@ namespace gr {
/*
* The private constructor
*/
- dvbt2_framemapper_cc_impl::dvbt2_framemapper_cc_impl(dvb_framesize_t
framesize, dvb_code_rate_t rate, dvb_constellation_t constellation,
dvbt2_rotation_t rotation, int fecblocks, int tiblocks,
dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize,
dvbt2_guardinterval_t guardinterval, dvbt2_l1constellation_t l1constellation,
dvbt2_pilotpattern_t pilotpattern, int t2frames, int numdatasyms, dvbt2_papr_t
paprmode, dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_inputmo
[...]
+ dvbt2_framemapper_cc_impl::dvbt2_framemapper_cc_impl(dvb_framesize_t
framesize, dvb_code_rate_t rate, dvb_constellation_t constellation,
dvbt2_rotation_t rotation, int fecblocks, int tiblocks,
dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t fftsize,
dvb_guardinterval_t guardinterval, dvbt2_l1constellation_t l1constellation,
dvbt2_pilotpattern_t pilotpattern, int t2frames, int numdatasyms, dvbt2_papr_t
paprmode, dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_inputmode
[...]
: gr::block("dvbt2_framemapper_cc",
gr::io_signature::make(1, 1, sizeof(gr_complex)),
gr::io_signature::make(1, 1, sizeof(gr_complex)))
diff --git a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.h
b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.h
index 2b25b2d..354c684 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.h
+++ b/gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.h
@@ -193,7 +193,7 @@ namespace gr {
const static int mux64[12];
public:
- dvbt2_framemapper_cc_impl(dvb_framesize_t framesize, dvb_code_rate_t
rate, dvb_constellation_t constellation, dvbt2_rotation_t rotation, int
fecblocks, int tiblocks, dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_guardinterval_t guardinterval, dvbt2_l1constellation_t
l1constellation, dvbt2_pilotpattern_t pilotpattern, int t2frames, int
numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, dvbt2_preamble_t
preamble, dvbt2_inputmode_t inputmode, dvbt2_res [...]
+ dvbt2_framemapper_cc_impl(dvb_framesize_t framesize, dvb_code_rate_t
rate, dvb_constellation_t constellation, dvbt2_rotation_t rotation, int
fecblocks, int tiblocks, dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvb_guardinterval_t guardinterval, dvbt2_l1constellation_t
l1constellation, dvbt2_pilotpattern_t pilotpattern, int t2frames, int
numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version, dvbt2_preamble_t
preamble, dvbt2_inputmode_t inputmode, dvbt2_reser [...]
~dvbt2_framemapper_cc_impl();
void forecast (int noutput_items, gr_vector_int &ninput_items_required);
diff --git a/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
b/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
index acee743..f89d2af 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.cc
@@ -29,7 +29,7 @@ namespace gr {
namespace dtv {
dvbt2_freqinterleaver_cc::sptr
- dvbt2_freqinterleaver_cc::make(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvbt2_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode,
dvbt2_version_t version, dvbt2_preamble_t preamble)
+ dvbt2_freqinterleaver_cc::make(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t
guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version,
dvbt2_preamble_t preamble)
{
return gnuradio::get_initial_sptr
(new dvbt2_freqinterleaver_cc_impl(carriermode, fftsize, pilotpattern,
guardinterval, numdatasyms, paprmode, version, preamble));
@@ -38,7 +38,7 @@ namespace gr {
/*
* The private constructor
*/
-
dvbt2_freqinterleaver_cc_impl::dvbt2_freqinterleaver_cc_impl(dvbt2_extended_carrier_t
carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvbt2_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode,
dvbt2_version_t version, dvbt2_preamble_t preamble)
+
dvbt2_freqinterleaver_cc_impl::dvbt2_freqinterleaver_cc_impl(dvbt2_extended_carrier_t
carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode,
dvbt2_version_t version, dvbt2_preamble_t preamble)
: gr::sync_block("dvbt2_freqinterleaver_cc",
gr::io_signature::make(1, 1, sizeof(gr_complex)),
gr::io_signature::make(1, 1, sizeof(gr_complex)))
diff --git a/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.h
b/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.h
index 18ce889..a52dc9e 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.h
+++ b/gr-dtv/lib/dvbt2/dvbt2_freqinterleaver_cc_impl.h
@@ -57,7 +57,7 @@ namespace gr {
const static int bitperm32k[14];
public:
- dvbt2_freqinterleaver_cc_impl(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvbt2_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode,
dvbt2_version_t version, dvbt2_preamble_t preamble);
+ dvbt2_freqinterleaver_cc_impl(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t
guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version,
dvbt2_preamble_t preamble);
~dvbt2_freqinterleaver_cc_impl();
int work(int noutput_items,
diff --git a/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc
b/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc
index 3f19c31..a3d2684 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.cc
@@ -29,7 +29,7 @@ namespace gr {
namespace dtv {
dvbt2_miso_cc::sptr
- dvbt2_miso_cc::make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_pilotpattern_t pilotpattern, dvbt2_guardinterval_t
guardinterval, int numdatasyms, dvbt2_papr_t paprmode)
+ dvbt2_miso_cc::make(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval,
int numdatasyms, dvbt2_papr_t paprmode)
{
return gnuradio::get_initial_sptr
(new dvbt2_miso_cc_impl(carriermode, fftsize, pilotpattern,
guardinterval, numdatasyms, paprmode));
@@ -38,7 +38,7 @@ namespace gr {
/*
* The private constructor
*/
- dvbt2_miso_cc_impl::dvbt2_miso_cc_impl(dvbt2_extended_carrier_t
carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvbt2_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode)
+ dvbt2_miso_cc_impl::dvbt2_miso_cc_impl(dvbt2_extended_carrier_t
carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode)
: gr::sync_block("dvbt2_miso_cc",
gr::io_signature::make(1, 1, sizeof(gr_complex)),
gr::io_signature::make(2, 2, sizeof(gr_complex)))
diff --git a/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.h
b/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.h
index e33b201..8dcbdf9 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.h
+++ b/gr-dtv/lib/dvbt2/dvbt2_miso_cc_impl.h
@@ -38,7 +38,7 @@ namespace gr {
int C_DATA;
public:
- dvbt2_miso_cc_impl(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_pilotpattern_t pilotpattern, dvbt2_guardinterval_t
guardinterval, int numdatasyms, dvbt2_papr_t paprmode);
+ dvbt2_miso_cc_impl(dvbt2_extended_carrier_t carriermode, dvbt2_fftsize_t
fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t guardinterval,
int numdatasyms, dvbt2_papr_t paprmode);
~dvbt2_miso_cc_impl();
int work(int noutput_items,
diff --git a/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc
b/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc
index 22415af..c644d49 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc
@@ -30,7 +30,7 @@ namespace gr {
namespace dtv {
dvbt2_p1insertion_cc::sptr
- dvbt2_p1insertion_cc::make(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_guardinterval_t guardinterval, int numdatasyms,
dvbt2_preamble_t preamble, dvbt2_showlevels_t showlevels, float vclip)
+ dvbt2_p1insertion_cc::make(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvb_guardinterval_t guardinterval, int numdatasyms,
dvbt2_preamble_t preamble, dvbt2_showlevels_t showlevels, float vclip)
{
return gnuradio::get_initial_sptr
(new dvbt2_p1insertion_cc_impl(carriermode, fftsize, guardinterval,
numdatasyms, preamble, showlevels, vclip));
@@ -39,7 +39,7 @@ namespace gr {
/*
* The private constructor
*/
-
dvbt2_p1insertion_cc_impl::dvbt2_p1insertion_cc_impl(dvbt2_extended_carrier_t
carriermode, dvbt2_fftsize_t fftsize, dvbt2_guardinterval_t guardinterval, int
numdatasyms, dvbt2_preamble_t preamble, dvbt2_showlevels_t showlevels, float
vclip)
+
dvbt2_p1insertion_cc_impl::dvbt2_p1insertion_cc_impl(dvbt2_extended_carrier_t
carriermode, dvbt2_fftsize_t fftsize, dvb_guardinterval_t guardinterval, int
numdatasyms, dvbt2_preamble_t preamble, dvbt2_showlevels_t showlevels, float
vclip)
: gr::block("dvbt2_p1insertion_cc",
gr::io_signature::make(1, 1, sizeof(gr_complex)),
gr::io_signature::make(1, 1, sizeof(gr_complex)))
diff --git a/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.h
b/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.h
index 85537b5..3931723 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.h
+++ b/gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.h
@@ -67,7 +67,7 @@ namespace gr {
const static unsigned char s2_modulation_patterns[16][32];
public:
- dvbt2_p1insertion_cc_impl(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_guardinterval_t guardinterval, int numdatasyms,
dvbt2_preamble_t preamble, dvbt2_showlevels_t showlevels, float vclip);
+ dvbt2_p1insertion_cc_impl(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvb_guardinterval_t guardinterval, int numdatasyms,
dvbt2_preamble_t preamble, dvbt2_showlevels_t showlevels, float vclip);
~dvbt2_p1insertion_cc_impl();
void forecast (int noutput_items, gr_vector_int &ninput_items_required);
diff --git a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
index db3fd00..45ceeed 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
@@ -31,7 +31,7 @@ namespace gr {
namespace dtv {
dvbt2_paprtr_cc::sptr
- dvbt2_paprtr_cc::make(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvbt2_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode,
dvbt2_version_t version, float vclip, int iterations, int vlength)
+ dvbt2_paprtr_cc::make(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t
guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version,
float vclip, int iterations, int vlength)
{
return gnuradio::get_initial_sptr
(new dvbt2_paprtr_cc_impl(carriermode, fftsize, pilotpattern,
guardinterval, numdatasyms, paprmode, version, vclip, iterations, vlength));
@@ -40,7 +40,7 @@ namespace gr {
/*
* The private constructor
*/
- dvbt2_paprtr_cc_impl::dvbt2_paprtr_cc_impl(dvbt2_extended_carrier_t
carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvbt2_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode,
dvbt2_version_t version, float vclip, int iterations, int vlength)
+ dvbt2_paprtr_cc_impl::dvbt2_paprtr_cc_impl(dvbt2_extended_carrier_t
carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode,
dvbt2_version_t version, float vclip, int iterations, int vlength)
: gr::sync_block("dvbt2_paprtr_cc",
gr::io_signature::make(1, 1, sizeof(gr_complex) * vlength),
gr::io_signature::make(1, 1, sizeof(gr_complex) * vlength))
diff --git a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.h
b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.h
index 96c669f..aac5e48 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.h
+++ b/gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.h
@@ -97,7 +97,7 @@ namespace gr {
const static int tr_papr_map_32k[288];
public:
- dvbt2_paprtr_cc_impl(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvbt2_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode,
dvbt2_version_t version, float vclip, int iterations, int vlength);
+ dvbt2_paprtr_cc_impl(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t
guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version,
float vclip, int iterations, int vlength);
~dvbt2_paprtr_cc_impl();
int work(int noutput_items,
diff --git a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc
b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc
index 05dacce..26c8349 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc
+++ b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.cc
@@ -30,7 +30,7 @@ namespace gr {
namespace dtv {
dvbt2_pilotgenerator_cc::sptr
- dvbt2_pilotgenerator_cc::make(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvbt2_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode,
dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_misogroup_t
misogroup, dvbt2_equalization_t equalization, dvbt2_bandwidth_t bandwidth, int
vlength)
+ dvbt2_pilotgenerator_cc::make(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t
guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version,
dvbt2_preamble_t preamble, dvbt2_misogroup_t misogroup, dvbt2_equalization_t
equalization, dvbt2_bandwidth_t bandwidth, int vlength)
{
return gnuradio::get_initial_sptr
(new dvbt2_pilotgenerator_cc_impl(carriermode, fftsize, pilotpattern,
guardinterval, numdatasyms, paprmode, version, preamble, misogroup,
equalization, bandwidth, vlength));
@@ -39,7 +39,7 @@ namespace gr {
/*
* The private constructor
*/
-
dvbt2_pilotgenerator_cc_impl::dvbt2_pilotgenerator_cc_impl(dvbt2_extended_carrier_t
carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvbt2_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode,
dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_misogroup_t
misogroup, dvbt2_equalization_t equalization, dvbt2_bandwidth_t bandwidth, int
vlength)
+
dvbt2_pilotgenerator_cc_impl::dvbt2_pilotgenerator_cc_impl(dvbt2_extended_carrier_t
carriermode, dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvb_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode,
dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_misogroup_t
misogroup, dvbt2_equalization_t equalization, dvbt2_bandwidth_t bandwidth, int
vlength)
: gr::block("dvbt2_pilotgenerator_cc",
gr::io_signature::make(1, 1, sizeof(gr_complex)),
gr::io_signature::make(1, 1, sizeof(gr_complex) * vlength))
diff --git a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h
b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h
index e419872..f99d8a6 100644
--- a/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h
+++ b/gr-dtv/lib/dvbt2/dvbt2_pilotgenerator_cc_impl.h
@@ -155,7 +155,7 @@ namespace gr {
const static int pp8_32k[6];
public:
- dvbt2_pilotgenerator_cc_impl(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern,
dvbt2_guardinterval_t guardinterval, int numdatasyms, dvbt2_papr_t paprmode,
dvbt2_version_t version, dvbt2_preamble_t preamble, dvbt2_misogroup_t
misogroup, dvbt2_equalization_t equalization, dvbt2_bandwidth_t bandwidth, int
vlength);
+ dvbt2_pilotgenerator_cc_impl(dvbt2_extended_carrier_t carriermode,
dvbt2_fftsize_t fftsize, dvbt2_pilotpattern_t pilotpattern, dvb_guardinterval_t
guardinterval, int numdatasyms, dvbt2_papr_t paprmode, dvbt2_version_t version,
dvbt2_preamble_t preamble, dvbt2_misogroup_t misogroup, dvbt2_equalization_t
equalization, dvbt2_bandwidth_t bandwidth, int vlength);
~dvbt2_pilotgenerator_cc_impl();
void forecast (int noutput_items, gr_vector_int &ninput_items_required);
diff --git a/gr-dtv/swig/dtv_swig.i b/gr-dtv/swig/dtv_swig.i
index 42a7b0d..094e8f0 100644
--- a/gr-dtv/swig/dtv_swig.i
+++ b/gr-dtv/swig/dtv_swig.i
@@ -44,6 +44,7 @@
#include "gnuradio/dtv/atsc_trellis_encoder.h"
#include "gnuradio/dtv/atsc_viterbi_decoder.h"
#include "gnuradio/dtv/dvb_config.h"
+#include "gnuradio/dtv/dvbt_config.h"
#include "gnuradio/dtv/dvbt2_config.h"
#include "gnuradio/dtv/dvbs2_config.h"
#include "gnuradio/dtv/dvb_bbheader_bb.h"
@@ -62,6 +63,14 @@
#include "gnuradio/dtv/dvbs2_interleaver_bb.h"
#include "gnuradio/dtv/dvbs2_modulator_bc.h"
#include "gnuradio/dtv/dvbs2_physical_cc.h"
+#include "gnuradio/dtv/dvbt_energy_dispersal.h"
+#include "gnuradio/dtv/dvbt_reed_solomon_enc.h"
+#include "gnuradio/dtv/dvbt_convolutional_interleaver.h"
+#include "gnuradio/dtv/dvbt_inner_coder.h"
+#include "gnuradio/dtv/dvbt_bit_inner_interleaver.h"
+#include "gnuradio/dtv/dvbt_symbol_inner_interleaver.h"
+#include "gnuradio/dtv/dvbt_map.h"
+#include "gnuradio/dtv/dvbt_reference_signals.h"
%}
%include "gnuradio/dtv/atsc_deinterleaver.h"
@@ -80,6 +89,7 @@
%include "gnuradio/dtv/atsc_trellis_encoder.h"
%include "gnuradio/dtv/atsc_viterbi_decoder.h"
%include "gnuradio/dtv/dvb_config.h"
+%include "gnuradio/dtv/dvbt_config.h"
%include "gnuradio/dtv/dvbt2_config.h"
%include "gnuradio/dtv/dvbs2_config.h"
%include "gnuradio/dtv/dvb_bbheader_bb.h"
@@ -98,6 +108,14 @@
%include "gnuradio/dtv/dvbs2_interleaver_bb.h"
%include "gnuradio/dtv/dvbs2_modulator_bc.h"
%include "gnuradio/dtv/dvbs2_physical_cc.h"
+%include "gnuradio/dtv/dvbt_energy_dispersal.h"
+%include "gnuradio/dtv/dvbt_reed_solomon_enc.h"
+%include "gnuradio/dtv/dvbt_convolutional_interleaver.h"
+%include "gnuradio/dtv/dvbt_inner_coder.h"
+%include "gnuradio/dtv/dvbt_bit_inner_interleaver.h"
+%include "gnuradio/dtv/dvbt_symbol_inner_interleaver.h"
+%include "gnuradio/dtv/dvbt_map.h"
+%include "gnuradio/dtv/dvbt_reference_signals.h"
GR_SWIG_BLOCK_MAGIC2(dtv, atsc_deinterleaver);
GR_SWIG_BLOCK_MAGIC2(dtv, atsc_depad);
@@ -130,3 +148,11 @@ GR_SWIG_BLOCK_MAGIC2(dtv, dvbt2_miso_cc);
GR_SWIG_BLOCK_MAGIC2(dtv, dvbs2_interleaver_bb);
GR_SWIG_BLOCK_MAGIC2(dtv, dvbs2_modulator_bc);
GR_SWIG_BLOCK_MAGIC2(dtv, dvbs2_physical_cc);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_energy_dispersal);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_reed_solomon_enc);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_convolutional_interleaver);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_inner_coder);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_bit_inner_interleaver);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_symbol_inner_interleaver);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_map);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_reference_signals);