Ticket #9480: eit_pl.110307.diff

mythtv/libs/libmythtv/eitfixup.h

@@ -53 +53 @@
         kFixDish       = 0x40000,
 
         // Early fixups
-        kEFixForceISO8859_1  = 0x2000,
-        kEFixForceISO8859_15 = 0x4000,
+        kEFixForceISO8859_1  =  0x2000,
+        kEFixForceISO8859_15 =  0x4000,
+        kEFixForceISO6937    =  0x8000,
+        kEFixForceISO8859_2  = 0x10000,
     };
 
     EITFixUp();

mythtv/libs/libmythtv/eithelper.cpp

@@ -229 +229 @@
             list, DescriptorID::short_event, languagePreferences);
 
     unsigned char enc_1[3]  = { 0x10, 0x00, 0x01 };
+    unsigned char enc_2[3]  = { 0x10, 0x00, 0x02 };
     unsigned char enc_15[3] = { 0x10, 0x00, 0x0f };
+    unsigned char enc_0[1]  = { 0x20 };
     int enc_len = 0;
     const unsigned char *enc = NULL;
+    
+    // Use an encoding override of ISO 6937
+    if (fix & EITFixUp::kEFixForceISO6937)
+    {
+        enc = enc_0;
+        enc_len = sizeof(enc_0);
+    }
 
     // Is this BellExpressVU EIT (Canada) ?
     // Use an encoding override of ISO 8859-1 (Latin1)
@@ -240 +249 @@
         enc = enc_1;
         enc_len = sizeof(enc_1);
     }
+    
+    // Use an encoding override of ISO 8859-2 (Latin2)
+    if (fix & EITFixUp::kEFixForceISO8859_2)
+    {
+        enc = enc_2;
+        enc_len = sizeof(enc_2);
+    }
 
     // Is this broken DVB provider in Western Europe?
     // Use an encoding override of ISO 8859-15 (Latin6)
@@ -248 +264 @@
         enc = enc_15;
         enc_len = sizeof(enc_15);
     }
+    
+    
 
     if (bestShortEvent)
     {
@@ -304 +322 @@
 void EITHelper::AddEIT(const DVBEventInformationTable *eit)
 {
     uint descCompression = (eit->TableID() > 0x80) ? 2 : 1;
-    uint fix = fixup.value(eit->OriginalNetworkID() << 16);
+    uint fix = EITFixUp::kFixGenericDVB;
+    if (eit->SourceNetworkID() && eit->SourceTransportID()) {
+        fix |= fixup[1<<15 | eit->SourceNetworkID() << 16];
+        fix |= fixup[1<<15 | (((uint64_t)eit->SourceTransportID()) << 32) |
+                     (eit->SourceNetworkID() << 16)];
+        fix |= fixup[1<<15 | (eit->SourceNetworkID() << 16) | eit->ServiceID()];
+        fix |= fixup[1<<15 | (((uint64_t)eit->SourceTransportID()) << 32) |
+                     (uint64_t)(eit->SourceNetworkID() << 16) |
+                     (uint64_t)eit->ServiceID()];
+    }
+
+    fix |= fixup[eit->OriginalNetworkID() << 16];
     fix |= fixup.value((((uint64_t)eit->TSID()) << 32) |
                  (eit->OriginalNetworkID() << 16));
     fix |= fixup.value((eit->OriginalNetworkID() << 16) | eit->ServiceID());
     fix |= fixup.value((((uint64_t)eit->TSID()) << 32) |
                  (uint64_t)(eit->OriginalNetworkID() << 16) |
-                  (uint64_t)eit->ServiceID());
-    fix |= EITFixUp::kFixGenericDVB;
+                                  (uint64_t)eit->ServiceID());
 
     uint chanid = GetChanID(eit->ServiceID(), eit->OriginalNetworkID(),
                             eit->TSID());
@@ -772 +800 @@
     ///////////////////////////////////////////////////////////////////////////
     // Fixups to make EIT provided listings more useful
     // transport_id<<32 | netword_id<<16 | service_id
+    // The service_id is a 13-bit field. Free bit number 15 
+    // is used here to determine that the data releate to 
+    // transponder, which sent the EIT, and not the program.
 
     // Bell Express VU Canada
     fix[  256U << 16] = EITFixUp::kFixBell;
@@ -960 +991 @@
 
     // Premiere
     fix[133 << 16] = EITFixUp::kEFixForceISO8859_15;
-
+    
+    // Cyfra+ ISO-6937 (source NID)
+    fix[1<<15 | 318<<16] = EITFixUp::kEFixForceISO6937;
+    
+    // Polsat ISO-8859-2 (source NID)
+    fix[1<<15 | 113<<16] = EITFixUp::kEFixForceISO8859_2;
+    
     // DVB-S Astra 19.2E French channels
     fix[     1022LL << 32 | 1 << 16 |  6901 ] = // DIRECT 8
         fix[ 1022LL << 32 | 1 << 16 |  6905 ] = // France 24 (en Francais)

mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp

@@ -90 +90 @@
     // would be used copy the override encoding in front of the text
     unsigned char dst[raw_length + encoding_override_length];
     uint length = 0;
-    if (encoding_override && src[0] >= 0x20) {
-        memcpy(dst, encoding_override, encoding_override_length);
-        length = encoding_override_length;
+    if (encoding_override) {
+        if (src[0] >= 0x20) {
+            memcpy(dst, encoding_override, encoding_override_length);
+            length = encoding_override_length;
+        } else {
+            //incorrect ISO-8859 encoding marker, 
+            //when text has been encoded using ISO-6937
+            if (src[0] >= 0x01 && src[0] <= 0x0B
+                    && encoding_override_length == 1
+                    && encoding_override[0] == 0x20) {
+                src++;
+                raw_length--;
+            }
+        }
     }
 
     // Strip formatting characters

mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp

@@ -368 +368 @@
         SetVersionEIT(psip.TableID(), service_id, psip.Version(),  psip.LastSection());
         SetEITSectionSeen(psip.TableID(), service_id, psip.Section());
 
-        DVBEventInformationTable eit(psip);
+        DVBEventInformationTable eit(psip, _desired_netid, _desired_tsid);
         for (uint i = 0; i < _dvb_eit_listeners.size(); i++)
             _dvb_eit_listeners[i]->HandleEIT(&eit);
 

mythtv/libs/libmythtv/mpeg/dvbtables.h

@@ -280 +280 @@
 class DVBEventInformationTable : public PSIPTable
 {
   public:
+    DVBEventInformationTable(const PSIPTable& table,
+                             uint SourceNetworkID, 
+                             uint SourceTransportID) : PSIPTable(table)
+    {
+        _source_netid = SourceNetworkID,
+        _source_tsid  = SourceTransportID;
+        assert(IsEIT(TableID()));
+        Parse();
+    }
     DVBEventInformationTable(const PSIPTable& table) : PSIPTable(table)
     {
     // table_id                 8   0.0       0xC7
@@ -357 +366 @@
     void Parse(void) const;
 
     static bool IsEIT(uint table_id);
+    
+    uint SourceNetworkID(void)   const { return _source_netid; }
+    uint SourceTransportID(void) const { return _source_tsid;  }
+    bool ActualTS() const {
+        return (TableID() == TableID::PF_EIT)
+                || ((TableID() > TableID::SC_EITbeg) 
+                     && (TableID() < TableID::SC_EITend));
+    }
+
 
   private:
     mutable vector<const unsigned char*> _ptrs; // used to parse
+    uint _source_netid;
+    uint _source_tsid;
 };
 
 /** \class TimeDateTable