[MPlayer-cvslog] r29513 - in trunk/libmpdemux: demux_mkv.c matroska.h

[cehoyos]

Author: cehoyos
Date: Thu Aug 13 23:54:08 2009
New Revision: 29513

Log:
Add Dolby TrueHD support for mkv demuxer.

Patch by Jason Tackaberry, tack urandom ca

Modified:
   trunk/libmpdemux/demux_mkv.c
   trunk/libmpdemux/matroska.h

Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	Thu Aug 13 21:03:14 2009	(r29512)
+++ trunk/libmpdemux/demux_mkv.c	Thu Aug 13 23:54:08 2009	(r29513)
@@ -1751,6 +1751,8 @@ demux_mkv_open_audio (demuxer_t *demuxer
         track->a_formattag = mmioFOURCC('Q', 'D', 'M', '2');
       else if (!strcmp(track->codec_id, MKV_A_WAVPACK))
         track->a_formattag = mmioFOURCC('W', 'V', 'P', 'K');
+      else if (!strcmp(track->codec_id, MKV_A_TRUEHD))
+        track->a_formattag = mmioFOURCC('T', 'R', 'H', 'D');
       else if (!strcmp(track->codec_id, MKV_A_FLAC))
         {
           if (track->private_data == NULL || track->private_size == 0)
@@ -1990,7 +1992,8 @@ demux_mkv_open_audio (demuxer_t *demuxer
       dp->flags = 0;
       ds_add_packet (demuxer->audio, dp);
     }
-  else if (track->a_formattag == mmioFOURCC('W', 'V', 'P', 'K'))
+  else if (track->a_formattag == mmioFOURCC('W', 'V', 'P', 'K') ||
+           track->a_formattag == mmioFOURCC('T', 'R', 'H', 'D'))
     {  /* do nothing, still works */  }
   else if (!track->ms_compat || (track->private_size < sizeof(WAVEFORMATEX)))
     {

Modified: trunk/libmpdemux/matroska.h
==============================================================================
--- trunk/libmpdemux/matroska.h	Thu Aug 13 21:03:14 2009	(r29512)
+++ trunk/libmpdemux/matroska.h	Thu Aug 13 23:54:08 2009	(r29513)
@@ -50,6 +50,7 @@
 #define MKV_A_QDMC2      "A_QUICKTIME/QDM2"
 #define MKV_A_FLAC       "A_FLAC"
 #define MKV_A_WAVPACK    "A_WAVPACK4"
+#define MKV_A_TRUEHD     "A_TRUEHD"
 
 #define MKV_V_MSCOMP     "V_MS/VFW/FOURCC"
 #define MKV_V_REALV10    "V_REAL/RV10"