[Mplayer-cvslog] CVS: main codec-cfg.c,1.36,1.37 codec-cfg.h,1.16,1.17 dec_video.c,1.36,1.37 Makefile,1.67,1.68

[Arpi of Ize]

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

Modified Files:
	codec-cfg.c codec-cfg.h dec_video.c Makefile 
Log Message:
native codec 'rle' added

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- codec-cfg.c	23 Sep 2001 20:40:04 -0000	1.36
+++ codec-cfg.c	24 Sep 2001 20:21:53 -0000	1.37
@@ -221,6 +221,7 @@
 		"vfwex",
 		"divx4",
 		"raw",
+		"rle",
 		NULL
 	};
         char **drv=audioflag?audiodrv:videodrv;

Index: codec-cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- codec-cfg.h	21 Sep 2001 21:40:16 -0000	1.16
+++ codec-cfg.h	24 Sep 2001 20:21:53 -0000	1.17
@@ -38,6 +38,7 @@
 #define VFM_VFWEX 6
 #define VFM_DIVX4 7
 #define VFM_RAW 8
+#define VFM_RLE 9
 
 #ifndef GUID_TYPE
 #define GUID_TYPE

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- dec_video.c	21 Sep 2001 21:34:56 -0000	1.36
+++ dec_video.c	24 Sep 2001 20:21:53 -0000	1.37
@@ -62,6 +62,9 @@
 #include <decore.h>
 #endif
 
+void AVI_Decode_RLE8(char *image,char *delta,int tdsize,
+    unsigned int *map,int imagex,int imagey,unsigned char x11_bytes_pixel);
+
 //**************************************************************************//
 //             The OpenDivX stuff:
 //**************************************************************************//
@@ -351,6 +354,11 @@
  case VFM_RAW: {
    break;
  }
+ case VFM_RLE: {
+   int bpp=((out_fmt&255)+7)/8; // RGB only
+   sh_video->our_out_buffer = memalign(64,sh_video->disp_w*sh_video->disp_h*bpp); // FIXME!!!
+   break;
+ }
 }
   sh_video->inited=1;
   return 1;
@@ -551,6 +559,14 @@
   case VFM_RAW:
     planes[0]=start;
     blit_frame=2;
+    break;
+  case VFM_RLE:
+//void AVI_Decode_RLE8(char *image,char *delta,int tdsize,
+//    unsigned int *map,int imagex,int imagey,unsigned char x11_bytes_pixel);
+    AVI_Decode_RLE8(sh_video->our_out_buffer,start,in_size, 
+       (int*)(((char*)sh_video->bih)+40),
+      sh_video->disp_w,sh_video->disp_h,((out_fmt&255)+7)/8);
+    blit_frame=3;
     break;
 } // switch
 //------------------------ frame decoded. --------------------

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Makefile	25 Aug 2001 21:05:23 -0000	1.67
+++ Makefile	24 Sep 2001 20:21:53 -0000	1.68
@@ -16,7 +16,7 @@
 #prefix = /usr/local
 BINDIR = ${prefix}/bin
 # BINDIR = /usr/local/bin
-SRCS = mp_msg.c open.c parse_es.c ac3-iec958.c find_sub.c aviprint.c dec_audio.c dec_video.c aviwrite.c aviheader.c asfheader.c demux_avi.c demux_asf.c demux_mpg.c demux_mov.c demuxer.c stream.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c mixer.c dvdauth.c spudec.c $(STREAM_SRCS)
+SRCS = mp_msg.c open.c parse_es.c ac3-iec958.c find_sub.c aviprint.c dec_audio.c dec_video.c aviwrite.c aviheader.c asfheader.c demux_avi.c demux_asf.c demux_mpg.c demux_mov.c demuxer.c stream.c codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c xa/rle8.c lirc_mp.c cfgparser.c mixer.c dvdauth.c spudec.c $(STREAM_SRCS)
 OBJS = $(SRCS:.c=.o)
 CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo $(CSS_INC) $(EXTRA_INC) # -Wall
 A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB)