diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2003-03-18 20:40:59 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2003-03-18 20:40:59 +0000 |
| commit | b78cdae00635a4d35c6de8e9c18094a328302ef0 (patch) | |
| tree | eb1b81dde9ea4541137af991eebff94677746169 | |
| parent | 6add00e66d1ce00d4923aa24abe29e4b7176b8dc (diff) | |
| download | xine-lib-b78cdae00635a4d35c6de8e9c18094a328302ef0.tar.gz xine-lib-b78cdae00635a4d35c6de8e9c18094a328302ef0.tar.bz2 | |
Support for Windows Media 9 Voice codec via wmspdmod.dll
CVS patchset: 4445
CVS date: 2003/03/18 20:40:59
| -rw-r--r-- | src/libw32dll/w32codec.c | 16 | ||||
| -rw-r--r-- | src/xine-engine/buffer.h | 3 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 9 |
3 files changed, 24 insertions, 4 deletions
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 9a21b2b9e..b49820e71 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.119 2003/03/18 18:21:48 jstembridge Exp $ + * $Id: w32codec.c,v 1.120 2003/03/18 20:40:59 jstembridge Exp $ * * routines for using w32 codecs * DirectShow support by Miguel Freitas (Nov/2001) @@ -111,6 +111,12 @@ static GUID wma3_clsid = { 0x8b, 0x05, 0x87, 0xf8, 0x07, 0xa2, 0x33, 0xd1 } }; +static GUID wmav_clsid = +{ + 0x874131cb, 0x4ecc, 0x443b, + { 0x89, 0x48, 0x74, 0x6b, 0x89, 0x59, 0x5d, 0x20 } +}; + /* some data is shared inside wine loader. * this mutex seems to avoid some segfaults @@ -1005,6 +1011,12 @@ static char* get_auds_codec_name(w32a_decoder_t *this, int buf_type) { this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] = strdup ("Windows Media Audio v3 (win32)"); return "wma9dmod.dll"; + case BUF_AUDIO_WMAV: + this->driver_type = DRIVER_DMO; + this->guid=&wmav_clsid; + this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] + = strdup ("Windows Media Audio Voice (win32)"); + return "wmspdmod.dll"; case BUF_AUDIO_MSADPCM: this->stream->meta_info[XINE_META_INFO_AUDIOCODEC] = strdup ("MS ADPCM (win32)"); @@ -1588,7 +1600,7 @@ static decoder_info_t dec_info_video = { static uint32_t audio_types[] = { BUF_AUDIO_WMAV1, BUF_AUDIO_WMAV2, BUF_AUDIO_WMAV3, BUF_AUDIO_MSADPCM, BUF_AUDIO_MSIMAADPCM, BUF_AUDIO_MSGSM, BUF_AUDIO_IMC, BUF_AUDIO_LH, - BUF_AUDIO_VOXWARE, BUF_AUDIO_ACELPNET, BUF_AUDIO_VIVOG723, + BUF_AUDIO_VOXWARE, BUF_AUDIO_ACELPNET, BUF_AUDIO_VIVOG723, BUF_AUDIO_WMAV, 0 }; diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index f7b1897aa..3f0335297 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.103 2003/03/07 22:19:21 rockyb Exp $ + * $Id: buffer.h,v 1.104 2003/03/18 20:41:02 jstembridge Exp $ * * * contents: @@ -195,6 +195,7 @@ extern "C" { #define BUF_AUDIO_NSF 0x032B0000 #define BUF_AUDIO_FLAC 0x032C0000 #define BUF_AUDIO_DV 0x032D0000 +#define BUF_AUDIO_WMAV 0x032E0000 /* spu buffer types: */ diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index ae606d887..d7091917e 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.54 2003/02/19 21:37:17 jstembridge Exp $ + * $Id: buffer_types.c,v 1.55 2003/03/18 20:41:03 jstembridge Exp $ * * * contents: @@ -597,6 +597,13 @@ static audio_db_t audio_db[] = { }, { { + 0xA, 0 + }, + BUF_AUDIO_WMAV, + "Windows Media Audio Voice" +}, +{ + { 0 }, BUF_AUDIO_DTS, |