mplayer.hg: libvo/vo_dga.c comparison

comparison libvo/vo_dga.c @ 720:8146b106816a

- now chooses mode with highest ymax (enables doublebuffering in some cases it didn't work before) - use my own memcopy() on non MMX machines again - do memcpy() in one single block if stride==0

author	acki2
date	Mon, 07 May 2001 19:16:04 +0000
parents	3693fd4c4ec2
children	83919c1b9924

comparison

equal deleted inserted replaced

-:26786fde68a9
+:8146b106816a
 *      BGR_32_24_888
 *
 * - works only on x86 architectures
 *
 * $Log$
+* Revision 1.22  2001/05/07 19:16:04  acki2
+* - now chooses mode with highest ymax (enables doublebuffering in some cases
+*   it didn't work before)
+* - use my own memcopy() on non MMX machines again
+* - do memcpy() in one single block if stride==0
+*
 * Revision 1.21  2001/05/03 22:39:38  acki2
 * - finally: 15to16 conversion included!!!
 *
 * Revision 1.20  2001/05/02 23:21:27  acki2
 * - now we use fastmemcpy() for copying. Saves about 25% of copying time on K6-2+
 : \
 : "a" (d_add), "b" (count), "S" (src), "D" (dest), \
 		    "d" (numwords) \
 : "memory" )
+// quick & dirty - for debugging only
+void fillblock(char *strt, int yoff, int lines, int val){
+char *i;
+for(i = strt + yoff * vo_dga_width *HW_MODE.vdm_bytespp;
+i< strt + (lines+yoff) * vo_dga_width *HW_MODE.vdm_bytespp;  ){
+*i++ = val;
+}
+}
 //---------------------------------------------------------
 static uint32_t draw_frame( uint8_t *src[] ){
 s = *src;
 d = (&((char *)vo_dga_base)[vo_dga_vp_offset + vo_dga_dbf_current * vo_dga_dbf_mem_offset]);
 switch(SRC_MODE.vdm_conversion_func){
 case VDM_CONV_NATIVE:
-{int i;
-for(i=0; i< vo_dga_lines; i++){
+#ifdef HAVE_MMX
+// use the code from fastmemcpy.h
+if(vo_dga_vp_skip){
+// use some stride ...
+int i;
+for(i=0; i< vo_dga_lines; i++){
 memcpy(d, s, vo_dga_bytes_per_line);
 	d+=vo_dga_vp_skip;
 	d+=vo_dga_bytes_per_line;
 	s+=vo_dga_bytes_per_line;
 }
-}
+}else{
+// no stride, cool + fast ...
+memcpy(d,s, vo_dga_bytes_per_line * vo_dga_lines);
+}
+#else
+// use some homebrewn assembly code ...
+rep_movsl(d, s, lpl, vo_dga_vp_skip, numlines );
+#endif
+// DBG-COde
-	  //    rep_movsl(d, s, lpl, vo_dga_vp_skip, numlines );
+#if 0
+d = (&((char *)vo_dga_base)[vo_dga_vp_offset + vo_dga_dbf_current * vo_dga_dbf_mem_offset]);
+fillblock(d, 0, 10, 0x800000ff);
+fillblock(d, 10, 10, 0x8000ff00);
+fillblock(d, 20, 10, 0x80ff0000);
+fillblock(d, 30, 10, 0xff0000ff);
+fillblock(d, 40, 10, 0x800000ff);
+fillblock(d, 50, 10, 0x0f0000ff);
+#endif
 break;
 case VDM_CONV_15TO16:
 {
 	  int i;
 	  char *e;
 int i,k,l,m;
 for(i = 0; i< vo_dga_lines; i++ ){
 	for(k = 0; k< vo_dga_src_width; k+=2 ){
 l = *(((uint32_t *)s)++);
 m = (l & 0xff000000)>> 24 ;
-*(((uint32_t *)d)++) = l & 0x00ffffff;
+*(((uint32_t *)d)++) = (l & 0x00ffffff); // | 0x80000000;
 m |= *(((uint16_t *)s)++) << 8;
-*(((uint32_t *)d)++) = m;
+*(((uint32_t *)d)++) = m; // | 0x80000000 ;
 	}
 d+= vp_skip;
 }
 }
 //printf("vo_dga: 24 to 32 not implemented yet!!!\n");
 //----------------------------------------------------------
 // TODO: check for larger maxy value
 // (useful for double buffering!!!)
 int check_res( int num, int x, int y, int bpp,
-int new_x, int new_y, int new_vbi,
+	       int new_x, int new_y, int new_vbi, int new_maxy,
-int *old_x, int *old_y, int *old_vbi){
+int *old_x, int *old_y, int *old_vbi, int *old_maxy){
 vd_printf(VD_RES, "vo_dga: (%3d) Trying %4d x %4d @ %3d Hz @ depth %2d ..",
 num, new_x, new_y, new_vbi, bpp );
 vd_printf(VD_RES, "(old: %dx%d@%d).", *old_x, *old_y, *old_vbi);
 if (
 	  *old_vbi >= 50 &&
 	  new_vbi < *old_vbi &&
 	  new_vbi >= 50
 	 )
 	)
+||
+// if everything is equal, then use the mode with the lower
+// stride
+(
+	 (new_x == *old_x) &&
+	 (new_y == *old_y) &&
+(new_vbi == *old_vbi) &&
+(new_maxy > *old_maxy)
+)
 )
 )
 )
 {
 *old_x = new_x;
 *old_y = new_y;
+*old_maxy = new_maxy;
 *old_vbi = new_vbi;
 vd_printf(VD_RES, ".ok!!\n");
 return 1;
 }else{
 vd_printf(VD_RES, ".no\n");
 int x_off, y_off;
 int wanted_width, wanted_height;
 #ifdef HAVE_DGA2
 // needed to change DGA video mode
-int modecount, mX=100000, mY=100000 , mVBI=100000, i,j=0;
+int modecount, mX=100000, mY=100000 , mVBI=100000, mMaxY=0, i,j=0;
 int dga_modenum;
 XDGAMode   *modelines=NULL;
 XDGADevice *dgadevice;
 int max_vpy_pos;
 #else
 #ifdef HAVE_XF86VM
 unsigned int vm_event, vm_error;
 unsigned int vm_ver, vm_rev;
 int i, j=0, have_vm=0;
-int modecount, mX=100000, mY=100000, mVBI=100000, dga_modenum;
+int modecount, mX=100000, mY=100000, mVBI=100000, mMaxY=0, dga_modenum;
 #endif
 int bank, ram;
 #endif
 if( vo_dga_is_running )return -1;
 modelines[i].maxViewportY, modelines[i].depth,
 		       modelines[i].imageWidth, modelines[i].imageHeight );
 if ( check_res(i, wanted_width, wanted_height, modelines[i].depth,
 modelines[i].viewportWidth,
 modelines[i].viewportHeight,
 (unsigned) modelines[i].verticalRefresh,
-&mX, &mY, &mVBI )) j = i;
+		  modelines[i].maxViewportY,
+&mX, &mY, &mVBI, &mMaxY )) j = i;
 }
 }
 vd_printf(VD_INFO,
 "vo_dga: Selected hardware mode %4d x %4d @ %3d Hz @ depth %2d, bitspp %2d.\n",
 mX, mY, mVBI,
 			vo_dga_vidmodes[i]->hdisplay,
 			vo_dga_vidmodes[i]->vdisplay,
 			GET_VREFRESH(vo_dga_vidmodes[i]->dotclock,
 				     vo_dga_vidmodes[i]->htotal,
 				     vo_dga_vidmodes[i]->vtotal),
-			&mX, &mY, &mVBI )) j = i;
+		        0,
+			&mX, &mY, &mVBI, &mMaxY )) j = i;
 }
 vd_printf(VD_INFO,
 "vo_dga: Selected video mode %4d x %4d @ %3d Hz @ depth %2d, bitspp %2d, video %3d x %3d.\n",
 	mX, mY, mVBI,

Mercurial > mplayer.hg

comparison libvo/vo_dga.c @ 720:8146b106816a