diff options
| author | Mike Melanson <mike@multimedia.cx> | 2005-04-23 02:02:28 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2005-04-23 02:02:28 +0000 |
| commit | df3a9a4c266a854a44d988391bffe4e8b645c529 (patch) | |
| tree | c91adaaec192ebcc02e2749eed0905a913b546f3 | |
| parent | fb1174e2386a77700f686d504650ab552988ba75 (diff) | |
| download | xine-lib-df3a9a4c266a854a44d988391bffe4e8b645c529.tar.gz xine-lib-df3a9a4c266a854a44d988391bffe4e8b645c529.tar.bz2 | |
patch for WMA9 lossless decoding via x86 binary codec, courtesy of
vahur.sinijarv at cydonia.ee
CVS patchset: 7486
CVS date: 2005/04/23 02:02:28
| -rw-r--r-- | src/libw32dll/w32codec.c | 9 | ||||
| -rw-r--r-- | src/xine-engine/buffer.h | 3 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 9 |
3 files changed, 18 insertions, 3 deletions
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index d54dc1891..ab7719da5 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.145 2004/12/16 13:59:07 mroi Exp $ + * $Id: w32codec.c,v 1.146 2005/04/23 02:02:28 tmmm Exp $ * * routines for using w32 codecs * DirectShow support by Miguel Freitas (Nov/2001) @@ -1089,6 +1089,12 @@ static char* get_auds_codec_name(w32a_decoder_t *this, int buf_type) { _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "Windows Media Audio v3 (win32)"); return "wma9dmod.dll"; + case BUF_AUDIO_WMALL: + this->driver_type = DRIVER_DMO; + this->guid=&wma3_clsid; + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, + "Windows Media Audio Lossless (win32)"); + return "wma9dmod.dll"; case BUF_AUDIO_WMAV: this->driver_type = DRIVER_DMO; this->guid=&wmav_clsid; @@ -1703,6 +1709,7 @@ 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_WMAV, + BUF_AUDIO_WMALL, 0 }; diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 8c7477e64..dfb62f280 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.149 2005/04/20 01:03:59 tmmm Exp $ + * $Id: buffer.h,v 1.150 2005/04/23 02:02:28 tmmm Exp $ * * * contents: @@ -238,6 +238,7 @@ extern "C" { #define BUF_AUDIO_MPC 0x03350000 #define BUF_AUDIO_SHORTEN 0x03360000 #define BUF_AUDIO_WESTWOOD_SND1 0x03370000 +#define BUF_AUDIO_WMALL 0x03380000 /* spu buffer types: */ diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index def60d67f..f2025113d 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.96 2005/04/20 01:04:35 tmmm Exp $ + * $Id: buffer_types.c,v 1.97 2005/04/23 02:02:28 tmmm Exp $ * * * contents: @@ -778,6 +778,13 @@ static audio_db_t audio_db[] = { }, { { + 0x163, 0 + }, + BUF_AUDIO_WMALL, + "Windows Media Audio Lossless" +}, +{ + { 0xA, 0 }, BUF_AUDIO_WMAV, |