Ticket #5530: csat-dvbtables.diff

mythtv/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)

mythtv/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();
@@ -177 +203 @@
     // Dish Network Long Term Future Event Information for all transports
     is_eit |= (TableID::DN_EITbego <= table_id &&
                TableID::DN_EITendo >= table_id);
+    // Canal Satellite long term EIT for all transports
+    is_eit |= (table_id == TableID::CSATCARAIBES_CHANNELS ||
+               table_id == TableID::CSATCARAIBES_THEMES ||
+               table_id == TableID::CSATCARAIBES_SCHED ||
+               table_id == TableID::CSATCARAIBES_SUMMARIES);
 
     return is_eit;
 }