[Mplayer-cvslog] CVS: main/libmpcodecs vd_real.c,1.9,1.10

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv22884

Modified Files:
	vd_real.c 
Log Message:
uses new dp_hdr_t packet structure


Index: vd_real.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_real.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vd_real.c	17 Jul 2002 23:28:37 -0000	1.9
+++ vd_real.c	24 Aug 2002 22:40:01 -0000	1.10
@@ -15,7 +15,7 @@
 	"RealVideo decoder",
 	"real",
 	VFM_REAL,
-	"Florian Schneider",
+	"Florian Schneider & A'rpi",
 	"using original closed source codecs for Linux",
 	"binary real video codecs"
 };
@@ -178,19 +178,30 @@
 	rv_handle=NULL;
 }
 
+// copypaste from demux_real.c - it should match to get it working!
+typedef struct dp_hdr_s {
+    uint32_t chunks;	// number of chunks
+    uint32_t timestamp; // timestamp from packet header
+    uint32_t len;	// length of actual data
+    uint32_t chunktab;	// offset to chunk offset array
+} dp_hdr_t;
+
 // decode a frame
 static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
 	mp_image_t* mpi;
 	unsigned long result;
-	int *buff=(unsigned int *)((char*)data+len);
+	dp_hdr_t* dp_hdr=(dp_hdr_t*)data;
+	unsigned char* dp_data=((unsigned char*)data)+sizeof(dp_hdr_t);
+	uint32_t* extra=(uint32_t*)(((char*)data)+dp_hdr->chunktab);
+
 	unsigned long transform_out[5];
 	unsigned long transform_in[6]={
-		len,		// length of the packet (sub-packets appended)
+		dp_hdr->len,	// length of the packet (sub-packets appended)
 		0,		// unknown, seems to be unused
-		buff[0],	// number of sub-packets - 1
-		&buff[2],	// table of sub-packet offsets
+		dp_hdr->chunks,	// number of sub-packets - 1
+		extra,		// table of sub-packet offsets
 		0,		// unknown, seems to be unused
-		buff[1],	// timestamp (the integer value from the stream)
+		dp_hdr->timestamp,// timestamp (the integer value from the stream)
 	};
 
 	if(len<=0 || flags&2) return NULL; // skipped frame || hardframedrop
@@ -199,7 +210,7 @@
 		sh->disp_w, sh->disp_h);
 	if(!mpi) return NULL;
 	
-	result=(*rvyuv_transform)(data, mpi->planes[0], transform_in,
+	result=(*rvyuv_transform)(dp_data, mpi->planes[0], transform_in,
 		transform_out, sh->context);
 
 	return (result?NULL:mpi);