Ticket #5562: t5562_default_authority_r21554.diff

mythtv/libs/libmythtv/channelscan/channelimporter.cpp

@@ -358 +358 @@
                         chan.atsc_minor_channel,
                         chan.use_on_air_guide,
                         chan.hidden, chan.hidden_in_guide,
-                        chan.freqid);
+                        chan.freqid,
+                        QString::null,
+                        QString::null,
+                        QString::null,
+                        chan.default_authority);
                 }
             }
 
@@ -484 +488 @@
                     chan.atsc_minor_channel,
                     chan.use_on_air_guide,
                     chan.hidden, chan.hidden_in_guide,
-                    chan.freqid);
+                    chan.freqid,
+                    QString::null,
+                    QString::null,
+                    QString::null,
+                    chan.default_authority);
             }
 
             if (filter)

mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp

@@ -63 +63 @@
 /// 10 seconds, so lets wait at least 30 seconds, in
 /// case of bad transmitter or lost packets.
 const uint ChannelScanSM::kDVBTableTimeout  = 30 * 1000;
+/// The whole BAT & SDTo group comes round in 10s, so wait additional
+/// 12 seconds to kDVBTableTimeout
+const uint ChannelScanSM::kDVBoTableTimeout = ChannelScanSM::kDVBTableTimeout +
+                                              12 * 1000;
 /// No logic here, lets just wait at least 10 seconds.
 const uint ChannelScanSM::kATSCTableTimeout = 10 * 1000;
 /// No logic here, lets just wait at least 15 seconds.
@@ -150 +154 @@
       scanning(false),
       threadExit(false),
       waitingForTables(false),
+      wait_for_dvbo(false),
       // Transports List
       transportsScanned(0),
       currentTestingDecryption(false),
@@ -185 +190 @@
         data->AddMPEGListener(this);
         data->AddATSCMainListener(this);
         data->AddDVBMainListener(this);
+        data->AddDVBOtherListener(this);
     }
 }
 
@@ -370 +376 @@
     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")
@@ -396 +402 @@
             QString("Got a Network Information Table for %1")
             .arg((*current).FriendlyName) + "\n" + nit->toString());
 
+    uint netid = nit->NetworkID();
+
+    // If this is Astra 28.2 add start listening for Freesat BAT and SDTo
+    if (!wait_for_dvbo && (netid == 2 || netid == 59))
+    {
+        VERBOSE(VB_IMPORTANT, LOC + QString("NIT has NetworkID %1, look for "
+                                            "additional Freesat SI").arg(netid));
+        GetDTVSignalMonitor()->GetScanStreamData()->SetFreesatAdditionalSI(true);
+        wait_for_dvbo = true;
+    }
+
+    UpdateChannelInfo(true);
+}
+
+void ChannelScanSM::HandleBAT(const BouquetAssociationTable *bat)
+{
+    VERBOSE(VB_CHANSCAN, LOC + "Got a Bouquet Association Table\n" +
+            bat->toString());
+
+    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();
+            }
+        }
+    }
+    wait_for_dvbo = false;
+    UpdateChannelInfo(true);
+}
+
+void ChannelScanSM::HandleSDTo(uint tsid, const ServiceDescriptionTable *sdt)
+{
+    VERBOSE(VB_CHANSCAN, LOC + "Got a Service Description Table (other)\n" +
+            sdt->toString());
+
+    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();
+        }
+    }
     UpdateChannelInfo(true);
 }
 
@@ -650 +737 @@
             transport_tune_complete &=
                 (!currentInfo->tvcts.empty() || !currentInfo->cvcts.empty());
         }
-        if (sd->HasCachedAnyNIT() || sd->HasCachedAnySDTs())
+        if (sd->HasCachedAnyNIT() || sd->HasCachedAnySDTs() || wait_for_dvbo)
         {
             transport_tune_complete &= !currentInfo->nits.empty();
             transport_tune_complete &= !currentInfo->sdts.empty();
+            transport_tune_complete &= !wait_for_dvbo;
         }
         if (transport_tune_complete)
         {
@@ -783 +871 @@
 
         currentEncryptionStatus.clear();
         currentEncryptionStatusChecked.clear();
+        wait_for_dvbo = false;
 
         if (scanning)
         {
@@ -847 +936 @@
 }
 
 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")
@@ -886 +976 @@
         (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;
+
+    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, 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(
@@ -1039 +1152 @@
             {
                 uint pnum = (*sdt_it)->ServiceID(i);
                 PCM_INFO_INIT("dvb");
-                update_info(info, *sdt_it, i);
+                update_info(info, *sdt_it, i, defAuthorities);
             }
         }
     }
@@ -1293 +1406 @@
             return timer.elapsed() > (int) kDVBTableTimeout;
         if (sd->HasCachedMGT() || sd->HasCachedAnyVCTs())
             return timer.elapsed() > (int) kATSCTableTimeout;
-        if (sd->HasCachedAnyPAT() || sd->HasCachedAnyPMTs())
+        if (sd->HasCachedAnyPAT() || sd->HasCachedAnyPMTs() || wait_for_dvbo)
             return timer.elapsed() > (int) kMPEGTableTimeout;
 
         return true;

mythtv/libs/libmythtv/channelscan/channelscan_sm.h

@@ -82 +82 @@
 
 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);
@@ -188 +194 @@
     static QString loc(const ChannelScanSM*);
 
     static const uint kDVBTableTimeout;
+    static const uint kDVBoTableTimeout;
     static const uint kATSCTableTimeout;
     static const uint kMPEGTableTimeout;
 
@@ -209 +216 @@
     bool              waitingForTables;
     QTime             timer;
 
+    bool              wait_for_dvbo;
     // Transports List
     int                         transportsScanned;
     QSet<uint32_t>              ts_scanned;
@@ -219 +227 @@
     bool                        currentTestingDecryption;
     QMap<uint, uint>            currentEncryptionStatus;
     QMap<uint, bool>            currentEncryptionStatusChecked;
+    QMap<uint64_t, QString>     defAuthorities;
 
     /// Found Channel Info
     ChannelList       channelList;

mythtv/libs/libmythtv/channelscan/scaninfo.cpp

@@ -119 +119 @@
             "    in_pat,             in_pmt,             in_vct,             "
             "    in_nit,             in_sdt,             is_encrypted,       "
             "    is_data_service,    is_audio_service,   is_opencable,       "
-            "    could_be_opencable, decryption_status "
+            "    could_be_opencable, decryption_status,  default_authority   "
             "FROM channelscan_channel "
             "WHERE transportid = :TRANSPORTID");
         query2.bindValue(":TRANSPORTID", query.value(15).toUInt());
@@ -178 +178 @@
                 query2.value(31).toBool()/*is_audio_service*/,
                 query2.value(32).toBool()/*is_opencable*/,
                 query2.value(33).toBool()/*could_be_opencable*/,
-                query2.value(34).toInt()/*decryption_status*/);
+                query2.value(34).toInt()/*decryption_status*/,
+                query2.value(35).toString()/*default_authority*/);
 
             mux.channels.push_back(chan);
         }

mythtv/libs/libmythtv/dbchannelinfo.cpp

@@ -170 +170 @@
         "    in_pat,             in_pmt,             in_vct,             "
         "    in_nit,             in_sdt,             is_encrypted,       "
         "    is_data_service,    is_audio_service,   is_opencable,       "
-        "    could_be_opencable, decryption_status                       "
+        "    could_be_opencable, decryption_status,  default_authority   "
         " )  "
         "VALUES "
         " ( :SCANID,            :TRANSPORTID,                            "
@@ -185 +185 @@
         "   :IN_PAT,            :IN_PMT,            :IN_VCT,             "
         "   :IN_NIT,            :IN_SDT,            :IS_ENCRYPTED,       "
         "   :IS_DATA_SERVICE,   :IS_AUDIO_SERVICE,  :IS_OPEBCABLE,       "
-        "   :COULD_BE_OPENCABLE,:DECRYPTION_STATUS                       "
+        "   :COULD_BE_OPENCABLE,:DECRYPTION_STATUS, :DEFAULT_AUTHORITY   "
         " );");
 
     query.bindValue(":SCANID", scanid);
@@ -225 +225 @@
     query.bindValue(":IS_OPEBCABLE", is_opencable);
     query.bindValue(":COULD_BE_OPENCABLE", could_be_opencable);
     query.bindValue(":DECRYPTION_STATUS", decryption_status);
+    query.bindValue(":DEFAULT_AUTHORITY", default_authority);
 
     if (!query.exec())
     {
@@ -254 +255 @@
     bool    _in_nit,             bool    _in_sdt,
     bool    _is_encrypted,       bool    _is_data_service,
     bool    _is_audio_service,   bool    _is_opencable,
-    bool    _could_be_opencable, int     _decryption_status) :
+    bool    _could_be_opencable, int     _decryption_status,
+    QString _default_authority) :
     db_mplexid(_db_mplexid),
     source_id(_source_id),
     channel_id(_channel_id),
@@ -271 +273 @@
     icon(_icon),
     format(_format),
     xmltvid(_xmltvid),
+    default_authority(_default_authority),
     pat_tsid(_pat_tsid),
     vct_tsid(_vct_tsid),
     vct_chan_tsid(_vct_chan_tsid),
@@ -298 +301 @@
     icon.detach();
     format.detach();
     xmltvid.detach();
+    default_authority.detach();
     si_standard.detach();
 }
 
@@ -320 +324 @@
     icon               = other.icon;        icon.detach();
     format             = other.format;      format.detach();
     xmltvid            = other.xmltvid;     xmltvid.detach();
+    default_authority  = other.default_authority; default_authority.detach();
 
     // non-DB info
     pat_tsid           = other.pat_tsid;
@@ -391 +396 @@
     {
         xmltvid            = other.xmltvid;     xmltvid.detach();
     }
+    if (!other.default_authority.isEmpty() && default_authority.isEmpty())
+    {
+        default_authority  = other.default_authority; default_authority.detach();
+    }
     // non-DB info
     if (other.pat_tsid && !pat_tsid)
         pat_tsid           = other.pat_tsid;

mythtv/libs/libmythtv/dbchannelinfo.h

@@ -90 +90 @@
         hidden(false), hidden_in_guide(false),
         freqid(QString::null), icon(QString::null),
         format(QString::null), xmltvid(QString::null),
+        default_authority(QString::null),
         pat_tsid(0), vct_tsid(0), vct_chan_tsid(0), sdt_tsid(0),
         orig_netid(0), netid(0),
         si_standard(QString::null),
@@ -128 +129 @@
 
         bool    _is_encrypted,       bool    _is_data_service,
         bool    _is_audio_service,   bool    _is_opencable,
-        bool    _could_be_opencable, int     _decryption_status);
+        bool    _could_be_opencable, int     _decryption_status,
+        QString _default_authority);
 
     ChannelInsertInfo(const ChannelInsertInfo &other) { (*this = other); }
     ChannelInsertInfo &operator=(const ChannelInsertInfo &other);
@@ -156 +158 @@
     QString icon;
     QString format;
     QString xmltvid;
+    QString default_authority;
 
     // non-DB info
     uint    pat_tsid;

mythtv/libs/libmythtv/dtvmultiplex.cpp

@@ -429 +429 @@
         "       c.serviceid,     c.atsc_major_chan, c.atsc_minor_chan, "
         "       c.useonairguide, c.visible,         c.freqid,          "
         "       c.icon,          c.tvformat,        c.xmltvid,         "
-        "       d.transportid,   d.networkid                           "
+        "       d.transportid,   d.networkid,       c.default_authority "
         "FROM channel AS c, dtv_multiplex AS d "
         "WHERE c.mplexid = :MPLEXID AND"
         "      c.mplexid = d.mplexid");
@@ -459 +459 @@
             QString::null,
             false, false, false, false,
             false, false, false, false,
-            false, false, false, 0);
+            false, false, false, 0,
+            query.value(18).toString() /* default_authority */);
 
         channels.push_back(chan);
     }

mythtv/libs/libmythtv/dvbstreamhandler.cpp

@@ -462 +462 @@
 
 bool DVBStreamHandler::AddPIDFilter(PIDInfo *info)
 {
-#ifdef DEBUG_PID_FILTERS
-    VERBOSE(VB_RECORD, LOC + QString("AddPIDFilter(0x%1) priority %2")
+//#ifdef DEBUG_PID_FILTERS
+    VERBOSE(VB_IMPORTANT, LOC + QString("AddPIDFilter(0x%1) priority %2")
             .arg(info->_pid, 0, 16).arg(GetPIDPriority(info->_pid)));
-#endif // DEBUG_PID_FILTERS
+//#endif // DEBUG_PID_FILTERS
 
     QMutexLocker writing_locker(&_pid_lock);
     _pid_info[info->_pid] = info;