[Mplayer-cvslog] CVS: main ducktm1.c,NONE,1.1 Makefile,1.143,1.144 codec-cfg.c,1.63,1.64 codec-cfg.h,1.37,1.38 dec_video.c,1.87,1.88

[Mike Melanson]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv1614

Modified Files:
	Makefile codec-cfg.c codec-cfg.h dec_video.c 
Added Files:
	ducktm1.c 
Log Message:
added skeleton for Duck Truemotion v1 decoder (doesn't do anything yet)


--- NEW FILE ---
/*
    Duck Truemotion v1 Decoder for MPlayer
    by Mike Melanson
*/

#include "config.h"
#include "bswap.h"

void decode_duck_tm1(
  unsigned char *encoded,
  int encoded_size,
  unsigned char *decoded,
  int width,
  int height,
  int bytes_per_pixel)
{
}

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- Makefile	18 Jan 2002 05:43:40 -0000	1.143
+++ Makefile	22 Jan 2002 05:39:26 -0000	1.144
@@ -27,7 +27,7 @@
 # a BSD compatible 'install' program
 INSTALL = install
 
-SRCS_COMMON = cyuv.c adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c
+SRCS_COMMON = cyuv.c adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c ducktm1.c
 SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c
 SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c vobsub.c
 

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- codec-cfg.c	18 Jan 2002 05:43:40 -0000	1.63
+++ codec-cfg.c	22 Jan 2002 05:39:26 -0000	1.64
@@ -242,6 +242,7 @@
 		"nuv",
 		"cyuv",
 		"qtsmc",
+		"ducktm1",
 		NULL
 	};
         char **drv=audioflag?audiodrv:videodrv;

Index: codec-cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- codec-cfg.h	18 Jan 2002 05:43:40 -0000	1.37
+++ codec-cfg.h	22 Jan 2002 05:39:26 -0000	1.38
@@ -54,6 +54,7 @@
 #define VFM_NUV 15
 #define VFM_CYUV 16
 #define VFM_QTSMC 17
+#define VFM_DUCKTM1 18
 
 #ifndef GUID_TYPE
 #define GUID_TYPE

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- dec_video.c	20 Jan 2002 01:35:02 -0000	1.87
+++ dec_video.c	22 Jan 2002 05:39:26 -0000	1.88
@@ -168,6 +168,14 @@
   unsigned char *palette_map,
   int bytes_per_pixel);
 
+void decode_duck_tm1(
+  unsigned char *encoded,
+  int encoded_size,
+  unsigned char *decoded,
+  int width,
+  int height,
+  int bytes_per_pixel);
+
 //**************************************************************************//
 //             The OpenDivX stuff:
 //**************************************************************************//
@@ -604,6 +612,7 @@
  case VFM_MSVIDC:
  case VFM_FLI:
  case VFM_QTRLE:
+ case VFM_DUCKTM1:
    {
 #ifdef USE_MP_IMAGE
     sh_video->image->type=MP_IMGTYPE_STATIC;
@@ -974,6 +983,13 @@
         start, in_size, sh_video->our_out_buffer,
         sh_video->disp_w, sh_video->disp_h,
         (unsigned char *)sh_video->bih+40,
+        ((out_fmt&255)+7)/8);
+    blit_frame = 3;
+    break;
+  case VFM_DUCKTM1:
+    decode_duck_tm1(
+        start, in_size, sh_video->our_out_buffer,
+        sh_video->disp_w, sh_video->disp_h,
         ((out_fmt&255)+7)/8);
     blit_frame = 3;
     break;