Ticket #5530: 5530-v1.patch

libs/libmythtv/mpeg/dvbtables.cpp

@@ -148 +148 @@
         return false;
 }
 
+void BouquetAssociationTable::Parse(void)
+{
+    const unsigned char * p = psipdata()+8;
+    uint looplen, len = ((p[0] & 0x0F) << 8) | p[1]; // Name descriptor length
+    desc_list_t desc;
+    p += 2;
+    desc = MPEGDescriptor::ParseOnlyInclude(p, len, DescriptorID::bouquet_name);
+    if (desc.empty())
+    {
+        VERBOSE(VB_SIPARSER,"Curious: BAT without bouquet name!");
+    }
+    else
+    {
+        bouquet_name = QString::fromLatin1(
+            (const char*) (desc[0] + 2),
+            MPEGDescriptor(desc[0]).DescriptorLength());
+    }
+
+    p += len;
+    looplen = ((p[0] & 0x0F) << 8) | p[1];
+    p += 2; // Now point on first TS desc
+    while (looplen)
+    {
+        _ptrs.push_back(p);    // Add first TS position
+        p += 4;                // Skip TS and network ID
+        len = ((p[0] & 0x0F) << 8) | p[1]; // Get length of descriptors
+        p += 2;
+        looplen -= 6;
+        p += len;
+        looplen -= len;
+    }
+}
+
 void DVBEventInformationTable::Parse(void) const
 {
     _ptrs.clear();

libs/libmythtv/mpeg/dvbstreamdata.cpp

@@ -17 +17 @@
     : MPEGStreamData(desired_program, cacheTables),
       _desired_netid(desired_netid), _desired_tsid(desired_tsid),
       _dvb_eit_dishnet_long(false),
+      _dvb_eit_csatcaraibes(false),
       _nit_version(-2), _nito_version(-2)
 {
     SetVersionNIT(-1,0);
@@ -35 +36 @@
     _dvb_other_listeners.clear();
     _dvb_eit_listeners.clear();
     _dvb_has_eit.clear();
+    _dvb_bouquet_listeners.clear();
 }
 
 void DVBStreamData::SetDesiredService(uint netid, uint tsid, int serviceid)
@@ -264 +266 @@
 
             return true;
         }
+        case TableID::BAT:
+        {
+            // TODO
+            return true;
+        }
         case TableID::TDT:
         {
             TimeDateTable tdt(psip);
@@ -921 +928 @@
         }
     }
 }
+
+void DVBStreamData::AddDVBBouquetListener(DVBBouquetStreamListener *val)
+{
+    QMutexLocker locker(&_listener_lock);
+
+    dvb_bouquet_listener_vec_t::iterator it = _dvb_bouquet_listeners.begin();
+    for (; it != _dvb_bouquet_listeners.end(); ++it)
+        if (((void*)val) == ((void*)*it))
+            return;
+
+    _dvb_bouquet_listeners.push_back(val);
+}
+
+void DVBStreamData::RemoveDVBBouquetListener(DVBBouquetStreamListener *val)
+{
+    QMutexLocker locker(&_listener_lock);
+
+    dvb_bouquet_listener_vec_t::iterator it = _dvb_bouquet_listeners.begin();
+    for (; it != _dvb_bouquet_listeners.end(); ++it)
+    {
+        if (((void*)val) == ((void*)*it))
+        {
+            _dvb_bouquet_listeners.erase(it);
+            return;
+        }
+    }
+}

libs/libmythtv/mpeg/mpegtables.h

@@ -191 +191 @@
     PREMIERE_EIT_DIREKT_PID = 0x0b11,
     PREMIERE_EIT_SPORT_PID  = 0x0b12,
 
+    // Canal Sat longterm EIT is on pid 0x114 and 0x153
+    CSATCARAIBES_EIT_PID1 = 0x114,
+    //    CSATCARAIBES_EIT_PID2 = 0x153,
+
     ATSC_PSIP_PID = 0x1ffb,
 };
 
@@ -245 +249 @@
         ARIBbeg  = 0x80,
         ARIBend  = 0x8f,
 
+        // Canal Sat Caraibes Longterm EIT data
+        CSATCARAIBES_CHANNELS  = 0x90, // always on pid 0x114
+        CSATCARAIBES_THEMES    = 0x91, // always on pid 0x114
+        CSATCARAIBES_SCHED     = 0x92, // always on pid 0x114
+        CSATCARAIBES_SUMMARIES = 0x94, // always on pid 0x114
+
         // SCTE
         PIM      = 0xC0, // Program Information Message (57 2003) PMT PID
         PNM      = 0xC1, // Program Name Message (57 2003) PMT PID

libs/libmythtv/mpeg/streamlisteners.h

@@ -31 +31 @@
 class DirectedChannelChangeSelectionCodeTable;
 
 class NetworkInformationTable;
+class BouquetAssociationTable;
 class ServiceDescriptionTable;
 class TimeDateTable;
 class DVBEventInformationTable;
@@ -145 +146 @@
     virtual void HandleEIT(const PremiereContentInformationTable*) = 0;
 };
 
+class DVBBouquetStreamListener
+{
+  protected:
+    virtual ~DVBBouquetStreamListener() {}
+  public:
+    virtual void HandleBAT(const BouquetAssociationTable*)=0;
+};
 
 #endif // _STREAMLISTENERS_H_

libs/libmythtv/mpeg/dvbtables.h

@@ -164 +164 @@
     mutable vector<const unsigned char*> _ptrs; // used to parse
 };
 
+/** \class BouquetAssociationTable
+ *  \brief Tells what channels can be found on each transponder
+ *         for one bouquet (a bunch of channels from one provider)
+ *
+ *  Note: French Provider Canal+ uses this to associate channels
+ *  with an index used in their proprietary EIT
+ */
+class BouquetAssociationTable : public PSIPTable
+{
+    public:
+        BouquetAssociationTable(const PSIPTable& table) : PSIPTable(table)
+        {
+            assert(TableID::BAT == TableID());
+            Parse();
+        }
+        ~BouquetAssociationTable() { ; }
+
+        // table_id                 8   0.0       0x4a
+        // section_syntax_indicator 1   1.0          1
+        // reserved_future_use      1   1.1          1
+        // reserved                 2   1.2          3
+        // section_length          12   1.4          0
+        // Bouquet ID              16   3.0          0
+        // reserved                 2   5.0          3
+        // version_number           5   5.2          0
+        // current_next_indicator   1   5.7          1
+        // section_number           8   6.0       0x00
+        // last_section_number      8   7.0       0x00
+        // reserved                 4   8         0x0d
+        // Bouquet descriptors len 12   8.4
+        // for (i=0;i<N;i++)
+        // Descriptor();
+        // reserved                4 10+N.0
+        // Transport stream loop len 12
+        // for (i=0;i<N;i++) {
+        //   transport_stream_id    16
+        //   original_network_id    16
+        //   reserved                4
+        //   transport descriptor len 12
+        //   for (j=0;j<N;j++)
+        //     Descriptor();
+        //  }
+        //  crc                     32
+        uint TSID(uint i) const
+        { return (_ptrs[i][0] << 8) | _ptrs[i][1]; }
+
+        /// original_network_id    16   8.0
+        uint OriginalNetworkID(uint i) const
+        { return (_ptrs[i][2] << 8) | _ptrs[i][3]; }
+
+        /* Returns a pointer to the first descriptor following
+           the TS and Network ID, and the loop length */
+        const unsigned char * TransportDescriptors(uint i) const
+        { return _ptrs[i]+6; }
+        uint TransportDescriptorsLoopLength(uint i) const
+        { return ((_ptrs[i][4] & 0x0F) << 8) | _ptrs[i][5]; }
+        void Parse(void);
+        uint NBTransports() const
+        {
+            return _ptrs.size();
+        }
+        QString BouquetName() const
+        { return bouquet_name; }
+
+    private:
+        /* point on the transport descriptors */
+        mutable vector<const unsigned char*> _ptrs;
+        mutable QString bouquet_name;
+};
+
 class DiscontinuityInformationTable : public PSIPTable
 {
     DiscontinuityInformationTable(const PSIPTable& table) : PSIPTable(table)

libs/libmythtv/mpeg/dvbstreamdata.h

@@ -14 +14 @@
 typedef QMap<uint, sdt_ptr_t>    sdt_cache_t; // tsid+section->sdts
 typedef QMap<uint, sdt_vec_t>    sdt_map_t;   // tsid->sdts
 
-typedef vector<DVBMainStreamListener*>   dvb_main_listener_vec_t;
-typedef vector<DVBOtherStreamListener*>  dvb_other_listener_vec_t;
-typedef vector<DVBEITStreamListener*>    dvb_eit_listener_vec_t;
+typedef vector<DVBMainStreamListener*>    dvb_main_listener_vec_t;
+typedef vector<DVBOtherStreamListener*>   dvb_other_listener_vec_t;
+typedef vector<DVBEITStreamListener*>     dvb_eit_listener_vec_t;
+typedef vector<DVBBouquetStreamListener*> dvb_bouquet_listener_vec_t;
 
 typedef QMap<uint, bool>                 dvb_has_eit_t;
 
@@ -176 +177 @@
     void AddDVBMainListener(DVBMainStreamListener*);
     void AddDVBOtherListener(DVBOtherStreamListener*);
     void AddDVBEITListener(DVBEITStreamListener*);
+    void AddDVBBouquetListener(DVBBouquetStreamListener*);
 
     void RemoveDVBMainListener(DVBMainStreamListener*);
     void RemoveDVBOtherListener(DVBOtherStreamListener*);
     void RemoveDVBEITListener(DVBEITStreamListener*);
+    void RemoveDVBBouquetListener(DVBBouquetStreamListener*);
 
   private:
     // Caching
@@ -193 +196 @@
     
     /// Decode DishNet's long-term DVB EIT
     bool                      _dvb_eit_dishnet_long;
+    /// Decode Canal Satellite Caraibes DVB EIT
+    bool                      _dvb_eit_csatcaraibes;
     /// Tell us if the DVB service has EIT
     dvb_has_eit_t             _dvb_has_eit;
 
@@ -200 +205 @@
     dvb_main_listener_vec_t   _dvb_main_listeners;
     dvb_other_listener_vec_t  _dvb_other_listeners;
     dvb_eit_listener_vec_t    _dvb_eit_listeners;
+    dvb_bouquet_listener_vec_t _dvb_bouquet_listeners;
 
     // Table versions
     int                       _nit_version;