Ticket #5562: defaultauthority-trunk-r23491.patch

mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp

@@ -146 +146 @@
       sourceID(_sourceID),
       signalTimeout(signal_timeout),
       channelTimeout(channel_timeout),
+      otherTableTimeout(0),
+      otherTableTime(0),
+      setOtherTables(false),
       inputname(_inputname),
       m_test_decryption(test_decryption),
       extend_scan_list(false),
@@ -190 +193 @@
         data->AddMPEGListener(this);
         data->AddATSCMainListener(this);
         data->AddDVBMainListener(this);
+        data->AddDVBOtherListener(this);
     }
 }
 
@@ -375 +379 @@
     UpdateChannelInfo(true);
 }
 
-void ChannelScanSM::HandleSDT(uint, const ServiceDescriptionTable *sdt)
+void ChannelScanSM::HandleSDT(uint tsid, const ServiceDescriptionTable *sdt)
 {
     VERBOSE(VB_CHANSCAN, LOC +
             QString("Got a Service Description Table for %1")
             .arg((*current).FriendlyName) + "\n" + 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;
+
+        VERBOSE(VB_CHANSCAN, LOC + QString("SDT has OriginalNetworkID %1, look for "
+                                            "additional Freesat SI").arg(sdt->OriginalNetworkID()));
+    }
+
+    if (timer.elapsed() < otherTableTime)
+    {
+        // Set the version for the SDT so we see it again.
+        GetDTVSignalMonitor()->GetDVBStreamData()->SetVersionSDT(sdt->TSID(), -1, 0);
+    }
+
     uint id = sdt->OriginalNetworkID() << 16 | sdt->TSID();
     ts_scanned.insert(id);
 
@@ -404 +427 @@
     UpdateChannelInfo(true);
 }
 
+void ChannelScanSM::HandleBAT(const BouquetAssociationTable *bat)
+{
+    VERBOSE(VB_CHANSCAN, LOC + "Got a Bouquet Association Table\n" +
+            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)
+                VERBOSE(VB_IMPORTANT, LOC + QString("found default authority(BAT) "
+                                                    "for service %1 %2 %3")
+                        .arg(netid).arg(tsid).arg(services.ServiceID(j)));
+               uint64_t index =
+                   ((uint64_t)netid << 32) | (tsid << 16) | services.ServiceID(j);
+               if (! defAuthorities.contains(index))
+                   defAuthorities[index] = authority.DefaultAuthority();
+            }
+        }
+    }
+}
+
+void ChannelScanSM::HandleSDTo(uint tsid, const ServiceDescriptionTable *sdt)
+{
+    VERBOSE(VB_CHANSCAN, LOC + "Got a Service Description Table (other)\n" +
+            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);
+            VERBOSE(VB_IMPORTANT, LOC + QString("found default authority(SDTo) "
+                                                "for service %1 %2 %3")
+                    .arg(netid).arg(tsid).arg(serviceId));
+            defAuthorities[((uint64_t)netid << 32) | (tsid << 16) | serviceId] =
+                authority.DefaultAuthority();
+        }
+    }
+}
+
 void ChannelScanSM::HandleEncryptionStatus(uint pnum, bool encrypted)
 {
     currentEncryptionStatus[pnum] = encrypted ? kEncEncrypted : kEncDecrypted;
@@ -660 +754 @@
     }
 
     // DVB
-    if ((!wait_until_complete || sd->HasCachedAllNIT()) && currentInfo->nits.empty())
+    if ((!wait_until_complete || sd->HasCachedAllNIT()) && (currentInfo->nits.empty() ||
+        timer.elapsed() > (int)otherTableTime))
+    {
         currentInfo->nits = sd->GetCachedNIT();
+    }
 
     sdt_vec_t sdttmp = sd->GetCachedSDTs();
     tsid_checked.clear();
@@ -823 +920 @@
         currentEncryptionStatus.clear();
         currentEncryptionStatusChecked.clear();
 
+        setOtherTables = false;
+        otherTableTime = 0;
+
         if (scanning)
         {
             transportsScanned++;
@@ -886 +986 @@
 }
 
 static void update_info(ChannelInsertInfo &info,
-                        const ServiceDescriptionTable *sdt, uint i)
+                        const ServiceDescriptionTable *sdt, uint i,
+                        const QMap<uint64_t, QString> &defAuthorities)
 {
     // HACK beg -- special exception for this network
     //             (dbver == "1067")
@@ -925 +1026 @@
         (desc && !desc->IsDTV() && !desc->IsDigitalAudio());
     info.is_audio_service = (desc && desc->IsDigitalAudio());
 
+    info.service_id = sdt->ServiceID(i);
     info.sdt_tsid   = sdt->TSID();
     info.orig_netid = sdt->OriginalNetworkID();
     info.in_sdt     = true;
@@ -938 +1040 @@
     if (def_auth)
     {
         DefaultAuthorityDescriptor authority(def_auth);
+        VERBOSE(VB_IMPORTANT, QString("found default authority(SDT) "
+                                            "for service %1 %2 %3")
+                .arg(info.orig_netid).arg(info.sdt_tsid).arg(info.service_id));
         info.default_authority = authority.DefaultAuthority();
     }
+    else
+    {
+        uint64_t index = (uint64_t)info.orig_netid << 32 |
+                        info.sdt_tsid << 16 | info.service_id;
+        if (defAuthorities.contains(index))
+            info.default_authority = defAuthorities[index];
+    }
 }
 
 uint ChannelScanSM::GetCurrentTransportInfo(
@@ -1090 +1202 @@
             {
                 uint pnum = (*sdt_it)->ServiceID(i);
                 PCM_INFO_INIT("dvb");
-                update_info(info, *sdt_it, i);
+                update_info(info, *sdt_it, i, defAuthorities);
             }
         }
     }

mythtv/libs/libmythtv/channelscan/channelscan_sm.h

@@ -81 +81 @@
 
 class ChannelScanSM : public MPEGStreamListener,
                       public ATSCMainStreamListener,
-                      public DVBMainStreamListener
+                      public DVBMainStreamListener,
+                      public DVBOtherStreamListener
 {
     friend class AnalogSignalHandler;
 
@@ -144 +145 @@
     void HandleSDT(uint tsid, const ServiceDescriptionTable*);
     void HandleTDT(const TimeDateTable*) {}
 
+    // DVB Other
+    void HandleNITo(const NetworkInformationTable*) {}
+    void HandleSDTo(uint tsid, const ServiceDescriptionTable*);
+    void HandleBAT(const BouquetAssociationTable*);
+
   private:
     // some useful gets
     DTVChannel       *GetDTVChannel(void);
@@ -201 +207 @@
     int               sourceID;
     uint              signalTimeout;
     uint              channelTimeout;
+    uint              otherTableTimeout;
+    uint              otherTableTime;
+    bool              setOtherTables;
     QString           inputname;
     bool              m_test_decryption;
     bool              extend_scan_list;
@@ -224 +233 @@
     bool                        currentTestingDecryption;
     QMap<uint, uint>            currentEncryptionStatus;
     QMap<uint, bool>            currentEncryptionStatusChecked;
+    QMap<uint64_t, QString>     defAuthorities;
 
     /// Found Channel Info
     ChannelList       channelList;

mythtv/libs/libmythtv/mpeg/scanstreamdata.cpp

@@ -8 +8 @@
     : MPEGStreamData(-1, true),
       ATSCStreamData(-1,-1, true),
       DVBStreamData(0, 0, -1, true),
-      dvb_uk_freesat_si(false)
+      otherTablepid(-1)
 {
 }
 
@@ -19 +19 @@
  */
 bool ScanStreamData::IsRedundant(uint pid, const PSIPTable &psip) const
 {
-    // Treat BAT and SDTo as redundant unless they are on the FREESAT_SI_PID
-    if (dvb_uk_freesat_si &&
-        (psip.TableID() == TableID::BAT || psip.TableID() == TableID::SDTo))
-        return pid != FREESAT_SI_PID;
-
-    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&)
@@ -48 +48 @@
     AddListeningPID(ATSC_PSIP_PID);
     AddListeningPID(DVB_NIT_PID);
     AddListeningPID(DVB_SDT_PID);
-    if (dvb_uk_freesat_si)
-        AddListeningPID(FREESAT_SI_PID);
+    if (otherTablepid >= 0)
+        AddListeningPID((uint)otherTablepid);
 }
 
 QString ScanStreamData::GetSIStandard(QString guess) const
@@ -88 +88 @@
     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;
+}
 
 bool ScanStreamData::DeleteCachedTable(PSIPTable *psip) const
 {

mythtv/libs/libmythtv/mpeg/scanstreamdata.h

@@ -28 +28 @@
 
     QString GetSIStandard(QString guess = "mpeg") const;
 
-    void SetFreesatAdditionalSI(bool freesat_si);
+    void SetOtherTablePid(int pid); 
 
   private:
     virtual bool DeleteCachedTable(PSIPTable *psip) const;  
     /// listen for addiotional Freesat service information
-    int dvb_uk_freesat_si;
+    int otherTablepid;;
 };
 
-inline void ScanStreamData::SetFreesatAdditionalSI(bool freesat_si)
-{
-    QMutexLocker locker(&_listener_lock);
-    dvb_uk_freesat_si = freesat_si;
-}
+
 
 #endif // SCANSTREAMDATA_H_