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

mythtv/libs/libmythdvdnav/dvdnav/vm/vm.c

@@ -698 +698 @@
  */
 int vm_get_audio_stream(vm_t *vm, int audioN) {
   int streamN = -1;
-
+  const uint AC3_OFFSET = 0x80;
+  const uint DTS_OFFSET = 0x88;
+  const uint LPCM_OFFSET = 0xA0;
+
+  int stream_id = audioN;
+  if (stream_id >= LPCM_OFFSET) {
+    stream_id -= LPCM_OFFSET;
+  } else if (stream_id >= DTS_OFFSET) {
+    stream_id -= DTS_OFFSET;
+  } else if (stream_id >= AC3_OFFSET) {
+    stream_id -= AC3_OFFSET;
+  }
+   
   if((vm->state).domain != VTS_DOMAIN)
-    audioN = 0;
+    stream_id = 0;
 
-  if(audioN < 8) {
+  if(stream_id < 8) {
     /* Is there any control info for this logical stream */
-    if((vm->state).pgc->audio_control[audioN] & (1<<15)) {
-      streamN = ((vm->state).pgc->audio_control[audioN] >> 8) & 0x07;
+    if((vm->state).pgc->audio_control[stream_id] & (1<<15)) {
+      streamN = ((vm->state).pgc->audio_control[stream_id] >> 8) & 0x07;
     }
   }
 
   if((vm->state).domain != VTS_DOMAIN && streamN == -1)
     streamN = 0;
 
-  /* FIXME: Should also check in vtsi/vmgi status what kind of stream
-   * it is (ac3/lpcm/dts/sdds...) to find the right (sub)stream id */
   return streamN;
 }
 

mythtv/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)

mythtv/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; }

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -2003 +2003 @@
             }
             else
             {
+                int logical_stream_id;
+                if (ringBuffer && ringBuffer->isDVD())
+                    logical_stream_id = ringBuffer->DVD()->GetAudioTrackNum(ic->streams[i]->id);
+                else
+                    logical_stream_id = ic->streams[i]->id;
+
                 tracks[kTrackTypeAudio].push_back(
-                    StreamInfo(i, lang, lang_indx, ic->streams[i]->id));
+                    StreamInfo(i, lang, lang_indx, logical_stream_id));
             }
 
             VERBOSE(VB_AUDIO, LOC + QString(
@@ -2027 +2033 @@
     {
         if (tracks[kTrackTypeAudio].size() > 1)
         {
+            sort(tracks[kTrackTypeAudio].begin(),
+                 tracks[kTrackTypeAudio].end());
             sinfo_vec_t::iterator it = tracks[kTrackTypeAudio].begin();
             for (; it != tracks[kTrackTypeAudio].end(); ++it)
             {
                 VERBOSE(VB_PLAYBACK, LOC +
                             QString("DVD Audio Track Map "
-                                    "Stream id #%1 ")
-                                    .arg(it->stream_id));
+                                    "Stream id #%1, MPEG stream %2")
+                                    .arg(it->stream_id)
+                                    .arg(ic->streams[it->av_stream_index]->id));
             }
             int trackNo = ringBuffer->DVD()->GetTrack(kTrackTypeAudio);
             if (trackNo >= (int)GetTrackCount(kTrackTypeAudio))