[MPlayer-cvslog] r29655 - in trunk: etc/codecs.conf libmpdemux/demux_lavf.c libmpdemux/extension.c libmpdemux/mp_taglists.c

[vitor]

Author: vitor
Date: Mon Sep  7 19:20:44 2009
New Revision: 29655

Log:
Add support to lavf vqf demuxer and lavc TwinVQ decoder. Make also the 
lavf the default demuxer for vqf.

Ok'ed by Compn on IRC.

Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/demux_lavf.c
   trunk/libmpdemux/extension.c
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Mon Sep  7 18:29:32 2009	(r29654)
+++ trunk/etc/codecs.conf	Mon Sep  7 19:20:44 2009	(r29655)
@@ -4105,6 +4105,14 @@ audiocodec pscelp
   driver acm
   dll "smcelp32.acm"
 
+audiocodec fftwinvq
+  info "FFmpeg TwinVQ"
+  status working
+  fourcc TWI2 ; internal MPlayer FourCC, different from mplayer's TwinVQ decoder
+              ; since lavf demuxer is incompatible with it
+  driver ffmpeg
+  dll twinvq
+
 audiocodec TwinVQ
   info "VQF codec by NTTLabs"
   status working

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Mon Sep  7 18:29:32 2009	(r29654)
+++ trunk/libmpdemux/demux_lavf.c	Mon Sep  7 19:20:44 2009	(r29655)
@@ -183,6 +183,7 @@ static const char * const preferred_list
     "mov,mp4,m4a,3gp,3g2,mj2",
     "mpc",
     "mpc8",
+    "vqf",
     NULL
 };
 

Modified: trunk/libmpdemux/extension.c
==============================================================================
--- trunk/libmpdemux/extension.c	Mon Sep  7 18:29:32 2009	(r29654)
+++ trunk/libmpdemux/extension.c	Mon Sep  7 19:20:44 2009	(r29655)
@@ -65,7 +65,7 @@ static struct {
         { "it", DEMUXER_TYPE_XMMS },
         { "mid", DEMUXER_TYPE_XMMS },
         { "midi", DEMUXER_TYPE_XMMS },
-        { "vqf", DEMUXER_TYPE_XMMS },
+        { "vqf", DEMUXER_TYPE_LAVF },
         { "nsv", DEMUXER_TYPE_NSV },
         { "nsa", DEMUXER_TYPE_NSV },
         { "mpc", DEMUXER_TYPE_MPC },

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Mon Sep  7 18:29:32 2009	(r29654)
+++ trunk/libmpdemux/mp_taglists.c	Mon Sep  7 19:20:44 2009	(r29655)
@@ -46,6 +46,7 @@ static const AVCodecTag mp_wav_tags[] = 
     { CODEC_ID_SPEEX,             MKTAG('s', 'p', 'x', ' ')},
     { CODEC_ID_TRUEHD,            MKTAG('T', 'R', 'H', 'D')},
     { CODEC_ID_TTA,               MKTAG('T', 'T', 'A', '1')},
+    { CODEC_ID_TWINVQ,            MKTAG('T', 'W', 'I', '2')},
     { CODEC_ID_WAVPACK,           MKTAG('W', 'V', 'P', 'K')},
     { CODEC_ID_WESTWOOD_SND1,     MKTAG('S', 'N', 'D', '1')},
     { CODEC_ID_XAN_DPCM,          MKTAG('A', 'x', 'a', 'n')},