status changed, bugfixes, new codecs

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@335 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 81 insertions, 51 deletions

diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index 2371bd7b59..69bc0804aa 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -2,14 +2,14 @@
 
 videocodec mpeg12
   info "MPEG 1 or 2"
-  status ":-)"
+  status working
   format 0x1
   driver libmpeg2
   out YV12
 
 videocodec mpeg4
   info "Microsoft MPEG-4 v1/v2"
-  status ":-)"
+  status working
   comment "No postprocessing"
   fourcc MPG4,mpg4
   fourcc MP42,mp42
@@ -20,8 +20,7 @@ videocodec mpeg4
 
 videocodec divxds
   info "DivX ;-) (MS MPEG-4 v3)"
-  status ":-)"
-  comment "DivX rulez ;-)"
+  status working
   fourcc MP43,mp43 div3   ; fourcc mapping to div3
   fourcc DIV5,div5 div3
   fourcc DIV6,div6 div4
@@ -34,12 +33,12 @@ videocodec divxds
 
 videocodec divx
   info "DivX ;-) (MS MPEG-4 v3)"
-  status ":-)"
-  comment "DivX rulez ;-)"
-  fourcc MP43,mp43 div3   ; fourcc mapping to div3
-  fourcc DIV5,div5 div3
-  fourcc DIV6,div6 div4
+  status working
+  fourcc MP43,mp43 div3   ; M$ MPEG4 v3   (fourcc mapping to div3)
+  fourcc DIV5,div5 div3   ; DivX 3.20 
+  fourcc DIV6,div6 div4   ;   -||-
   fourcc DIV3,div3,DIV4,div4
+  fourcc AP41 DIV3  ; AngelPotion definitive MPEG4 (yet another stolen stuff)
   driver vfw
   dll "divxc32.dll"
   out YUY2 yuvhack
@@ -47,7 +46,7 @@ videocodec divx
   
 videocodec odivx
   info "OpenDivX (MPEG-4 v2)"
-  status ":-)"
+  status working
   fourcc DIVX,divx
   fourcc DIV1,div1 divx
   driver odivx
@@ -55,16 +54,26 @@ videocodec odivx
 
 videocodec indeo5
   info "Intel Indeo 5"
-  status ":-)"
+  status working
   fourcc IV50,iv50
   driver vfw
   dll "ir50_32.dll"
   out YUY2
   out BGR32,BGR24,BGR15
 
+videocodec indeo5ds
+  info "Intel Indeo 5"
+  status untested
+  fourcc IV50,iv50
+  driver dshow
+  dll "ir50_32.dll"
+  guid 0x30355649, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71
+  out YUY2
+  out BGR32,BGR24,BGR16,BGR15
+
 videocodec indeo4
   info "Intel Indeo 4.1"
-  status ":-|"
+  status buggy
   comment "upside-down"
   fourcc IV41,iv41
   driver vfw
@@ -73,7 +82,7 @@ videocodec indeo4
 
 videocodec indeo3
   info "Intel Indeo 3.1/3.2"
-  status ":-|"
+  status buggy
   comment "upside-down"
   fourcc IV31,iv31
   fourcc IV32,iv32
@@ -83,7 +92,7 @@ videocodec indeo3
 
 videocodec cvid
   info "Cinepak Video"
-  status ":-)"
+  status working
   fourcc cvid
   driver vfw
   dll "iccvid.dll"
@@ -92,7 +101,7 @@ videocodec cvid
 
 videocodec cram
   info "Microsoft Video 1"
-  status ":-|"
+  status buggy
   fourcc cram,CRAM,MSVC
   driver vfw
   dll "msvidc32.dll"
@@ -100,7 +109,7 @@ videocodec cram
 
 videocodec vcr2
   info "ATI VCR-2"
-  status ":-)"
+  status working
   fourcc VCR2
   driver vfw
   dll "ativcr2.dll"
@@ -109,8 +118,8 @@ videocodec vcr2
 
 videocodec i263
   info "I263"
-  status ":-)"
-  fourcc I420 i263      ; they use the same dll.. dunno if it (i420) works
+  status working
+  fourcc I420 i420      ; they use the same dll.. dunno if it (i420) works
   fourcc I263,i263
   driver vfw
   dll "i263_32.drv"
@@ -119,7 +128,7 @@ videocodec i263
 
 videocodec mjpeg
   info "Motion JPEG"
-  status ":-)"
+  status working
   fourcc MJPG
   driver vfw
   dll "mcmjpg32.dll"
@@ -129,7 +138,7 @@ videocodec mjpeg
 
 videocodec wmv1
   info "Windows Media Video 7"
-  status ":-)"
+  status working
   fourcc WMV1
   driver dshow
   dll "wmvds32.ax"
@@ -139,7 +148,7 @@ videocodec wmv1
 
 videocodec ap41
   info "AngelPotion Definitive V1"
-  status ":-("
+  status crashing
   fourcc AP41
   driver vfw
   dll "apmpg4v1.dll"
@@ -148,7 +157,7 @@ videocodec ap41
 
 videocodec tm20
   info "TrueMotion 2.0"
-  status ":-("
+  status crashing
   fourcc TM20
   driver dshow
   dll "tm20dec.ax"
@@ -156,9 +165,29 @@ videocodec tm20
   out YUY2
   out BGR32,BGR24,BGR16,BGR15
 
+videocodec dv
+  info "Sony Digital Video (DV)"
+  status untested
+  fourcc dvsd
+  driver dshow
+  dll "qdv.dll"
+  guid 0xB1B77C00, 0xC3E4, 0x11CF, 0xAF, 0x79, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42
+  out YUY2
+  out BGR32,BGR24,BGR16,BGR15
+
+videocodec morgands
+  info "Morgan MJPEG"
+  status untested
+  fourcc MJPG mjpg
+  driver dshow
+  dll "m3jpegdec.ax"
+  guid 0x6988b440, 0x8352, 0x11d3, 0x9b, 0xda, 0xca, 0x86, 0x73, 0x7c, 0x71, 0x68
+  out YUY2
+  out BGR32,BGR24,BGR16,BGR15
+
 videocodec hfyu
   info "HuffYUV"
-  status ":-("
+  status crashing
   fourcc HFYU
   driver vfw
   dll "huffyuv.dll"
@@ -167,7 +196,7 @@ videocodec hfyu
 
 videocodec mszh
   info "AVImszh"
-  status ":-("
+  status crashing
   fourcc MSZH
   driver vfw
   dll "avimszh.dll"
@@ -176,7 +205,7 @@ videocodec mszh
 
 videocodec zlib
   info "AVIzlib"
-  status ":-("
+  status crashing
   fourcc ZLIB
   driver vfw
   dll "avizlib.dll"
@@ -185,8 +214,8 @@ videocodec zlib
 
 videocodec mvw1
   info "Motion Wavelets"
-  status "X-("
-  fourcc MVW1
+  status untested
+  fourcc MWV1
   driver vfw
   dll "icmw_32.dll"
 ;  out YUY2
@@ -194,17 +223,17 @@ videocodec mvw1
 
 videocodec wmv8
   info "Windows Media Video 8"
-  status "X-("
+  status untested
   fourcc WMV2
   driver dshow
   dll "wmv8ds32.ax"
-;  guid ?
+  guid 0x521fb373, 0x7654, 0x49f2, 0xbd, 0xb1, 0x0c, 0x6e, 0x66, 0x60, 0x71, 0x4f
 ;  out YUY2
   out BGR32,BGR24,BGR16,BGR15
 
 audiocodec divx
   info "DivX audio (WMA)"
-  status ":-)"
+  status working
   format 0x160
   format 0x161
   driver acm
@@ -212,24 +241,24 @@ audiocodec divx
 
 audiocodec msadpcm
   info "MS ADPCM"
-  status ":-)"
+  status working
   format 0x2
   driver acm
   dll "msadp32.acm"
 
 ; 3DNow! autodetection?
-;audiocodec mp3acm
-;  info "MPEG layer-3"
-;  status ":-)"
-;  comment "Optimized to Intel MMX/SSE"
-;  format 0x55
-;  driver acm
-;  dll "l3codeca.acm"
-;  flags seekable
+audiocodec mp3acm
+  info "MPEG layer-3"
+  status working
+  comment "Optimized to Intel MMX/SSE"
+  format 0x55
+  driver acm
+  dll "l3codeca.acm"
+  flags seekable
 
 audiocodec mp3
   info "MPEG layer-2,3"
-  status ":-)"
+  status working
   comment "Optimized to AMD 3Dnow!"
   format 0x50
   format 0x55
@@ -238,14 +267,14 @@ audiocodec mp3
 
 audiocodec imaadpcm
   info "IMA ADPCM"
-  status ":-)"
+  status working
   format 0x11
   driver acm
   dll "imaadp32.acm"
   
 audiocodec msgsmacm
   info "MS GSM"
-  status ":-)"
+  status working
   format 0x31
   format 0x32
   driver acm
@@ -253,39 +282,39 @@ audiocodec msgsmacm
 
 audiocodec msgsm
   info "MS GSM"
-  status ":-)"
+  status working
   format 0x31
   format 0x32
   driver msgsm
 
 audiocodec alaw
   info "aLaw"
-  status ":-)"
+  status working
   format 0x6
   driver alaw
 
 audiocodec ulaw
   info "uLaw"
-  status ":-|"
+  status buggy
   format 0x7
   driver alaw
   comment "aLaw driver seems to play it, but it's weird.. Or is uLaw just shit? :)"
 
 audiocodec pcm
   info "Uncompressed PCM"
-  status ":-)"
+  status working
   format 0x1
   driver pcm
 
 audiocodec ac3
   info "AC3"
-  status ":-)"
+  status working
   format 0x2000
   driver libac3
 
 audiocodec voxware
   info "VoxWare"
-  status ":-|"
+  status buggy
   format 0x75
   driver dshow
   dll "voxmsdec.ax"
@@ -293,14 +322,15 @@ audiocodec voxware
 
 audiocodec acelp
   info "ACELP.net Sipro Lab Audio Decoder"
-  status "X-("
+  status untested
   format 0x130
   driver dshow
   dll "acelpdec.ax"
-  guid 0x4009F700, 0xAEBA, 0x11D1, 0x83, 0x44, 0x00, 0xC0, 0x4F, 0xB9, 0xE2, 0xB7
+;  guid 0x4009F700, 0xAEBA, 0x11D1, 0x83, 0x44, 0x00, 0xC0, 0x4F, 0xB9, 0xE2, 0xB7
+  guid 0x4009f700, 0xaeba, 0x11d1, 0x83, 0x44, 0x00, 0xc0, 0x4f, 0xb9, 0x2e, 0xb7
 
 audiocodec imc
   info "Intel Music Coder"
-  status "X-("
+  status untested
   format 0x401
 ;  driver gebasz