From 0ca1de54dca690806adb4acb1354d245eccb0f75 Mon Sep 17 00:00:00 2001 From: arpi_esp Date: Mon, 16 Apr 2001 04:03:56 +0000 Subject: [PATCH] new YUV formats added, some fixes & updates git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@472 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/codecs.conf | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf index 7d831b3c48..57737935dc 100644 --- a/DOCS/codecs.conf +++ b/DOCS/codecs.conf @@ -1,5 +1,9 @@ ; Default codecs config file. It replaces the old codecs.c file! +;============================================================================= +; VIDEO CODECS +;============================================================================= + videocodec mpeg12 info "MPEG 1 or 2" status working @@ -28,6 +32,7 @@ videocodec divxds driver dshow dll "divx_c32.ax" guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa +; out YV12 out YUY2 out BGR32,BGR24,BGR16,BGR15 @@ -59,6 +64,7 @@ videocodec indeo5ds driver dshow dll "ir50_32.dll" guid 0x30355649, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 + out YV12,I420 out YUY2 out BGR32,BGR24,BGR16,BGR15 @@ -68,6 +74,7 @@ videocodec indeo5 fourcc IV50,iv50 driver vfw dll "ir50_32.dll" + out YV12,I420 out YUY2 out BGR32,BGR24,BGR15 @@ -97,6 +104,7 @@ videocodec cvid driver vfw dll "iccvid.dll" out YUY2 + out UYVY out BGR24,BGR15 videocodec cram @@ -109,7 +117,8 @@ videocodec cram videocodec vcr2 info "ATI VCR-2" - status working + status crashing + comment "segfault" fourcc VCR2 driver vfw dll "ativcr2.dll" @@ -122,6 +131,7 @@ videocodec i263 fourcc I263,i263,I420,i420 driver vfw dll "i263_32.drv" +; out I420 out YUY2 out BGR32,BGR24,BGR15 @@ -133,6 +143,7 @@ videocodec mjpeg dll "mcmjpg32.dll" ; dll "m3jpeg32.dll" out YUY2 + out UYVY out BGR32,BGR24,BGR15 videocodec wmv1 @@ -142,6 +153,7 @@ videocodec wmv1 driver dshow dll "wmvds32.ax" guid 0x4facbba1, 0xffd8, 0x4cd7, 0x82, 0x28, 0x61, 0xe2, 0xf6, 0x5c, 0xb1, 0xae +; out I420 out YUY2 out BGR32,BGR24,BGR16,BGR15 @@ -163,30 +175,32 @@ videocodec tm20 driver dshow dll "tm20dec.ax" guid 0x4cb63e61, 0xc611, 0x11D0, 0x83, 0xaa, 0x00, 0x00, 0x92, 0x90, 0x01, 0x84 +; out UYVY out YUY2 out BGR32,BGR24,BGR16,BGR15 videocodec dv info "Sony Digital Video (DV)" - status untested - fourcc dvsd + status working + fourcc DVSD dvsd driver dshow dll "qdv.dll" guid 0xB1B77C00, 0xC3E4, 0x11CF, 0xAF, 0x79, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42 out YUY2 + out UYVY out BGR32,BGR24,BGR16,BGR15 videocodec morgands info "Morgan MJPEG" - status untested + status crashing fourcc MJPG mjpg driver dshow - dll "m3jpegdec.ax" + dll "M3JPEGdec.ax" guid 0x6988b440, 0x8352, 0x11d3, 0x9b, 0xda, 0xca, 0x86, 0x73, 0x7c, 0x71, 0x68 out YUY2 out BGR32,BGR24,BGR16,BGR15 -videocodec hfyu +videocodec huffyuv info "HuffYUV" status crashing comment "ICDecompressGetFormat failed: Error -2" @@ -194,6 +208,7 @@ videocodec hfyu driver vfw dll "huffyuv.dll" out YUY2 + out UYVY out BGR32,BGR24,BGR15 videocodec mszh @@ -218,11 +233,13 @@ videocodec zlib videocodec mwv1 info "Motion Wavelets" - status untested + status crashing + comment "decompressquery failed" fourcc MWV1 driver vfw dll "icmw_32.dll" -; out YUY2 +; out YV12 + out YUY2 out BGR32,BGR24,BGR15 videocodec wmv8 @@ -246,7 +263,7 @@ videocodec m261 videocodec asv2 info "ASUS V2" status buggy - comment "upside down" + comment "rgb upside down, yuv ok" fourcc ASV2 driver vfw dll "asusasv2.dll" @@ -254,6 +271,10 @@ videocodec asv2 out UYVY flip out BGR32,BGR24,BGR15 flip +;============================================================================= +; AUDIO CODECS +;============================================================================= + audiocodec divx info "DivX audio (WMA)" status working