Ticket #9429: 0001-Filter-and-sort-DVD-subtitle-tracks-so-that-only-the.patch

mythtv/libs/libmythtv/DVD/avformatdecoderdvd.cpp

@@ -118 +118 @@
 
     if (tracks[kTrackTypeSubtitle].size() > 0)
     {
+        map<int,uint> lang_sub_cnt;
+        map<int,int>  stream2idx;
+
+        // First, create a map containing stream id -> track index
+        // of the subtitle streams that have been found so far.
+        for (uint n = 0; n < GetTrackCount(kTrackTypeSubtitle); n++)
+        {
+            int stream_id = tracks[kTrackTypeSubtitle][n].stream_id & 0x1f;
+
+            stream2idx[stream_id] = n;
+        }
+
+        // Get all subtitle tracks from the DVD and filter out any that
+        // are not mapped in the current program chain.
+        sinfo_vec_t filteredTracks;
+
+        if (!ringBuffer->DVD()->IsInMenu())
+        {
+            for (uint i = 0; i < 32; ++i)
+            {
+                int streamid = ringBuffer->DVD()->GetSubtitleTrackNum(i);
+                if (streamid >= 0)
+                {
+                    // This stream is mapped in the current program chain
+                    int lang = ringBuffer->DVD()->GetSubtitleLanguage(i);
+                    int lang_indx = lang_sub_cnt[lang]++;
+                    int trackNo = -1;
+
+                    if (stream2idx.count(streamid) != 0)
+                        trackNo = stream2idx[streamid];
+
+                    if (trackNo == -1)
+                    {
+                        // Create a dummy track if the physical stream has not
+                        // yet been seen.
+                        filteredTracks.push_back(StreamInfo(-1, lang, lang_indx,
+                                                            streamid, 0, 0, false, false, false));
+                    }
+                    else
+                    {
+                        // Otherwise use the real data
+                        filteredTracks.push_back(tracks[kTrackTypeSubtitle][trackNo]);
+                        filteredTracks.back().stream_id &= 0x1f;
+                        filteredTracks.back().language = lang;
+                        filteredTracks.back().language_index = lang_indx;
+                    }
+                }
+            }
+        }
+        tracks[kTrackTypeSubtitle] = filteredTracks;
+
         stable_sort(tracks[kTrackTypeSubtitle].begin(),
                     tracks[kTrackTypeSubtitle].end());
-        sinfo_vec_t::iterator it = tracks[kTrackTypeSubtitle].begin();
-        for(; it != tracks[kTrackTypeSubtitle].end(); ++it)
+
+        int trackNo = -1;
+        int selectedStream = ringBuffer->DVD()->GetTrack(kTrackTypeSubtitle);
+
+        // Now iterate over the sorted list and try to find the index of the
+        // currently selected track.
+        for (uint idx = 0; idx < GetTrackCount(kTrackTypeSubtitle); idx++)
         {
+            const StreamInfo& stream = tracks[kTrackTypeSubtitle][idx];
+            int avidx = stream.av_stream_index;
+            QString mpegstream;
+
+            if (avidx >= 0)
+                mpegstream = QString( "0x%1").arg(ic->streams[avidx]->id,0,16);
+            else
+                mpegstream = "n/a";
+
             LOG(VB_PLAYBACK, LOG_INFO, LOC +
-                QString("DVD Subtitle Track Map Stream id #%1 ")
-                    .arg(it->stream_id));
+                QString("DVD Subtitle Track Map Stream id #%1, av_stream_idx %2, MPEG #%3, lang %4")
+                    .arg(stream.stream_id)
+                    .arg(stream.av_stream_index)
+                    .arg(mpegstream)
+                    .arg(iso639_key_toName(stream.language)));
+
+            if ((selectedStream != -1) && (stream.stream_id == selectedStream))
+                trackNo = (int)idx;
         }
-        stable_sort(tracks[kTrackTypeSubtitle].begin(),
-                    tracks[kTrackTypeSubtitle].end());
-        int trackNo = ringBuffer->DVD()->GetTrack(kTrackTypeSubtitle);
+
         uint captionmode = m_parent->GetCaptionMode();
         int trackcount = (int)GetTrackCount(kTrackTypeSubtitle);
+
         if (captionmode == kDisplayAVSubtitle &&
             (trackNo < 0 || trackNo >= trackcount))
         {
             m_parent->EnableSubtitles(false);
         }
-        else if (trackNo >= 0 && trackNo < trackcount &&
-                 !ringBuffer->IsInDiscMenuOrStillFrame())
+        else if (trackNo >= 0 && trackNo < trackcount)
         {
             SetTrack(kTrackTypeSubtitle, trackNo);
             m_parent->EnableSubtitles(true);

mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp

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

mythtv/libs/libmythtv/DVD/dvdringbuffer.h

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

mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp

@@ -50 +50 @@
 void MythDVDPlayer::EnableCaptions(uint mode, bool osd_msg)
 {
     if ((kDisplayAVSubtitle & mode) && player_ctx->buffer->IsDVD())
-        player_ctx->buffer->DVD()->SetTrack(kTrackTypeSubtitle,
-                                            GetTrack(kTrackTypeSubtitle));
+    {
+        int track = GetTrack(kTrackTypeSubtitle);
+        if (track >= 0 && track < (int)decoder->GetTrackCount(kTrackTypeSubtitle))
+        {
+            StreamInfo stream = decoder->GetTrackInfo(kTrackTypeSubtitle,
+                                                      track);
+            player_ctx->buffer->DVD()->SetTrack(kTrackTypeSubtitle,
+                                                stream.stream_id);
+        }
+    }
     MythPlayer::EnableCaptions(mode, osd_msg);
 }
 
@@ -549 +557 @@
     // clear any buttons
     if (!numbuttons || !dvdSubtitle || (buttonversion == 0) || expired)
     {
-        SetCaptionsEnabled(false, false);
         osdLock.lock();
         if (osd)
             osd->ClearSubtitles();

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -3877 +3877 @@
     }
     else if (kTrackTypeSubtitle == type)
     {
-        if (ringBuffer->IsDVD())
-            lang_key = ringBuffer->DVD()->GetSubtitleLanguage(trackNo);
-
         return QObject::tr("Subtitle") + QString(" %1: %2%3")
             .arg(trackNo + 1).arg(iso639_key_toName(lang_key))
             .arg(forcedString);

mythtv/libs/libmythtv/decoderbase.cpp

@@ -1052 +1052 @@
         for (uint i = 0; i < numStreams; i++)
         {
             if (wlang == tracks[type][i].language)
+            {
                 selTrack = i;
-            if (windx == tracks[type][i].language_index)
-                break;
+
+                if (windx == tracks[type][i].language_index)
+                    break;
+            }
         }
     }
 
@@ -1106 +1109 @@
 
     int lang = tracks[type][currentTrack[type]].language;
     LOG(VB_PLAYBACK, LOG_INFO, LOC +
-        QString("Selected track #%1 in the %2 language(%3)")
+        QString("Selected track #%1 (type %2) in the %3 language(%4)")
             .arg(currentTrack[type]+1)
+            .arg(type)
             .arg(iso639_key_toName(lang)).arg(lang));
 
     if (m_parent && (oldTrack != currentTrack[type]))