[Mplayer-cvslog] CVS: main qtsmc.c,NONE,1.1 codec-cfg.c,1.62,1.63 codec-cfg.h,1.36,1.37 dec_video.c,1.85,1.86 Makefile,1.142,1.143

[Mike Melanson]

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

Modified Files:
	codec-cfg.c codec-cfg.h dec_video.c Makefile 
Added Files:
	qtsmc.c 
Log Message:
added skeleton for QT SMC decoder


--- NEW FILE ---
/*
    Apple Graphics (SMC) Decoder for MPlayer
    by Mike Melanson
*/

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

#define BE_16(x) (be2me_16(*(unsigned short *)(x)))
#define BE_32(x) (be2me_32(*(unsigned int *)(x)))

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

}

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- codec-cfg.c	7 Jan 2002 00:52:09 -0000	1.62
+++ codec-cfg.c	18 Jan 2002 05:43:40 -0000	1.63
@@ -241,6 +241,7 @@
 		"qtrle",
 		"nuv",
 		"cyuv",
+		"qtsmc",
 		NULL
 	};
         char **drv=audioflag?audiodrv:videodrv;

Index: codec-cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- codec-cfg.h	17 Jan 2002 09:20:29 -0000	1.36
+++ codec-cfg.h	18 Jan 2002 05:43:40 -0000	1.37
@@ -53,6 +53,7 @@
 #define VFM_QTRLE 14
 #define VFM_NUV 15
 #define VFM_CYUV 16
+#define VFM_QTSMC 17
 
 #ifndef GUID_TYPE
 #define GUID_TYPE

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- dec_video.c	16 Jan 2002 01:51:34 -0000	1.85
+++ dec_video.c	18 Jan 2002 05:43:40 -0000	1.86
@@ -157,6 +157,15 @@
   int height,
   int bit_per_pixel);
 
+void qt_decode_smc(
+  unsigned char *encoded,
+  int encoded_size,
+  unsigned char *decoded,
+  int width,
+  int height,
+  int encoded_bpp,
+  int bytes_per_pixel);
+
 //**************************************************************************//
 //             The OpenDivX stuff:
 //**************************************************************************//
@@ -593,6 +602,7 @@
  case VFM_MSVIDC:
  case VFM_FLI:
  case VFM_QTRLE:
+ case VFM_QTSMC:
    {
 #ifdef USE_MP_IMAGE
     sh_video->image->type=MP_IMGTYPE_STATIC;
@@ -939,6 +949,14 @@
     break;
   case VFM_QTRLE:
     qt_decode_rle(
+        start, in_size, sh_video->our_out_buffer,
+        sh_video->disp_w, sh_video->disp_h,
+        sh_video->bih->biBitCount,
+        ((out_fmt&255)+7)/8);
+    blit_frame = 3;
+    break;
+  case VFM_QTSMC:
+    qt_decode_smc(
         start, in_size, sh_video->our_out_buffer,
         sh_video->disp_w, sh_video->disp_h,
         sh_video->bih->biBitCount,

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- Makefile	17 Jan 2002 01:27:45 -0000	1.142
+++ Makefile	18 Jan 2002 05:43:40 -0000	1.143
@@ -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
+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_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