updated vivo fourcc's and reorganized some stuff (also new comments and entries)

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

1 files changed, 50 insertions, 29 deletions

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 273203176c..2482cfe836 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -10,6 +10,7 @@ videocodec vivo
   info "Vivo H.263"
   status working
   fourcc VIVO,vivo vivo
+  fourcc viv1,viv2 vivo
   driver vfw
   dll "ivvideo.dll"
   out BGR32,BGR24,BGR16 flip
@@ -20,6 +21,7 @@ videocodec u263
   status working
   fourcc U263
   fourcc vivo,VIVO U263
+  fourcc viv1 U263
   driver dshow
   dll "ubv263d+.ax"
   guid 0x00af1181, 0x6ebb, 0x11d4, 0x9d, 0x5a, 0x00, 0x50, 0x04, 0x79, 0x6c, 0xc0
@@ -147,6 +149,7 @@ videocodec i263
   status working
   fourcc I263,i263,I420,i420
   fourcc vivo,VIVO I263
+  fourcc viv1 I263
   driver vfw
   dll "i263_32.drv"
 ;  out I420
@@ -175,6 +178,7 @@ videocodec mjpeg
   out UYVY
   out BGR32,BGR24,BGR15
 
+
 ; =============== FFMPEG MPEG CODECS =========================
 
 videocodec ffmjpeg
@@ -198,6 +202,7 @@ videocodec ffh263
   info "FFmpeg H263+ decoder"
   status working
   fourcc H263,U263,h263
+  fourcc viv1 h263
   driver ffmpeg
   dll h263
   out YV12
@@ -245,23 +250,8 @@ videocodec mpegpes
   dll "libmpeg2"
   out MPES
 
-; ============== OTHER STUFF =======================
-
-#videocodec fli
-#  info "Autodesk FLI/FLC Animation"
-#  status buggy
-#  fourcc FLIC
-#  driver fli
-#  out BGR24
 
-videocodec video1
-  info "Microsoft Video 1"
-  status working
-  fourcc cram,CRAM
-  fourcc msvc,MSVC
-  fourcc wham,WHAM
-  driver msvidc
-  out BGR24
+; =============== WINDOWS DLL's ==============
 
 videocodec vp3
   info "On2 OpenSource VP3-Codec"
@@ -325,9 +315,11 @@ videocodec cvid
 
 videocodec cram
   info "Microsoft Video 1"
-  comment "8bpp is only supported by GGI (?)"
+  comment "Input bpp = output bpp (8bpp is only supported by vo_ggi)"
   status working
-  fourcc cram,CRAM,MSVC CRAM
+  fourcc cram,CRAM CRAM
+  fourcc msvc,MSVC CRAM
+  fourcc wham,WHAM CRAM
   driver vfw
   dll "msvidc32.dll"
   out BGR8,BGR15,BGR24
@@ -480,14 +472,6 @@ videocodec asv1
   out UYVY
   out BGR32,BGR24,BGR15 flip
 
-videocodec msrle
-  info "M$ RLE8"
-  status working
-  format 0x1
-  driver rle
-  dll "xa_rle8"
-  out BGR32,BGR24,BGR16,BGR15
-
 videocodec 3ivX
   info "3ivX Delta 3.5"
   status crashing
@@ -509,6 +493,7 @@ videocodec 3ivXqtx
   out YUY2
   out BGR32,BGR24,BGR16,BGR15
 
+
 ; =============== XANIM DLL's =============
 
 videocodec indeo5xa
@@ -556,6 +541,7 @@ videocodec h263xa
   info "CCITT H.263"
   status working
   fourcc H263,h263
+  fourcc viv1 H263
   fourcc VIVO,vivo H263
   driver xanim
   dll "vid_h263.xa"
@@ -577,8 +563,36 @@ videocodec cyuvxa
   dll "vid_cyuv.xa"
   out YV12,IYUV,I420
 
+
+; ============== MPLAYER OPENSOURCE CODECS =========
+
+videocodec msrle
+  info "M$ RLE8"
+  status working
+  format 0x1
+  driver rle
+  dll "xa_rle8"
+  out BGR32,BGR24,BGR16,BGR15
+
+;videocodec fli
+;  info "Autodesk FLI/FLC Animation"
+;  status buggy
+;  fourcc FLIC
+;  driver fli
+;  out BGR24
+
+videocodec video1
+  info "Microsoft Video 1"
+  status working
+  fourcc cram,CRAM
+  fourcc msvc,MSVC
+  fourcc wham,WHAM
+  driver msvidc
+  out BGR24
+
 videocodec rawyv12
   info "RAW YV12"
+  comment "pre-postprocessing support"
   status working
   driver raw
   format 0x0
@@ -801,10 +815,17 @@ audiocodec ima4
   driver ima4
   dll "ima4.c"
 
-audiocodec vivosiren
-  info "Vivo G.723/Siren Audio Codec"
+audiocodec vivog723
+  info "Vivo G.723 Audio Codec"
   status untested
   format 0x111       ; vivo g.723
-  format 0x112       ; siren
+;  format 0x112       ; siren
   driver acm
   dll "vivog723.acm"
+
+;audiocodec g72x
+;  info "G.711/G.721/G.723"
+;  status untested
+;  format 0x111	    ; vivo g.623
+;  driver g72x
+;  dll "g72x.c"