[Mplayer-cvslog] CVS: main spudec.c,1.21,1.22 spudec.h,1.8,1.9

Arpi of Ize arpi at mplayer.dev.hu
Wed Apr 3 20:14:24 CEST 2002


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

Modified Files:
	spudec.c spudec.h 
Log Message:
spudec_update_palette() added - dvdnav patch by Kees Cook <mplayer at outflux.net>

Index: spudec.c
===================================================================
RCS file: /cvsroot/mplayer/main/spudec.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- spudec.c	29 Mar 2002 03:17:57 -0000	1.21
+++ spudec.c	3 Apr 2002 18:14:21 -0000	1.22
@@ -206,6 +206,9 @@
       case 0x00:
 	/* Menu ID, 1 byte */
 	mp_msg(MSGT_SPUDEC,MSGL_DBG2,"Menu ID\n");
+        /* shouldn't a Menu ID type force display start? */
+	//this->start_pts = pts100 + date;
+	//this->end_pts = UINT_MAX;
 	break;
       case 0x01:
 	/* Start display */
@@ -651,6 +654,18 @@
 		   spu->scaled_image, spu->scaled_aimage, spu->scaled_stride);
     }
   }
+  else
+  {
+    mp_msg(MSGT_SPUDEC,MSGL_DBG2,"SPU not displayed: start_pts=%d  end_pts=%d  now_pts=%d\n",
+        spu->start_pts, spu->end_pts, spu->now_pts);
+  }
+}
+
+void spudec_update_palette(void * this, unsigned int *palette)
+{
+  spudec_handle_t *spu = (spudec_handle_t *) this;
+  if (spu && palette)
+    memcpy(spu->global_palette, palette, sizeof(spu->global_palette));
 }
 
 void *spudec_new_scaled(unsigned int *palette, unsigned int frame_width, unsigned int frame_height)

Index: spudec.h
===================================================================
RCS file: /cvsroot/mplayer/main/spudec.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- spudec.h	10 Jan 2002 17:17:05 -0000	1.8
+++ spudec.h	3 Apr 2002 18:14:21 -0000	1.9
@@ -5,6 +5,7 @@
 void spudec_assemble(void *this, unsigned char *packet, unsigned int len, unsigned int pts100);
 void spudec_draw(void *this, void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
 void spudec_draw_scaled(void *this, unsigned int dxs, unsigned int dys, void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
+void spudec_update_palette(void *this, unsigned int *palette);
 void *spudec_new_scaled(unsigned int *palette, unsigned int frame_width, unsigned int frame_height);
 void *spudec_new(unsigned int *palette);
 void spudec_free(void *this);




More information about the MPlayer-cvslog mailing list