diff options
| -rw-r--r-- | src/libw32dll/w32codec.c | 24 | ||||
| -rw-r--r-- | src/xine-engine/buffer.h | 8 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 50 |
3 files changed, 77 insertions, 5 deletions
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 7c1b7bca3..e9f7bcf5f 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.34 2001/11/07 17:08:17 miguelfreitas Exp $ + * $Id: w32codec.c,v 1.35 2001/11/07 19:41:26 miguelfreitas Exp $ * * routines for using w32 codecs * @@ -238,7 +238,17 @@ static char* get_vids_codec_name(w32v_decoder_t *this, case BUF_VIDEO_I263: /* Video in I263 format */ return "i263_32.drv"; + + case BUF_VIDEO_MSVC: + /* Video in Windows Video 1 */ + this->yuv_supported=0; + return "msvidc32.dll"; + case BUF_VIDEO_DV: + /* MainConcept DV Codec */ + this->yuv_supported=1; + return "mcdvd_32.dll"; + } printf ("w32codec: this didn't happen: unknown video buf type %08x\n", @@ -269,7 +279,9 @@ static int w32v_can_handle (video_decoder_t *this_gen, int buf_type) { buf_type == BUF_VIDEO_CINEPAK || /* buf_type == BUF_VIDEO_ATIVCR1 || */ buf_type == BUF_VIDEO_ATIVCR2 || - buf_type == BUF_VIDEO_I263); + buf_type == BUF_VIDEO_I263 || + buf_type == BUF_VIDEO_MSVC || + buf_type == BUF_VIDEO_DV ); } static void w32v_init (video_decoder_t *this_gen, vo_instance_t *video_out) { @@ -537,7 +549,9 @@ static int w32a_can_handle (audio_decoder_t *this_gen, int buf_type) { return ( (codec == BUF_AUDIO_DIVXA) || (codec == BUF_AUDIO_MSADPCM) || (codec == BUF_AUDIO_IMAADPCM) || - (codec == BUF_AUDIO_MSGSM) ); + (codec == BUF_AUDIO_MSGSM) || + (codec == BUF_AUDIO_IMC) || + (codec == BUF_AUDIO_LH) ); } static char* get_auds_codec_name(w32a_decoder_t *this, int buf_type) { @@ -553,6 +567,10 @@ static char* get_auds_codec_name(w32a_decoder_t *this, int buf_type) { return "imaadp32.acm"; case BUF_AUDIO_MSGSM: return "msgsm32.acm"; + case BUF_AUDIO_IMC: + return "icm32.acm"; + case BUF_AUDIO_LH: + return "lhacm.acm"; } printf ("w32codec: this didn't happen: unknown audio buf type %08x\n", buf_type); diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index f47b691b4..7977822e8 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.22 2001/11/07 19:06:15 miguelfreitas Exp $ + * $Id: buffer.h,v 1.23 2001/11/07 19:41:26 miguelfreitas Exp $ * * * contents: @@ -94,6 +94,8 @@ extern "C" { #define BUF_VIDEO_JPEG 0x02120000 #define BUF_VIDEO_WMV7 0x02130000 #define BUF_VIDEO_WMV8 0x02140000 +#define BUF_VIDEO_MSVC 0x02150000 +#define BUF_VIDEO_DV 0x02160000 /* audio buffer types: (please keep in sync with buffer_types.c) */ @@ -108,6 +110,10 @@ extern "C" { #define BUF_AUDIO_IMAADPCM 0x03070000 #define BUF_AUDIO_MSGSM 0x03080000 #define BUF_AUDIO_VORBIS 0x03090000 +#define BUF_AUDIO_IMC 0x030a0000 +#define BUF_AUDIO_LH 0x030b0000 +#define BUF_AUDIO_VOXWARE 0x030c0000 +#define BUF_AUDIO_ACELPNET 0x030d0000 /* spu buffer types: */ diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 64d55c3b9..99f69c5f9 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.2 2001/11/07 19:06:15 miguelfreitas Exp $ + * $Id: buffer_types.c,v 1.3 2001/11/07 19:41:26 miguelfreitas Exp $ * * * contents: @@ -257,6 +257,26 @@ static video_db_t video_db[] = { BUF_VIDEO_WMV8, "Windows Media Video 8" }, +{ + { + mmioFOURCC('c','r','a','m'), + mmioFOURCC('C','R','A','M'), + mmioFOURCC('M','S','V','C'), + 0 + }, + BUF_VIDEO_MSVC, + "Microsoft Video 1" +}, +{ + { + mmioFOURCC('D','V','S','D'), + mmioFOURCC('d','v','s','d'), + mmioFOURCC('d','v','c','p'), + 0 + }, + BUF_VIDEO_DV, + "Sony Digital Video (DV)" +}, { { 0 }, 0, "last entry" } }; @@ -332,6 +352,34 @@ static audio_db_t audio_db[] = { BUF_AUDIO_VORBIS, "OggVorbis Audio" }, +{ + { + 0x401, 0 + }, + BUF_AUDIO_IMC, + "Intel Music Coder" +}, +{ + { + 0x1101, 0x1102, 0x1103, 0x1104, 0 + }, + BUF_AUDIO_LH, + "Lernout & Hauspie" +}, +{ + { + 0x75, 0 + }, + BUF_AUDIO_VOXWARE, + "Voxware Metasound" +}, +{ + { + 0x130, 0 + }, + BUF_AUDIO_ACELPNET, + "ACELP.net" +}, { { 0 }, 0, "last entry" } }; |