Ticket #7638: dvd-audio-stream-ordering-v3.patch

libs/libmythtv/avformatdecoder.cpp

@@ -1992 +1992 @@
         {
             int lang = get_canonical_lang(ic->streams[i]->language);
             int lang_indx = lang_aud_cnt[lang];
+            int stream_id;
             lang_aud_cnt[lang]++;
 
             if (ic->streams[i]->codec->avcodec_dual_language)
@@ -2003 +2004 @@
             }
             else
             {
+                if (ringBuffer && ringBuffer->isDVD())
+                    stream_id = ringBuffer->DVD()->GetAudioTrackNum(ic->streams[i]->id);
+                else
+                    stream_id = ic->streams[i]->id;
+
+
                 tracks[kTrackTypeAudio].push_back(
-                    StreamInfo(i, lang, lang_indx, ic->streams[i]->id));
+                    StreamInfo(i, lang, lang_indx, stream_id));
             }
 
             VERBOSE(VB_AUDIO, LOC + QString(

libs/libmythtv/DVDRingBuffer.cpp

@@ -1101 +1101 @@
     return ConvertLangCode(lang);
 }
 
+/** \brief get real dvd track audio number
+  * \param key stream_id 
+*/
+int DVDRingBufferPriv::GetAudioTrackNum(uint stream_id)
+{
+    return dvdnav_get_audio_logical_stream(m_dvdnav, stream_id);
+}
+
 /** \brief get the subtitle language from the dvd
  */
 uint DVDRingBufferPriv::GetSubtitleLanguage(int id)

libs/libmythtv/DVDRingBuffer.h

@@ -58 +58 @@
 
     bool IgnoringStillorWait(void) { return m_skipstillorwait; }
     uint GetAudioLanguage(int id);
+    int  GetAudioTrackNum(uint key);
     uint GetSubtitleLanguage(int key);
     void SetMenuPktPts(long long pts) { m_menupktpts = pts; }
     long long GetMenuPktPts(void) { return m_menupktpts; }