TEMP

Author: AlwinEsch

src/dabstream.cpp

@@ -689,8 +689,9 @@ void dabstream::onNewAudio(std::vector<int16_t>&& audioData,
 //
 //	label		- The new dynamic label (UTF-8)
 
-void dabstream::onNewDynamicLabel(std::string const& /*label*/)
+void dabstream::onNewDynamicLabel(std::string const& label)
 {
+  fprintf(stderr, "dabstream::onNewDynamicLabel: %s\n", label.c_str());
   // TODO
 }
 

src/dsp_dab/CMakeLists.txt

@@ -16,6 +16,8 @@ set(SOURCES fft.cpp
             ofdm-decoder.cpp
             ofdm-processor.cpp
             pad_decoder.cpp
+            pad_decoder_datagroup.cpp
+            pad_decoder_dynamiclabelsegment.cpp
             phasereference.cpp
             phasetable.cpp
             profiling.cpp
@@ -48,6 +50,8 @@ set(HEADERS MathHelper.h
             ofdm-decoder.h
             ofdm-processor.h
             pad_decoder.h
+            pad_decoder_datagroup.h
+            pad_decoder_dynamiclabelsegment.h
             phasereference.h
             phasetable.h
             profiling.h

src/dsp_dab/decoder_adapter.cpp

@@ -49,7 +49,7 @@ DecoderAdapter::DecoderAdapter(ProgrammeHandlerInterface &mr, int16_t bitRate, A
     }
 
     // MOT, start of X-PAD data group, see EN 301 234
-    padDecoder.SetMOTAppType(12);
+    padDecoder.SetMOTAppType(X_PADAppType_MOT_StartOfX);
 }
 
 void DecoderAdapter::addtoFrame(uint8_t *v)
@@ -140,19 +140,64 @@ void DecoderAdapter::FECInfo(int total_corr_count, bool uncorr_errors)
     myInterface.onRsErrors(uncorr_errors, total_corr_count);
 }
 
-void DecoderAdapter::PADChangeDynamicLabel(const DL_STATE &dl)
+void DecoderAdapter::PADChangeDynamicLabel(const CDynamicLabel &dl)
 {
     using charsets::CharacterSet;
 
+#if 1
+    fprintf(stderr, "_____________________________________________________\n");
+    fprintf(stderr, "Dynamic Label: %s\n", dl.m_dynamicLabel.c_str());
+    if (!dl.m_playItems.empty())
+    {
+      fprintf(stderr, "Playback:\n");
+      for (const auto& item : dl.m_playItems)
+      {
+        fprintf(stderr, " - %s: '%s'\n", CDynamicLabel::DLPlusContentTypes[item.first].name, item.second.c_str());
+      }
+    }
+
+    if (!dl.m_infoItems.empty())
+    {
+      fprintf(stderr, "Infos:\n");
+      for (const auto& item : dl.m_infoItems)
+      {
+        fprintf(stderr, " - %s: '%s'\n", CDynamicLabel::DLPlusContentTypes[item.first].name, item.second.c_str());
+      }
+    }
+
+    if (!dl.m_programmeItems.empty())
+    {
+      fprintf(stderr, "Programm:\n");
+      for (const auto& item : dl.m_programmeItems)
+      {
+        fprintf(stderr, " - %s: '%s'\n", CDynamicLabel::DLPlusContentTypes[item.first].name, item.second.c_str());
+      }
+    }
+
+    if (!dl.m_interactivityItems.empty())
+    {
+      fprintf(stderr, "Interactivity:\n");
+      for (const auto& item : dl.m_interactivityItems)
+      {
+        fprintf(stderr, " - %s: '%s'\n", CDynamicLabel::DLPlusContentTypes[item.first].name, item.second.c_str());
+      }
+    }
+
+    if (!dl.m_descriptorItems.empty())
+    {
+      fprintf(stderr, "Descriptor:\n");
+      for (const auto& item : dl.m_descriptorItems)
+      {
+        fprintf(stderr, " - %s: '%s'\n", CDynamicLabel::DLPlusContentTypes[item.first].name, item.second.c_str());
+      }
+    }
+#endif
+
     if (dl.raw.empty()) {
         myInterface.onNewDynamicLabel("");
     }
     else {
-        myInterface.onNewDynamicLabel(
-                charsets::toUtf8(
-                    dl.raw.data(),
-                    (CharacterSet)dl.charset,
-                    dl.raw.size()));
+        myInterface.onNewDynamicLabel(dl.m_dynamicLabel);
     }
 }
 

src/dsp_dab/decoder_adapter.h

@@ -58,7 +58,7 @@ class DecoderAdapter: public DabProcessor, public SubchannelSinkObserver, public
         virtual void FECInfo(int /*total_corr_count*/, bool /*uncorr_errors*/);
 
         // IPADDecoderObserver impl
-        virtual void PADChangeDynamicLabel(const DL_STATE& dl);
+        virtual void PADChangeDynamicLabel(const CDynamicLabel& dl);
         virtual void PADChangeSlide(const MOT_FILE& slide);
         virtual void PADLengthError(size_t announced_xpad_len, size_t xpad_len);
 
@@ -76,5 +76,6 @@ class DecoderAdapter: public DabProcessor, public SubchannelSinkObserver, public
         int audioChannels = 0;
         std::string audioFormat;
 };
+
 #endif // DECODER_ADAPTER_H