Yes, Virginia, there are 2 different versions of Windows Media Audio

CVS patchset: 3105
CVS date: 2002/10/31 05:23:02

3 files changed, 26 insertions, 14 deletions

diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index dfe301641..7a6c27206 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: w32codec.c,v 1.98 2002/10/20 19:12:24 guenter Exp $
+ * $Id: w32codec.c,v 1.99 2002/10/31 05:23:02 tmmm Exp $
  *
  * routines for using w32 codecs
  * DirectShow support by Miguel Freitas (Nov/2001)
@@ -410,12 +410,12 @@ static char* get_vids_codec_name(w32v_decoder_t *this,
       = strdup ("Windows Screen Video");
     return "msscds32.ax";    
 
-  case BUF_VIDEO_XXAN:
+  case BUF_VIDEO_TSCC:
     this->flipped=1;
     this->yuv_supported=0;
     this->stream->meta_info[XINE_META_INFO_VIDEOCODEC] 
-      = strdup ("Wing Commander IV Video");
-    return "xanlib.dll";    
+      = strdup ("TechSmith Screen Capture Codec");
+    return "tsccvid.dll";    
     
   }
 
@@ -924,9 +924,13 @@ static char* get_auds_codec_name(w32a_decoder_t *this, int buf_type) {
   this->ds_driver=0;
 
   switch (buf_type) {
-  case BUF_AUDIO_DIVXA:
+  case BUF_AUDIO_WMAV1:
     this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] 
-      = strdup ("DivX audio (WMA)");
+      = strdup ("Windows Media Audio v1");
+    return "divxa32.acm";
+  case BUF_AUDIO_WMAV2:
+    this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] 
+      = strdup ("Windows Media Audio v2");
     return "divxa32.acm";
   case BUF_AUDIO_MSADPCM:
     this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] 
@@ -1464,7 +1468,7 @@ static uint32_t video_types[] = {
   BUF_VIDEO_CINEPAK, /* BUF_VIDEO_ATIVCR1, */
   BUF_VIDEO_ATIVCR2, BUF_VIDEO_I263, BUF_VIDEO_MSVC,
   BUF_VIDEO_DV, BUF_VIDEO_WMV7, BUF_VIDEO_WMV8,
-  BUF_VIDEO_VP31, BUF_VIDEO_MSS1, BUF_VIDEO_XXAN,
+  BUF_VIDEO_VP31, BUF_VIDEO_MSS1, BUF_VIDEO_TSCC,
   0
  };
 
@@ -1474,7 +1478,7 @@ static decoder_info_t dec_info_video = {
 };
 
 static uint32_t audio_types[] = { 
-  BUF_AUDIO_DIVXA, BUF_AUDIO_MSADPCM, BUF_AUDIO_MSIMAADPCM,
+  BUF_AUDIO_WMAV1, BUF_AUDIO_WMAV2, BUF_AUDIO_MSADPCM, BUF_AUDIO_MSIMAADPCM,
   BUF_AUDIO_MSGSM, BUF_AUDIO_IMC, BUF_AUDIO_LH,
   BUF_AUDIO_VOXWARE, BUF_AUDIO_ACELPNET, BUF_AUDIO_VIVOG723,
   0
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index c49f4a308..d17239de0 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: buffer.h,v 1.75 2002/10/29 02:07:45 komadori Exp $
+ * $Id: buffer.h,v 1.76 2002/10/31 05:23:02 tmmm Exp $
  *
  *
  * contents:
@@ -139,7 +139,7 @@ extern "C" {
 #define BUF_AUDIO_MPEG		0x03010000
 #define BUF_AUDIO_LPCM_BE	0x03020000
 #define BUF_AUDIO_LPCM_LE	0x03030000
-#define BUF_AUDIO_DIVXA		0x03040000
+#define BUF_AUDIO_WMAV1		0x03040000
 #define BUF_AUDIO_DTS		0x03050000
 #define BUF_AUDIO_MSADPCM	0x03060000
 #define BUF_AUDIO_MSIMAADPCM	0x03070000
@@ -167,6 +167,7 @@ extern "C" {
 #define BUF_AUDIO_ALAW		0x031D0000
 #define BUF_AUDIO_GSM610	0x031E0000
 #define BUF_AUDIO_EA_ADPCM      0x031F0000
+#define BUF_AUDIO_WMAV2		0x03200000
 
 /* spu buffer types:    */
  
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index b0f98d033..c86b0f47f 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: buffer_types.c,v 1.45 2002/10/27 18:31:58 tmmm Exp $
+ * $Id: buffer_types.c,v 1.46 2002/10/31 05:23:02 tmmm Exp $
  *
  *
  * contents:
@@ -516,10 +516,17 @@ static audio_db_t audio_db[] = {
 },
 {
   {
-    0x160, 0x161, 0
+    0x160, 0
   },
-  BUF_AUDIO_DIVXA,
-  "DivX audio (WMA)"
+  BUF_AUDIO_WMAV1,
+  "Windows Media Audio v1"
+},
+{
+  {
+    0x161, 0
+  },
+  BUF_AUDIO_WMAV2,
+  "Windows Media Audio v2"
 },
 {
   {