[Mplayer-cvslog] CVS: 0_90/libmpcodecs vd_realvid.c,1.20,1.21

[Arpi of Ize]

Update of /cvsroot/mplayer/0_90/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv27570

Modified Files:
	vd_realvid.c 
Log Message:
backport: retrieve WxH from codec


Index: vd_realvid.c
===================================================================
RCS file: /cvsroot/mplayer/0_90/libmpcodecs/vd_realvid.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vd_realvid.c	11 Feb 2003 19:00:05 -0000	1.20
+++ vd_realvid.c	10 Mar 2003 14:07:20 -0000	1.21
@@ -58,6 +58,7 @@
 #endif
 
 static void *rv_handle=NULL;
+static int inited;
 #ifdef USE_WIN32DLL
 static int dll_type = 0; /* 0 = unix dlopen, 1 = win32 dll */
 #endif
@@ -206,9 +207,10 @@
 		return 0;
 	}
 	// only I420 supported
-	if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_I420)) return 0;
+//	if((sh->format!=0x30335652) && !mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_I420)) return 0;
 	// init codec:
 	sh->context=NULL;
+	inited=0;
 #ifdef USE_WIN32DLL
 	if (dll_type == 1)
 	    result=(*wrvyuv_init)(&init_data, &sh->context);
@@ -220,8 +222,8 @@
 	    return 0;
 	}
 	// setup rv30 codec (codec sub-type and image dimensions):
-	if(extrahdr[1]>=0x20200002){
-	    uint32_t cmsg24[4]={sh->disp_w,sh->disp_h,sh->disp_w,sh->disp_h};
+	if((sh->format<=0x30335652) && (extrahdr[1]>=0x20200002)){
+	    uint32_t cmsg24[4]={sh->disp_w,sh->disp_h,((unsigned short *)extrahdr)[4],((unsigned short *)extrahdr)[5]};
 	    cmsg_data_t cmsg_data={0x24,1+((extrahdr[0]>>16)&7), &cmsg24[0]};
 
 #ifdef USE_WIN32DLL
@@ -270,6 +272,7 @@
 	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 char* buffer;
 
 	unsigned int transform_out[5];
 	transform_in_t transform_in={
@@ -283,18 +286,37 @@
 
 	if(len<=0 || flags&2) return NULL; // skipped frame || hardframedrop
 
+	if(inited){  // rv30 width/height not yet known
 	mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0 /*MP_IMGFLAG_ACCEPT_STRIDE*/,
 		sh->disp_w, sh->disp_h);
 	if(!mpi) return NULL;
+	    buffer=mpi->planes[0];
+	} else {
+	    buffer=malloc(sh->disp_w*sh->disp_h*3/2);
+	    if (!buffer) return 0;
+	}
 	
 #ifdef USE_WIN32DLL
 	if (dll_type == 1)
-	    result=(*wrvyuv_transform)(dp_data, mpi->planes[0], &transform_in,
+	    result=(*wrvyuv_transform)(dp_data, buffer, &transform_in,
 		transform_out, sh->context);
 	else
 #endif
-	result=(*rvyuv_transform)(dp_data, mpi->planes[0], &transform_in,
+	result=(*rvyuv_transform)(dp_data, buffer, &transform_in,
 		transform_out, sh->context);
+
+	if(!inited){  // rv30 width/height now known
+	    sh->aspect=(float)sh->disp_w/(float)sh->disp_h;
+	    sh->disp_w=transform_out[3];
+	    sh->disp_h=transform_out[4];
+	    if (!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_I420)) return 0;
+	    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0 /*MP_IMGFLAG_ACCEPT_STRIDE*/,
+		    sh->disp_w, sh->disp_h);
+	    if(!mpi) return NULL;
+	    memcpy(mpi->planes[0],buffer,sh->disp_w*sh->disp_h*3/2);
+	    free(buffer);
+	    inited=1;
+	} 
 
 	return (result?NULL:mpi);
 }