Merge pull request #383 from ksooo/rds-dyn-fix

Fix RDS stream support.
kodi-pvr · Oct 27, 2018 · 1675b60 · 1675b60
2 parents 5ed5a07 + a86a672
commit 1675b60
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="4.4.1"
+  version="4.4.2"
   name="Tvheadend HTSP Client"
   provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt
@@ -1,3 +1,6 @@
+4.4.2
+- Fix RDS stream support. Only mpeg2 audio streams can contain embedded RDS data and there can be at most one RDS stream at a time.
+
 4.4.1
 - Fix creation of RDS streams. Must only be done if audio stream actually contains RDS data.
 

diff --git a/src/tvheadend/HTSPDemuxer.cpp b/src/tvheadend/HTSPDemuxer.cpp
@@ -48,7 +48,7 @@ HTSPDemuxer::HTSPDemuxer ( HTSPConnection &conn )
     m_seekTime(INVALID_SEEKTIME),
     m_seeking(false), m_speedChange(false),
     m_subscription(conn), m_lastUse(0),
-    m_startTime(0)
+    m_startTime(0), m_rdsIdx(0)
 {
 }
 
@@ -89,6 +89,7 @@ void HTSPDemuxer::Abort0 ( void )
   CLockObject lock(m_mutex);
   m_streams.clear();
   m_streamStat.clear();
+  m_rdsIdx = 0;
   m_seeking = false;
   m_speedChange = false;
 }
@@ -392,6 +393,9 @@ bool HTSPDemuxer::ProcessMessage ( const char *method, htsmsg_t *m )
 
 void HTSPDemuxer::ProcessRDS(uint32_t idx, const void* bin, size_t binlen)
 {
+  if (idx != m_rdsIdx)
+    return;
+
   const uint8_t* data = static_cast<const uint8_t*>(bin);
   const size_t offset = binlen - 1;
 
@@ -553,7 +557,7 @@ bool HTSPDemuxer::AddRDSStream(uint32_t audioIdx, uint32_t rdsIdx)
     // We can only use PVR_STREAM_MAX_STREAMS streams
     if (m_streams.size() < PVR_STREAM_MAX_STREAMS)
     {
-      Logger::Log(LogLevel::LEVEL_DEBUG, "  id: %d, type rds, codec: %u", rdsIdx, rdsStream.iCodecId);
+      Logger::Log(LogLevel::LEVEL_DEBUG, "Adding rds stream. id: %d", rdsIdx);
       m_streams.emplace_back(rdsStream);
       return true;
     }
@@ -608,6 +612,13 @@ bool HTSPDemuxer::AddTVHStream(uint32_t idx, const char* type, htsmsg_field_t *f
   {
     stream.iChannels = htsmsg_get_u32_or_default(&f->hmf_msg, "channels", 2);
     stream.iSampleRate = htsmsg_get_u32_or_default(&f->hmf_msg, "rate", 48000);
+
+    if (strcmp("MPEG2AUDIO", type) == 0)
+    {
+      // mpeg2 audio streams may contain embedded RDS data.
+      // We will find out when the first stream packet arrives.
+      m_rdsIdx = idx;
+    }
   }
 
   /* Video */
@@ -666,6 +677,7 @@ void HTSPDemuxer::ParseSubscriptionStart ( htsmsg_t *m )
 
   m_streamStat.clear();
   m_streams.clear();
+  m_rdsIdx = 0;
 
   Logger::Log(LogLevel::LEVEL_DEBUG, "demux subscription start");
 

diff --git a/src/tvheadend/HTSPDemuxer.h b/src/tvheadend/HTSPDemuxer.h
@@ -130,6 +130,7 @@ class HTSPDemuxer
   tvheadend::Subscription m_subscription;
   std::atomic<time_t> m_lastUse;
   std::atomic<time_t> m_startTime;
+  uint32_t m_rdsIdx;
 };
 
 } // namespace tvheadend