native libdv added, fourccs fixed/commented for qdv & mcdv

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

1 files changed, 28 insertions, 5 deletions

diff --git a/etc/codecs.conf b/etc/codecs.conf
index 1b58c54067..65724b5c9f 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -693,13 +693,15 @@ videocodec indeo3xa
   dll "vid_iv32.xa"
   out YV12,IYUV,I420
 
-; DV:  qdv is more stable...  (native libdv support coming soon)
+; DV:  qdv is more stable...  libdv is slow, mcdv is unstable
 
 videocodec qdv
   info "Sony Digital Video (DV)"
   status working
-  fourcc DVSD,dvsd,dvcp dvsd
-;  fourcc "dvc " dvsd
+  fourcc dvsl,dvsd,dvhd  ; ????
+  fourcc DVSD dvsd   ; pal .avi
+  fourcc "dvcp" dvsd ; pal .mov
+  fourcc "dvc " dvsd ; ntsc .mov
   driver dshow
   dll "qdv.dll"
   guid 0xB1B77C00, 0xC3E4, 0x11CF, 0xAF, 0x79, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42
@@ -707,11 +709,25 @@ videocodec qdv
   out UYVY
   out BGR32,BGR24,BGR16,BGR15
 
+videocodec libdv
+  info "Raw DV decoder using libdv"
+  status working
+  fourcc DVSD,dvsd   ; PAL
+  fourcc DVCS,dvcs   ; NTSC ?
+  fourcc "dvcp"      ; PAL DV in .mov
+  fourcc "dvc "      ; NTSC DV in .mov
+  driver libdv
+  out YUY2
+
+; note: it crashes with pond.dv :(
 videocodec mcdv
   info "MainConcept DV Codec"
   status working
-  fourcc DVSD,dvsd,dvcp dvsd		# dvcp stands for PAL DV in mov
-  fourcc "dvc " dvsd
+  fourcc DVSD,dvsd   ; PAL
+  fourcc DVCS,dvcs   ; NTSC ?
+  fourcc CDVC,cdvc   ; ???
+  fourcc "dvcp" dvsd ; PAL DV in .mov
+  fourcc "dvc " dvcs ; NTSC DV in .mov
   driver vfw
   dll "mcdvd_32.dll"
   out YUY2
@@ -1140,6 +1156,13 @@ audiocodec roqaudio
   fourcc RoQA
   driver roqaudio
 
+audiocodec libdv
+  info "raw DV audio decoder"
+  status working
+  comment "raw DV audio decoder"
+  fourcc RADV
+  driver libdv
+
 audiocodec faad
   info "AAC MPEG2/MPEG4 Audio"
   status working