From c2f8472e2933e4cf061499e4e0e6675bb14fd120 Mon Sep 17 00:00:00 2001 From: gabucino Date: Wed, 11 Apr 2001 16:44:20 +0000 Subject: Sok changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@353 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/CODECS | 20 +++++++++++++------- DOCS/README | 52 +++++++++++++++++----------------------------------- 2 files changed, 30 insertions(+), 42 deletions(-) diff --git a/DOCS/CODECS b/DOCS/CODECS index 4d55837898..1bd5a8e5d6 100644 --- a/DOCS/CODECS +++ b/DOCS/CODECS @@ -18,12 +18,12 @@ Fully functional Win32 VfW/DShow codecs: - M$ MPEG4 v1, v2 (MPG4,MP42): mpg4c32.dll: works, YUV supported. -- M$ MPEG4 v3 / DivX ;-) (MP43,DIV3,DIV4,DIV5,DIV6) +- M$ MPEG4 v3 / DivX ;-) / AngelPotion (MP43,DIV3,DIV4,DIV5,DIV6,AP41) divxc32.dll: works, YUV supported. divx_c32.ax: works, YUV and postprocessing supported. - Indeo Video 5.0: (IV50) ir50_32.dll (VfW): works, YUV supported. - ir50_32.dll (DShow): not tested + ir50_32.dll (DShow): works, YUV supported. - Cinepak Video: (CVID) iccvid.dll: works, YUV supported. - Microsoft Video v1.0 (CRAM) @@ -33,6 +33,7 @@ Fully functional Win32 VfW/DShow codecs: - Motion JPEG (MJPG) m3jpeg32.dll: can't load (segfault) mcmjpg32.dll: works, YUV supported + m3jpegdec.ax: works, YUV supported - Windows Media Video 7 (WMV1) wmvds32.ax: works, YUV supported - I263: (I263) @@ -44,8 +45,6 @@ Problems: ir41_32.dll: works, no YUV, image upside-down - Indeo Video 3.2: (IV32) ir32_32.dll: works, no YUV, image upside-down -- ASUS ASV1: (ASV1) - asusasvd.dll: ??? not tested - ASUS ASV2: (ASV2) asusasv2.dll: loads, image upside-down and very pixelized (no YUY2, but YVYU) - ATI VCR1: (VCR1) @@ -62,6 +61,8 @@ Problems: Not tested: +- ASUS ASV1: (ASV1) + asusasvd.dll: ??? not tested - Motion Wavelets: (MWV1) icmw_32.dll: not tested (no sample file) - Indeo Video 3.1: (IV31) @@ -72,6 +73,8 @@ Not tested: wmv8ds32.ax: not tested (no sample file) - I420: (I420) i263_32.drv: not tested, but should work (no sample file) +- m261: (m261) + msh261.drv: not tested, what's this? Audio codecs: ~~~~~~~~~~~~~ @@ -82,7 +85,7 @@ Built-in native codecs: mp3lib, based on mpg123 (sometimes segfaults, then use ACM, see below) - AC3: (0x2000) libac3 -- aLaw audio: (6) +- aLaw audio: (0x6) aLaw codec from xanim sources - MS-GSM: (0x31,0x32) xa_gsm from avifile sources @@ -104,10 +107,13 @@ Fully functional Win32 ACM/DShow codecs: Problems: +- uLaw audio: (0x7) + mess... +- ACELP.net Sipro Lab Audio (0x130) + doesn't work: unk_ ... + Not tested: -- ACELP.net: (0x130) - acelpdec.ax: not tested (no sample file) - IMC: (0x401) imc32.acm: not tested (no sample file) diff --git a/DOCS/README b/DOCS/README index 6d37729553..a30d524d75 100644 --- a/DOCS/README +++ b/DOCS/README @@ -36,17 +36,10 @@ It's still under development, but it will be merged and released soon. BTW he needs some nice skins, if you are a good graphician, contact him!!! Win32 codecs? -Yes, we are using Win32 (Video for Windows) codecs for AVI/ASF decoding. -They must be installed to the /usr/lib/win32/ directory, with all lower case. -You can grab the codecs package from our homepage, or can be found in your -C:\WINDOWS\SYSTEM\ dir, see codecs.c for filenames. -Some people asked why don't we use ActiveMovie/DirectShow codecs. The reason is -simple: we'd have to emulate the whole DirectX architecture and implement the -(patented!) COM interface to be able to use them. BTW the old VfW DivX codec -is faster than the new .AX version, but it has no quality/CPU setting -option (this is an improper name, since it doesn't affect the decoder. If -it's set to 1 or higher, it applies a filter which decreases blockiness and -eats away CPU cycles). +Yes, we are using Win32 (Video for Windows, DirectShow) codecs for AVI/ASF +decoding. They must be installed to the /usr/lib/win32/ directory, with all +lower case. You can grab the codecs package from our homepage, or can be found +in your C:\WINDOWS\SYSTEM\ dir, see codecs.c for filenames. Supported input formats: ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -55,44 +48,33 @@ Supported input formats: - RIFF AVI file format - ASF 1.0 file format -Supported audio codecs: -~~~~~~~~~~~~~~~~~~~~~~~ -- PCM (uncompressed) audio (8/16 bit, mono/stereo) -- MPEG layer 2/3 audio (using mp3lib, based on mpg123 [www.mpg123.de]) -- AC3 audio (using ac3dec/libac3) -- Win32 ACM audio codecs (the *.ACM files) [Only in the AVI player] - tested with: DivX audio, MS-ADPCM -- aLaw audio (using code from xanim) -- MS-GSM audio (using modified xa_gsm.c from avifile) - -Supported video codecs: -~~~~~~~~~~~~~~~~~~~~~~~ -- MPEG 1 and MPEG 2 video decoder (using mpeg2dec/libmpeg2, supports - 3DNow! and MMX) -- Win32 ICM (VfW) video codecs (for example DivX using DIVXC32.DLL) -- OpenDivX encore & decore (see ProjectMayo) +Supported audio & video codecs: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +See DOCS/CODECS for complete list. Supported video output devices: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - mga: Matrox G200/G400 hardware YUV overlay via the mga_vid device - xmga: Matrox G200/G400 overlay (mga_vid) in X11 window (Xv emulation on X 3.3.x !) -- x11: X11 optionally with SHM extension -- dga: X11 DGA extension (only in 24/32bpp) -- fsdga:X11 DGA extension with fullscreen scaling (only 24/32bpp and MPEG!) +- syncfb: Matrox G400 YUV support on framebuffer (not tested, maybe broken) - xv: X11 using overlays with the Xvideo extension (hardware YUV & scaling) +- x11: X11 with SHM extension - gl: OpenGL renderer, works only with Utah-GLX! (no DRI or nVidia drivers) -- syncfb: Matrox G400 YUV support on framebuffer (not tested, maybe broken) -- fbdev:Output to general framebuffers (only MPEG1/2 and OpenDivX) -- 3dfx: Voodoo2/3 hardware YUV (/dev/3dfx) support (not yet tested, maybe broken) -- sdl: SDL >= v1.1.7 driver (slower than 'x11', but supports software scaling) +- dga: X11 DGA extension +- fsdga:X11 DGA extension with fullscreen scaling (only 24/32bpp and MPEG!) +- sdl: SDL >= v1.1.7 driver (supports software scaling, and versions >=1.1.8 + even support Xvideo, thus hardware rendering) (NOT supported by us! Don't submit SDL bugreports!) +- fbdev:Output to general framebuffers +- svga: Output to SVGAlib - null: Null output (for speed tests/benchmarking) +- 3dfx: Voodoo2/3 hardware YUV (/dev/3dfx) support (not yet tested, maybe broken) +- odivx:OpenDivX AVI File writer - pgm: PGM file output (for testing purposes) - md5: MD5sum output (for mpeg conformance tests) NOTE: check DOCS/VIDEOCARDS ! -NOTE: maybe not all are available for AVI files Supported audio output devices: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- cgit v1.2.3