Ticket #5562: patch4_scanning.patch

libs/libmythtv/siscan.h

@@ -43 +43 @@
                public MPEGStreamListener,
                public ATSCMainStreamListener,
                public DVBMainStreamListener,
-               public SignalMonitorListener
+               public SignalMonitorListener,
+               public DVBOtherStreamListener
 {
     Q_OBJECT
   public:
@@ -105 +106 @@
     virtual void StatusSignalLock(const SignalMonitorValue&) { }
     virtual void StatusSignalStrength(const SignalMonitorValue&) { }
 
+    // DVB Other
+    void HandleNITo(const NetworkInformationTable*) {}
+    void HandleSDTo(uint tsid, const ServiceDescriptionTable*);
+    void HandleBAT(const BouquetAssociationTable*);
+
   public slots:
     void deleteLater(void);
 
@@ -191 +197 @@
     SCANMODE          scanMode;
     uint              signalTimeout;
     uint              channelTimeout;
+    uint              otherTableTimeout;
+    uint              otherTableTime;
+    bool              setOtherTables;
     QString           inputname;
 
     // Settable
@@ -213 +222 @@
     transport_scan_items_it_t   current;
     transport_scan_items_it_t   nextIt;
     QMap<uint, uint>            dvbChanNums;
+    QMap<uint64_t, QString>     defAuthorities;
 
     /// Scanner thread, runs SIScan::StartScanner()
     pthread_t        scanner_thread;

libs/libmythtv/siscan.cpp

@@ -92 +92 @@
       scanMode(IDLE),
       signalTimeout(signal_timeout),
       channelTimeout(channel_timeout),
+      otherTableTimeout(0),
+      otherTableTime(0),
+      setOtherTables(false),
       inputname(_inputname),
       // Settable
       isAnalog(false),
@@ -133 +136 @@
         data->AddMPEGListener(this);
         data->AddATSCMainListener(this);
         data->AddDVBMainListener(this);
+        data->AddDVBOtherListener(this);
     }
 }
 
@@ -148 +152 @@
     disconnect();
     StopScanner();
     VERBOSE(VB_SIPARSER, LOC + "SIScanner Stopped");
+    channel = 0; // Deleted by caller
     QObject::deleteLater();
 }
 
@@ -312 +317 @@
             .arg((*current).FriendlyName));
     VERBOSE(VB_SIPARSER, LOC + sdt->toString());
 
+    // If this is Astra 28.2 add start listening for Freesat BAT and SDTo
+    if (!setOtherTables && (sdt->OriginalNetworkID() == 2 || sdt->OriginalNetworkID() == 59))
+    {
+        GetDTVSignalMonitor()->GetScanStreamData()->SetOtherTablePid(FREESAT_SI_PID);
+        setOtherTables = true;
+        otherTableTimeout = 10000; // The whole BAT & SDTo group comes round in 10s
+        // Delay processing the SDT until we've seen BATs and SDTos
+        otherTableTime = timer.elapsed() + otherTableTimeout;
+    }
+
+    if (timer.elapsed() < otherTableTime)
+    {
+        // Set the version for the SDT so we see it again.
+        GetDTVSignalMonitor()->GetDVBStreamData()->SetVersionSDT(sdt->TSID(), -1, 0);
+    }
+
     HandleDVBDBInsertion(GetDTVSignalMonitor()->GetScanStreamData(), true);
 }
 
@@ -362 +383 @@
     HandleDVBDBInsertion(GetDTVSignalMonitor()->GetScanStreamData(), true);
 }
 
+void SIScan::HandleBAT(const BouquetAssociationTable *bat)
+{
+    VERBOSE(VB_SIPARSER, LOC +
+            QString("Got a Bouquet Association Table"));
+    VERBOSE(VB_SIPARSER, LOC + bat->toString());
+
+    otherTableTime = timer.elapsed() + otherTableTimeout;
+
+    for (uint i = 0; i < bat->TransportStreamCount(); i++)
+    {
+        uint tsid = bat->TSID(i);
+        uint netid = bat->OriginalNetworkID(i);
+        desc_list_t parsed =
+            MPEGDescriptor::Parse(bat->TransportDescriptors(i),
+                                  bat->TransportDescriptorsLength(i));
+        // Look for default authority
+        const unsigned char *def_auth =
+            MPEGDescriptor::Find(parsed, DescriptorID::default_authority);
+        const unsigned char *serv_list =
+            MPEGDescriptor::Find(parsed, DescriptorID::service_list);
+
+        if (def_auth && serv_list)
+        {
+            DefaultAuthorityDescriptor authority(def_auth);
+            ServiceListDescriptor services(serv_list);
+
+            for (uint j = 0; j < services.ServiceCount(); j++)
+            {
+               // If the default authority is given in the SDT this
+               // overrides any definition in the BAT (or in the NIT)
+               uint64_t index =
+                   ((uint64_t)netid << 32) | (tsid << 16) | services.ServiceID(j);
+               if (! defAuthorities.contains(index))
+                   defAuthorities[index] = authority.DefaultAuthority();
+            }
+        }
+    }
+}
+
+
+void SIScan::HandleSDTo(uint tsid, const ServiceDescriptionTable *sdt)
+{
+    VERBOSE(VB_SIPARSER, LOC +
+            QString("Got a Service Description Table (other)"));
+    VERBOSE(VB_SIPARSER, LOC + sdt->toString());
+
+    otherTableTime = timer.elapsed() + otherTableTimeout;
+
+    uint netid = sdt->OriginalNetworkID();
+
+    for (uint i = 0; i < sdt->ServiceCount(); i++)
+    {
+        uint serviceId = sdt->ServiceID(i);
+        desc_list_t parsed =
+            MPEGDescriptor::Parse(sdt->ServiceDescriptors(i),
+                                  sdt->ServiceDescriptorsLength(i));
+        // Look for default authority
+        const unsigned char *def_auth =
+            MPEGDescriptor::Find(parsed, DescriptorID::default_authority);
+        if (def_auth)
+        {
+            DefaultAuthorityDescriptor authority(def_auth);
+            defAuthorities[((uint64_t)netid << 32) | (tsid << 16) | serviceId] =
+                authority.DefaultAuthority();
+        }
+
+    }
+
+}
+
 void SIScan::HandleMPEGDBInsertion(const ScanStreamData *sd, bool)
 {
     // Try to determine if this might be "OpenCable" transport.
@@ -443 +534 @@
                                   bool wait_until_complete)
 {
     const DVBStreamData &dsd = (const DVBStreamData &)(*sd);
-    if (wait_until_complete && !(dsd.HasCachedSDT() && dsd.HasCachedAllNIT()))
+    if (wait_until_complete && !(dsd.HasCachedSDT() && dsd.HasCachedAllNIT()
+        && timer.elapsed() > (int)otherTableTime))
         return;
 
     emit ServiceScanUpdateText(tr("Updating Services"));
@@ -730 +822 @@
     emit ServiceScanUpdateStatusText(cur_chan);
     VERBOSE(VB_SIPARSER, LOC + tune_msg_str);
 
+    setOtherTables = false;
+    otherTableTime = 0;
+
     if (!Tune(transport))
     {   // If we did not tune successfully, bail with message
         UpdateScanPercentCompleted();
@@ -1473 +1568 @@
         const unsigned char *def_auth =
             MPEGDescriptor::Find(parsed, DescriptorID::default_authority);
         if (def_auth)
-            default_authority =
-                QString::fromAscii((const char*)def_auth+2, def_auth[1]);
+        {
+            DefaultAuthorityDescriptor authority(def_auth);
+            default_authority = authority.DefaultAuthority();
+        }
+        else
+        {
+            uint64_t index =
+                ((uint64_t)sdt->OriginalNetworkID() << 32) |
+                (sdt->TSID() << 16) | sdt->ServiceID(i);
+            if (defAuthorities.contains(index))
+                default_authority = defAuthorities[index];
+        }
 
         QString common_status_info = service_name;
 

libs/libmythtv/mpeg/scanstreamdata.h

@@ -27 +27 @@
                           uint_vec_t& /*del_pids*/) const { return false; }
 
     QString GetSIStandard(QString guess = "mpeg") const;
+
+    void SetOtherTablePid(int pid);
+
+  private:
+    int otherTablepid;
 };
 
 #endif // SCANSTREAMDATA_H_

libs/libmythtv/mpeg/scanstreamdata.cpp

@@ -7 +7 @@
 ScanStreamData::ScanStreamData()
     : MPEGStreamData(-1, true),
       ATSCStreamData(-1,-1, true),
-      DVBStreamData(0, 0, -1, true)
+      DVBStreamData(0, 0, -1, true),
+      otherTablepid(-1)
 {
 }
 
@@ -18 +19 @@
  */
 bool ScanStreamData::IsRedundant(uint pid, const PSIPTable &psip) const
 {
-    return (ATSCStreamData::IsRedundant(pid,psip) ||
-            DVBStreamData::IsRedundant(pid,psip));
+    if (ATSCStreamData::IsRedundant(pid,psip) ||
+        DVBStreamData::IsRedundant(pid,psip))
+        return true;
+    // Treat BAT and SDTo as redundant unless they are on the required PID.
+    if (psip.TableID() == TableID::BAT || psip.TableID() == TableID::SDTo)
+        return otherTablepid < 0 || pid != (uint)otherTablepid;
+    return false;
 }
 
 /** \fn ScanStreamData::HandleTables(uint, const PSIPTable&)
@@ -42 +48 @@
     AddListeningPID(ATSC_PSIP_PID);
     AddListeningPID(DVB_NIT_PID);
     AddListeningPID(DVB_SDT_PID);
+    if (otherTablepid >= 0)
+        AddListeningPID((uint)otherTablepid);
 }
 
 QString ScanStreamData::GetSIStandard(QString guess) const
@@ -79 +87 @@
 
     return "mpeg";
 }
+
+/** \fn ScanStreamData::SetOtherTablePid(int pid)
+ *  \brief Sets the PID to be used to receive BAT and SDTo tables
+ */
+void ScanStreamData::SetOtherTablePid(int pid)
+{
+    if (pid >= 0)
+        AddListeningPID((uint)pid);
+    otherTablepid = pid;
+}
+