Mercurial > mplayer.hg

changeset 5375:c4e62a4e44ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
I420 added to native YV12 codecs, useless cpuinfo removed, native zlib added, some cosmetics
author arpi
date Thu, 28 Mar 2002 00:59:06 +0000
parents 774189ab0446
children 19ecb71891d8
files etc/codecs.conf
diffstat 1 files changed, 36 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Thu Mar 28 00:26:23 2002 +0000
+++ b/etc/codecs.conf	Thu Mar 28 00:59:06 2002 +0000
@@ -11,7 +11,7 @@
 ; Note: mpegpes is preferred for hw decoders:
 
 videocodec mpegpes
-  info "Mpeg PES output (.mpg or DVB card)"
+  info "Mpeg PES output (.mpg or Dxr3/DVB card)"
   comment "for hardware decoding"
   status working
   format 0x10000001  ; mpeg 1
@@ -28,7 +28,7 @@
   format 0x10000002  ; mpeg 2
   driver libmpeg2
   dll "libmpeg2"
-  out YV12
+  out YV12,I420,IYUV
 
 videocodec ffmpeg12
   info "FFmpeg-1"
@@ -39,7 +39,7 @@
   fourcc PIM1
   driver ffmpeg
   dll "mpegvideo"
-  out YV12
+  out YV12,I420,IYUV
 
 ; we have only native opensource codecs for these:
 
@@ -48,7 +48,7 @@
   status working
   fourcc NUV1
   driver nuv
-  out I420
+  out I420,IYUV,YV12
 
 videocodec mpng
   info "mPNG codec"
@@ -69,8 +69,7 @@
 videocodec qtrle
   info "Quicktime Animation (RLE)"
   status working
-; codec fourcc = "rle "
-  format 0x20656C72
+  format 0x20656C72 ; "rle "
   driver qtrle
   out BGR32,BGR24
 
@@ -84,8 +83,7 @@
 videocodec qtsmc
   info "Apple Graphics (SMC) codec"
   status working
-; codec fourcc = "smc "
-  format 0x20636d73
+  format 0x20636d73 ; "smc "
   driver qtsmc
   out BGR32,BGR24
 
@@ -139,12 +137,10 @@
 ;  out YUY2
 ;  out UYVY
   out BGR24,BGR15
-  cpuflags mmx
 
 videocodec huffyuv
   info "HuffYUV"
-  status buggy
-  comment "YUY2 _or_ 24/32bpp only (depending on file encoding)"
+  status working
   fourcc HFYU
   driver vfw
   dll "huffyuv.dll"
@@ -168,13 +164,13 @@
   status working
   fourcc cvid,CVID
   driver cinepak
-  out YV12
+  out YV12,I420,IYUV
   out YUY2
   out BGR32,BGR24
 
 videocodec mphuffyuv
   info "HuffYUV Mplayer Native Decoder"
-  status buggy
+  status working
   fourcc HFYU
   driver huffyuv
   out YUY2
@@ -212,10 +208,10 @@
   fourcc AP41 div3	  ; AngelPotion stuff
   driver ffmpeg
   dll msmpeg4
-  out YV12
+  out YV12,I420,IYUV
 
 videocodec ffodivx
-  info "FFmpeg OpenDivX"
+  info "FFmpeg MPEG-4"
   status working
   fourcc DIVX,divx
   fourcc DIV1,div1 divx
@@ -226,7 +222,7 @@
   format 0x4
   driver ffmpeg
   dll mpeg4 ;opendivx
-  out YV12
+  out YV12,I420,IYUV
 
 ; divx4 does direct render, and is native on linux
 
@@ -244,7 +240,7 @@
   format 0x4
   driver odivx
   dll "opendivx decore"
-  out YV12
+  out YV12,I420,IYUV
 
 videocodec divx4
   info "DivX4Linux (MPEG-4 v2,v3)"
@@ -260,8 +256,7 @@
   format 0x4
   driver divx4
   dll "libdivxdecore.0"
-;  out YV12   ; works, but odivx driver is faster with YV12 (DEC_USER)
-;  out I420
+  out I420 ; planar direct rendering
   out YUY2
   out UYVY
   out BGR32,BGR24,BGR16,BGR15
@@ -283,7 +278,6 @@
 ;  out YV12   ; buggy
   out YUY2
   out BGR32,BGR24,BGR15
-  cpuflags mmx
 
 ; the original ones...  prefer DShow for postprocessing:
 
@@ -302,7 +296,6 @@
 ;  out YV12
   out YUY2
   out BGR32,BGR24,BGR16,BGR15
-  cpuflags mmx
 
 videocodec divx
   info "DivX ;-) (MS MPEG-4 v3)"
@@ -316,7 +309,6 @@
   dll "divxc32.dll"
   out YUY2 yuvhack
   out BGR32,BGR24,BGR15
-  cpuflags mmx
   
 ; hmm. we should check, maybe these are/will be playable with libavcodec:
 
@@ -333,7 +325,6 @@
   guid 0x82CCD3E0, 0xF71A, 0x11D0, 0x9F, 0xE5, 0x00, 0x60, 0x97, 0x78, 0xEA, 0x66
   out YUY2
   out BGR32,BGR24,BGR16,BGR15
-  cpuflags mmx
 
 videocodec mpeg4
   info "Microsoft MPEG-4 v1/v2"
@@ -345,7 +336,6 @@
   dll "mpg4c32.dll"
   out YUY2 yuvhack
   out BGR32,BGR24,BGR15
-  cpuflags mmx
 
 videocodec wmv8
   info "Windows Media Video 8"
@@ -356,7 +346,6 @@
   guid 0x521fb373, 0x7654, 0x49f2, 0xbd, 0xb1, 0x0c, 0x6e, 0x66, 0x60, 0x71, 0x4f
   out YUY2
   out BGR32,BGR24,BGR16,BGR15
-  cpuflags mmx
 
 videocodec wmv7
   info "Windows Media Video 7"
@@ -368,7 +357,6 @@
 ;  out I420
   out YUY2
   out BGR32,BGR24,BGR16,BGR15
-  cpuflags mmx
 
 ; mjpegs:
 ; Notes: m3jpeg+mjpeg are mmx optimized. avid is very stable but slow.
@@ -385,7 +373,6 @@
   out YUY2
   out UYVY
   out BGR32,BGR24,BGR15
-  cpuflags mmx
 
 videocodec mjpeg
   info "MainConcept Motion JPEG"
@@ -398,7 +385,6 @@
   out YUY2
   out UYVY
   out BGR32,BGR24,BGR15
-  cpuflags mmx
 
 videocodec avid
   info "AVID"
@@ -428,8 +414,8 @@
   fourcc jpeg ; photo-jpeg
   driver ffmpeg
   dll mjpeg
-;  out YUY2
-  out YV12
+  out YV12,I420,IYUV
+  out YUY2
 
 videocodec morgands
   info "Morgan MJPEG"
@@ -452,7 +438,6 @@
   dll "ivvideo.dll"
   out BGR32,BGR24,BGR15 flip
   in BGR24
-  cpuflags mmx
 
 videocodec u263
   info "UB Video H.263+ Decoder"
@@ -470,7 +455,6 @@
 ;  out UYVY flip,noflip
 ;  out YUY2 flip
   out BGR24 flip
-  cpuflags mmx
 
 videocodec i263
   info "I263"
@@ -483,7 +467,6 @@
 ;  out I420
   out YUY2
   out BGR32,BGR24,BGR15
-  cpuflags mmx
 
 videocodec ffi263
   info "FFmpeg I263 decoder"
@@ -491,7 +474,7 @@
   fourcc I263,i263
   driver ffmpeg
   dll h263i
-  out YV12
+  out YV12,I420,IYUV
 
 videocodec ffh263
   info "FFmpeg H263+ decoder"
@@ -500,7 +483,7 @@
   fourcc viv1 h263
   driver ffmpeg
   dll h263
-  out YV12
+  out YV12,I420,IYUV
 
 videocodec h263xa
   info "CCITT H.263"
@@ -543,7 +526,6 @@
   out YV12
   out YUY2
   out BGR32,BGR24,BGR16,BGR15
-  cpuflags mmx
 
 videocodec indeo5
   info "Intel Indeo 5"
@@ -563,18 +545,16 @@
   driver vfw
   dll "ir41_32.dll"
   out BGR24,BGR15
-  cpuflags mmx
 
 videocodec indeo3
   info "Intel Indeo 3.1/3.2"
-  status buggy
+  status working
   comment "upside-down with some vo drivers, (no yuv)"
   fourcc IV31,iv31
   fourcc IV32,iv32
   driver vfw
   dll "ir32_32.dll"
   out BGR24,BGR15 flip
-  cpuflags mmx
 
 videocodec indeo5xa
   info "Intel Indeo 5"
@@ -614,7 +594,6 @@
   out YUY2
   out UYVY
   out BGR32,BGR24,BGR16,BGR15
-  cpuflags mmx
 
 videocodec mcdv
   info "MainConcept DV Codec"
@@ -657,7 +636,7 @@
   fourcc RV13,rv13
   driver ffmpeg
   dll rv10
-  out YV12
+  out YV12,I420,IYUV
 
 videocodec vp3
   info "On2 OpenSource VP3-Codec"
@@ -668,11 +647,10 @@
   dll "vp31vfw.dll"
   out YUY2
   out BGR32,BGR24,BGR15
-  cpuflags mmx
 
 videocodec mwv1
   info "Motion Wavelets"
-  status buggy
+  status working
   comment "no yuv, flip requires"
   fourcc MWV1
   driver vfw
@@ -680,11 +658,10 @@
 ;  out YV12 flip
 ;  out YUY2 flip
   out BGR32,BGR24,BGR15 flip
-  cpuflags mmx
 
 videocodec asv2
   info "ASUS V2"
-  status buggy
+  status working
   comment "rgb upside down, yuv ok"
   fourcc ASV2
   driver vfw
@@ -692,11 +669,10 @@
 ;  out YVYU
   out UYVY
   out BGR32,BGR24,BGR15 flip
-  cpuflags mmx
 
 videocodec asv1
   info "ASUS V1"
-  status buggy
+  status working
   comment "rgb upside down, yuv ok"
   fourcc ASV1
   driver vfw
@@ -704,7 +680,6 @@
 ;  out YVYU
   out UYVY
   out BGR32,BGR24,BGR15 flip
-  cpuflags mmx
 
 videocodec CJPG
   info "CJPG"
@@ -718,20 +693,27 @@
 
 ; buggy codecs:  (any volunteers for native rewrite?)
 
+videocodec zlibnative
+  info "AVIzlib native"
+  status untested
+  comment "bpp autodetected"
+  fourcc ZLIB
+  driver zlib
+  dll "libz.so"
+  out BGR32,BGR24,BGR16,BGR15,BGR8 flip
+
 videocodec zlib
   info "AVIzlib"
-  status buggy
+  status working
   comment "24bpp only"
   fourcc ZLIB
   driver vfw
   dll "avizlib.dll"
-;  out YUY2
-;  out BGR32,BGR24,BGR15
-  out BGR24
+  out BGR24 flip
 
 videocodec mszh
   info "AVImszh"
-  status buggy
+  status working
   comment "24bpp only"
   fourcc MSZH
   driver vfw
@@ -762,7 +744,6 @@
   dll "ativcr2.dll"
   out YUY2
   out BGR32,BGR24,BGR15
-  cpuflags mmx
 
 videocodec tm20
   info "TrueMotion 2.0"
@@ -901,7 +882,6 @@
   out UYVY
   out BGR32,BGR24,BGR16,BGR15
 
-
 ;=============================================================================
 ;                   AUDIO CODECS
 ;=============================================================================
@@ -942,7 +922,7 @@
 
 audiocodec faad
   info "AAC MPEG2/MPEG4 Audio"
-  status buggy
+  status working
   comment "Under developemnt by Atmos"
   fourcc mp4a,MP4A
   driver faad
@@ -970,7 +950,6 @@
   format 0x161
   driver acm
   dll "divxa32.acm"
-  cpuflags mmx
 
 audiocodec msadpcmacm
   info "MS ADPCM"