Ticket #579: mythtv_fix_eit_extended_events_lang_selection.diff

libs/libmythtv/siparser.cpp

@@ -1409 +1409 @@
     // Loop through table (last 4 bytes are CRC)
     while (pos + 4 < size)
     {
+        uint bestPrioritySE = UINT_MAX;
+        uint bestPriorityEE = UINT_MAX;
+
         // Event to use temporarily to fill in data
         Event event;
         event.ServiceID   = head->table_id_ext;
@@ -1447 +1450 @@
         while ((des_pos < (pos + descriptors_length)) && (des_pos <= size)) 
         { 
             des_pos += ProcessDVBEventDescriptors(
-                &buffer[des_pos], bestDescriptorSE, bestDescriptorsEE, event);
+                &buffer[des_pos], bestDescriptorSE, bestDescriptorsEE, event,
+                bestPrioritySE, bestPriorityEE);
         }
 
         // Parse extended event descriptions for the most preferred language
@@ -1954 +1958 @@
     const unsigned char          *data,
     const unsigned char*         &bestDescriptorSE, 
     vector<const unsigned char*> &bestDescriptorsEE,
-    Event                        &event)
+    Event                        &event,
+    uint                         &bestPrioritySE,
+    uint                         &bestPriorityEE)
 {
-    QString bestLanguageSE   = "";
-    uint    bestPrioritySE   = UINT_MAX;
-
-    QString bestLanguageEE   = "";
-    uint    bestPriorityEE   = UINT_MAX;
-
     uint    descriptorTag    = data[0];
     uint    descriptorLength = data[1];
 
@@ -1978 +1978 @@
             {
                 // add the descriptor, and update the language
                 bestDescriptorSE = data;
-                bestLanguageSE   = language;
             }
         }
         break;
@@ -1994 +1993 @@
 
             QString language = ParseDescLanguage(data+3, descriptorLength-1);
             uint    priority = GetLanguagePriority(language);
-            bestPriorityEE   = min(bestPriorityEE, priority);
 
+            if (priority < bestPriorityEE)
+            {
+                // found a language with better priority
+                // don't keep things from the wrong language
+                bestDescriptorsEE.clear();
+                bestPriorityEE = priority;
+            }
+
             if (priority == bestPriorityEE)
             {
-                // don't keep things from the wrong language
-                if (bestLanguageEE != language)
-                    bestDescriptorsEE.clear();
                 // make sure the vector is big enough
                 bestDescriptorsEE.resize(last_desc_number + 1);
                 // add the descriptor, and update the language
                 bestDescriptorsEE[desc_number] = data;
-                bestLanguageEE                 = language;
             }
         }
         break;

libs/libmythtv/siparser.h

@@ -176 +176 @@
         const unsigned char          *data,
         const unsigned char*         &bestDescriptorSE, 
         vector<const unsigned char*> &bestDescriptorsEE,
-        Event                        &event);
+        Event                        &event,
+        uint                         &bestPrioritySE,
+        uint                         &bestPriorityEE);
 
     void ProcessContentDescriptor       (const uint8_t*, uint sz, Event &e);
     void ProcessShortEventDescriptor    (const uint8_t*, uint sz, Event &e);