[MPlayer-cvslog] r30709 - in trunk/libmpdemux: aviprint.c demux_audio.c ms_hdr.h

[tack]

Author: tack
Date: Mon Feb 22 15:27:32 2010
New Revision: 30709

Log:
Get the proper codec id when a WAVE_FORMAT_EXTENSIBLE extension exists in a
wave file.

Modified:
   trunk/libmpdemux/aviprint.c
   trunk/libmpdemux/demux_audio.c
   trunk/libmpdemux/ms_hdr.h

Modified: trunk/libmpdemux/aviprint.c
==============================================================================
--- trunk/libmpdemux/aviprint.c	Mon Feb 22 15:24:53 2010	(r30708)
+++ trunk/libmpdemux/aviprint.c	Mon Feb 22 15:27:32 2010	(r30709)
@@ -89,6 +89,12 @@ void print_wave_header(WAVEFORMATEX *h, 
       mp_msg(MSGT_HEADER, verbose_level, "mp3.nFramesPerBlock=%d\n",h2->nFramesPerBlock);
       mp_msg(MSGT_HEADER, verbose_level, "mp3.nCodecDelay=%d\n",h2->nCodecDelay);
   }
+  else if (h->wFormatTag == 0xfffe && h->cbSize >= 22) {
+      WAVEFORMATEXTENSIBLE *h2 = (WAVEFORMATEXTENSIBLE *)h;
+      mp_msg(MSGT_HEADER, verbose_level, "ex.wValidBitsPerSample=%d\n", h2->wValidBitsPerSample);
+      mp_msg(MSGT_HEADER, verbose_level, "ex.dwChannelMask=0x%X\n", h2->dwChannelMask);
+      mp_msg(MSGT_HEADER, verbose_level, "ex.SubFormat=%d (0x%X)\n", h2->SubFormat, h2->SubFormat);
+  }
   else if (h->cbSize > 0)
   {
     int i;

Modified: trunk/libmpdemux/demux_audio.c
==============================================================================
--- trunk/libmpdemux/demux_audio.c	Mon Feb 22 15:24:53 2010	(r30708)
+++ trunk/libmpdemux/demux_audio.c	Mon Feb 22 15:27:32 2010	(r30709)
@@ -416,6 +416,8 @@ static int demux_audio_open(demuxer_t* d
       }
       stream_read(s,(char*)((char*)(w)+sizeof(WAVEFORMATEX)),w->cbSize);
       l -= w->cbSize;
+      if (w->wFormatTag & 0xfffe && w->cbSize >= 22)
+          sh_audio->format = ((WAVEFORMATEXTENSIBLE *)w)->SubFormat;
     }
 
     if( mp_msg_test(MSGT_DEMUX,MSGL_V) ) print_wave_header(w, MSGL_V);

Modified: trunk/libmpdemux/ms_hdr.h
==============================================================================
--- trunk/libmpdemux/ms_hdr.h	Mon Feb 22 15:24:53 2010	(r30708)
+++ trunk/libmpdemux/ms_hdr.h	Mon Feb 22 15:27:32 2010	(r30709)
@@ -34,6 +34,17 @@ typedef struct __attribute__((__packed__
 } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
 #endif /* _WAVEFORMATEX_ */
 
+#ifndef _WAVEFORMATEXTENSIBLE_
+#define _WAVEFORMATEXTENSIBLE_
+typedef struct __attribute__((__packed__)) _WAVEFORMATEXTENSIBLE {
+    WAVEFORMATEX   wf;
+    unsigned short wValidBitsPerSample;
+    unsigned int   dwChannelMask;
+    unsigned int   SubFormat; // Only interested in first 32 bits of guid
+    unsigned int   _guid_remainder[3];
+} WAVEFORMATEXTENSIBLE;
+#endif /* _WAVEFORMATEXTENSIBLE_ */
+
 #ifndef _MPEGLAYER3WAVEFORMAT_
 #define _MPEGLAYER3WAVEFORMAT_
 typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag {