Ticket #9429: subtitle_menu.patch

mythtv/libs/libmythtv/DVD/avformatdecoderdvd.cpp

@@ -53 +53 @@
 
     if (tracks[kTrackTypeSubtitle].size() > 0)
     {
+        map<int,uint> lang_sub_cnt;
         stable_sort(tracks[kTrackTypeSubtitle].begin(),
                     tracks[kTrackTypeSubtitle].end());
+
+        // Get all subtitle tracks from the DVD and filter out any other tracks
+        // reported by ffmpeg
+        sinfo_vec_t filteredTracks;
+        for (unsigned int i = 0; i < 32; ++i)
+        {
+            int track = ringBuffer->DVD()->GetSubtitleTrackNum(i);
+            if (track >= 0 &&
+                track < (int)tracks[kTrackTypeSubtitle].size())
+            {
+                int lang = ringBuffer->DVD()->GetSubtitleLanguage(i);
+                int lang_indx = lang_sub_cnt[lang]++;
+                filteredTracks.push_back(tracks[kTrackTypeSubtitle][track]);
+                filteredTracks.back().language = lang;
+                filteredTracks.back().language_index = lang_indx;
+            }
+        }
+
+        tracks[kTrackTypeSubtitle] = filteredTracks;
+
         sinfo_vec_t::iterator it = tracks[kTrackTypeSubtitle].begin();
         for(; it != tracks[kTrackTypeSubtitle].end(); ++it)
         {
@@ -62 +83 @@
                 QString("DVD Subtitle Track Map Stream id #%1 ")
                     .arg(it->stream_id));
         }
-        stable_sort(tracks[kTrackTypeSubtitle].begin(),
-                    tracks[kTrackTypeSubtitle].end());
+
         int trackNo = ringBuffer->DVD()->GetTrack(kTrackTypeSubtitle);
         uint captionmode = m_parent->GetCaptionMode();
         int trackcount = (int)GetTrackCount(kTrackTypeSubtitle);

mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp

@@ -1574 +1574 @@
     return ConvertLangCode(lang);
 }
 
+/** \brief get the logical subtitle track/stream number from the dvd
+ * \param stream_index the stream index, range 0-31
+ */
+int DVDRingBuffer::GetSubtitleTrackNum(uint stream_index)
+{
+    return dvdnav_get_spu_logical_stream(m_dvdnav, stream_index);
+}
+
 /** \brief converts the subtitle/audio lang code to iso639.
  */
 uint DVDRingBuffer::ConvertLangCode(uint16_t code)

mythtv/libs/libmythtv/DVD/dvdringbuffer.h

@@ -91 +91 @@
 
     // Subtitles
     uint GetSubtitleLanguage(int key);
+    int GetSubtitleTrackNum(uint stream_index);
     bool DecodeSubtitles(AVSubtitle * sub, int * gotSubtitles,
                          const uint8_t * buf, int buf_size);