[Commit-gnuradio] [gnuradio] 10/13: Add DVB-T receiver updated files.

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit b90c574e2fbf0443e1eea2ee06779c2a85f86def
Author: Ron Economos <address@hidden>
Date:   Sat Sep 5 16:36:30 2015 -0700

    Add DVB-T receiver updated files.
---
 gr-dtv/grc/CMakeLists.txt                          |  8 ++++++++
 gr-dtv/grc/dtv_block_tree.xml                      |  8 ++++++++
 gr-dtv/grc/dtv_dvbt_reference_signals.xml          |  2 +-
 gr-dtv/include/gnuradio/dtv/dvbt_map.h             |  4 ++--
 gr-dtv/lib/CMakeLists.txt                          | 10 +++++++++
 gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc     | 19 +++++++++--------
 .../lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc |  2 +-
 gr-dtv/swig/dtv_swig.i                             | 24 ++++++++++++++++++++++
 8 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/gr-dtv/grc/CMakeLists.txt b/gr-dtv/grc/CMakeLists.txt
index 2187e28..2fed81a 100644
--- a/gr-dtv/grc/CMakeLists.txt
+++ b/gr-dtv/grc/CMakeLists.txt
@@ -60,6 +60,14 @@ install(FILES
     dtv_dvbt_symbol_inner_interleaver.xml
     dtv_dvbt_map.xml
     dtv_dvbt_reference_signals.xml
+    dtv_dvbt_ofdm_sym_acquisition.xml
+    dtv_dvbt_demod_reference_signals.xml
+    dtv_dvbt_demap.xml
+    dtv_dvbt_bit_inner_deinterleaver.xml
+    dtv_dvbt_viterbi_decoder.xml
+    dtv_dvbt_convolutional_deinterleaver.xml
+    dtv_dvbt_reed_solomon_dec.xml
+    dtv_dvbt_energy_descramble.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 1f05bc7..32c8974 100644
--- a/gr-dtv/grc/dtv_block_tree.xml
+++ b/gr-dtv/grc/dtv_block_tree.xml
@@ -85,6 +85,14 @@
       <block>dtv_dvbt_symbol_inner_interleaver</block>
       <block>dtv_dvbt_map</block>
       <block>dtv_dvbt_reference_signals</block>
+      <block>dtv_dvbt_ofdm_sym_acquisition</block>
+      <block>dtv_dvbt_demod_reference_signals</block>
+      <block>dtv_dvbt_demap</block>
+      <block>dtv_dvbt_bit_inner_deinterleaver</block>
+      <block>dtv_dvbt_viterbi_decoder</block>
+      <block>dtv_dvbt_convolutional_deinterleaver</block>
+      <block>dtv_dvbt_reed_solomon_dec</block>
+      <block>dtv_dvbt_energy_descramble</block>
     </cat>
   </cat>
 </cat>
diff --git a/gr-dtv/grc/dtv_dvbt_reference_signals.xml 
b/gr-dtv/grc/dtv_dvbt_reference_signals.xml
index 9be5763..3a4282c 100644
--- a/gr-dtv/grc/dtv_dvbt_reference_signals.xml
+++ b/gr-dtv/grc/dtv_dvbt_reference_signals.xml
@@ -199,7 +199,7 @@
       </option>
       <option>
         <name>No</name>
-        <key>cell_ide_no</key>
+        <key>cell_id_no</key>
         <opt>val:0</opt>
       </option>
   </param>
diff --git a/gr-dtv/include/gnuradio/dtv/dvbt_map.h 
b/gr-dtv/include/gnuradio/dtv/dvbt_map.h
index d9b7976..5bd8f43 100644
--- a/gr-dtv/include/gnuradio/dtv/dvbt_map.h
+++ b/gr-dtv/include/gnuradio/dtv/dvbt_map.h
@@ -18,8 +18,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_DVBT_DVBT_MAP_H
-#define INCLUDED_DVBT_DVBT_MAP_H
+#ifndef INCLUDED_DTV_DVBT_MAP_H
+#define INCLUDED_DTV_DVBT_MAP_H
 
 #include <gnuradio/dtv/api.h>
 #include <gnuradio/dtv/dvb_config.h>
diff --git a/gr-dtv/lib/CMakeLists.txt b/gr-dtv/lib/CMakeLists.txt
index f2128e9..f044469 100644
--- a/gr-dtv/lib/CMakeLists.txt
+++ b/gr-dtv/lib/CMakeLists.txt
@@ -104,6 +104,14 @@ list(APPEND dtv_sources
   dvbt/dvbt_symbol_inner_interleaver_impl.cc
   dvbt/dvbt_map_impl.cc
   dvbt/dvbt_reference_signals_impl.cc
+  dvbt/dvbt_ofdm_sym_acquisition_impl.cc
+  dvbt/dvbt_demod_reference_signals_impl.cc
+  dvbt/dvbt_demap_impl.cc
+  dvbt/dvbt_bit_inner_deinterleaver_impl.cc
+  dvbt/dvbt_viterbi_decoder_impl.cc
+  dvbt/dvbt_convolutional_deinterleaver_impl.cc
+  dvbt/dvbt_reed_solomon_dec_impl.cc
+  dvbt/dvbt_energy_descramble_impl.cc
 )
 
 if(ENABLE_GR_CTRLPORT)
@@ -119,6 +127,8 @@ list(APPEND dtv_libs
     ${VOLK_LIBRARIES}
 )
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2")
+
 #Add Windows DLL resource file if using MSVC
 if(MSVC)
     include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake)
diff --git a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc 
b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc
index 58fc76c..b3c7046 100644
--- a/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc
@@ -182,7 +182,7 @@ namespace gr {
       // allocate buffer for scattered pilots
       d_spilot_carriers_val = new gr_complex[d_Kmax - d_Kmin + 1];
       if (d_spilot_carriers_val == NULL) {
-        std::cout << "Cannot allocate memory for d_tps_carriers_val" << 
std::endl;
+        std::cout << "Cannot allocate memory for d_spilot_carriers_val" << 
std::endl;
         delete [] d_wk;
         exit(1);
       }
@@ -190,7 +190,7 @@ namespace gr {
       // allocate buffer for channel gains (for each useful carrier)
       d_channel_gain = new gr_complex[d_Kmax - d_Kmin + 1];
       if (d_channel_gain == NULL) {
-        std::cout << "Cannot allocate memory for d_tps_carriers_val" << 
std::endl;
+        std::cout << "Cannot allocate memory for d_channel_gain" << std::endl;
         delete [] d_spilot_carriers_val;
         delete [] d_wk;
         exit(1);
@@ -199,7 +199,7 @@ namespace gr {
       // Allocate buffer for continual pilots phase diffs
       d_known_phase_diff = new float[d_cpilot_carriers_size - 1];
       if (d_known_phase_diff == NULL) {
-        std::cout << "Cannot allocate memory for d_tps_carriers_val" << 
std::endl;
+        std::cout << "Cannot allocate memory for d_known_phase_diff" << 
std::endl;
         delete [] d_channel_gain;
         delete [] d_spilot_carriers_val;
         delete [] d_wk;
@@ -214,7 +214,7 @@ namespace gr {
 
       d_cpilot_phase_diff = new float[d_cpilot_carriers_size - 1];
       if (d_cpilot_phase_diff == NULL) {
-        std::cout << "Cannot allocate memory for d_tps_carriers_val" << 
std::endl;
+        std::cout << "Cannot allocate memory for d_cpilot_phase_diff" << 
std::endl;
         delete [] d_known_phase_diff;
         delete [] d_channel_gain;
         delete [] d_spilot_carriers_val;
@@ -263,7 +263,7 @@ namespace gr {
 
       d_prev_tps_symbol = new gr_complex[d_tps_carriers_size];
       if (d_prev_tps_symbol == NULL) {
-        std::cout << "Cannot allocate memory for d_tps_data" << std::endl;
+        std::cout << "Cannot allocate memory for d_prev_tps_symbol" << 
std::endl;
         delete [] d_tps_data;
         delete [] d_tps_carriers_val;
         delete [] d_derot_in;
@@ -278,7 +278,7 @@ namespace gr {
 
       d_tps_symbol = new gr_complex[d_tps_carriers_size];
       if (d_tps_symbol == NULL) {
-        std::cout << "Cannot allocate memory for d_tps_data" << std::endl;
+        std::cout << "Cannot allocate memory for d_tps_symbol" << std::endl;
         delete [] d_prev_tps_symbol;
         delete [] d_tps_data;
         delete [] d_tps_carriers_val;
@@ -306,7 +306,7 @@ namespace gr {
       // Allocate buffer for channel estimation carriers
       d_chanestim_carriers = new int[d_Kmax - d_Kmin + 1];
       if (d_chanestim_carriers == NULL) {
-        std::cout << "Cannot allocate memory for d_tps_data" << std::endl;
+        std::cout << "Cannot allocate memory for d_chanestim_carriers" << 
std::endl;
         delete [] d_tps_symbol;
         delete [] d_prev_tps_symbol;
         delete [] d_tps_data;
@@ -323,7 +323,7 @@ namespace gr {
       // Allocate buffer for payload carriers
       d_payload_carriers = new int[d_Kmax - d_Kmin + 1];
       if (d_payload_carriers == NULL) {
-        std::cout << "Cannot allocate memory for d_tps_data" << std::endl;
+        std::cout << "Cannot allocate memory for d_payload_carriers" << 
std::endl;
         delete [] d_chanestim_carriers;
         delete [] d_tps_symbol;
         delete [] d_prev_tps_symbol;
@@ -435,8 +435,9 @@ namespace gr {
       memset(&data_in[0], 0, 60);
       //fill in TPS data - start bit not included
       //memcpy(&data_in[60], &data[1], 53);
-      for (int i = 0; i < 53; i++)
+      for (int i = 0; i < 53; i++) {
         data_in[60 + i] = data[1 + i];
+      }
 
       //X^14+X^9+X^8+X^6+X^5+X^4+X^2+X+1
       for (int i = 0; i < 113; i++) {
diff --git a/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc 
b/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc
index 64d242d..8bdfbf9 100644
--- a/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc
@@ -184,7 +184,7 @@ namespace gr {
           // Interleave
           for (int q = 0; q < d_nsize; q++) {
             if (d_symbol_index % 2) {
-                out[blocks + q] = in[blocks + H(q)];
+              out[blocks + q] = in[blocks + H(q)];
             }
             else {
               out[blocks + H(q)] = in[blocks + q];
diff --git a/gr-dtv/swig/dtv_swig.i b/gr-dtv/swig/dtv_swig.i
index 094e8f0..c2fa312 100644
--- a/gr-dtv/swig/dtv_swig.i
+++ b/gr-dtv/swig/dtv_swig.i
@@ -71,6 +71,14 @@
 #include "gnuradio/dtv/dvbt_symbol_inner_interleaver.h"
 #include "gnuradio/dtv/dvbt_map.h"
 #include "gnuradio/dtv/dvbt_reference_signals.h"
+#include "gnuradio/dtv/dvbt_ofdm_sym_acquisition.h"
+#include "gnuradio/dtv/dvbt_demod_reference_signals.h"
+#include "gnuradio/dtv/dvbt_demap.h"
+#include "gnuradio/dtv/dvbt_bit_inner_deinterleaver.h"
+#include "gnuradio/dtv/dvbt_viterbi_decoder.h"
+#include "gnuradio/dtv/dvbt_convolutional_deinterleaver.h"
+#include "gnuradio/dtv/dvbt_reed_solomon_dec.h"
+#include "gnuradio/dtv/dvbt_energy_descramble.h"
 %}
 
 %include "gnuradio/dtv/atsc_deinterleaver.h"
@@ -116,6 +124,14 @@
 %include "gnuradio/dtv/dvbt_symbol_inner_interleaver.h"
 %include "gnuradio/dtv/dvbt_map.h"
 %include "gnuradio/dtv/dvbt_reference_signals.h"
+%include "gnuradio/dtv/dvbt_ofdm_sym_acquisition.h"
+%include "gnuradio/dtv/dvbt_demod_reference_signals.h"
+%include "gnuradio/dtv/dvbt_demap.h"
+%include "gnuradio/dtv/dvbt_bit_inner_deinterleaver.h"
+%include "gnuradio/dtv/dvbt_viterbi_decoder.h"
+%include "gnuradio/dtv/dvbt_convolutional_deinterleaver.h"
+%include "gnuradio/dtv/dvbt_reed_solomon_dec.h"
+%include "gnuradio/dtv/dvbt_energy_descramble.h"
 
 GR_SWIG_BLOCK_MAGIC2(dtv, atsc_deinterleaver);
 GR_SWIG_BLOCK_MAGIC2(dtv, atsc_depad);
@@ -156,3 +172,11 @@ 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);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_ofdm_sym_acquisition);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_demod_reference_signals);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_demap);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_bit_inner_deinterleaver);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_viterbi_decoder);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_convolutional_deinterleaver);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_reed_solomon_dec);
+GR_SWIG_BLOCK_MAGIC2(dtv, dvbt_energy_descramble);