[Mplayer-cvslog] CVS: main/postproc postprocess.c,1.19,1.20

[Michael Niedermayer]

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

Modified Files:
	postprocess.c 
Log Message:
brightness / contrast fix/copy optimizations +2% speedup


Index: postprocess.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/postprocess.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- postprocess.c	23 Oct 2001 00:03:19 -0000	1.19
+++ postprocess.c	23 Oct 2001 01:46:50 -0000	1.20
@@ -2478,8 +2478,6 @@
 	return modes[quality];
 }
 
-//} // extern "C"
-
 /**
  * Copies a block from src to dst and fixes the blacklevel
  * numLines must be a multiple of 4
@@ -2493,8 +2491,6 @@
 	{
 #ifdef HAVE_MMX
 					asm volatile(
-						"movl %4, %%eax \n\t"
-						"movl %%eax, temp0\n\t"
 						"pushl %0 \n\t"
 						"pushl %1 \n\t"
 						"leal (%2,%2), %%eax	\n\t"
@@ -2505,47 +2501,45 @@
 
 #define SCALED_CPY					\
 						"movq (%0), %%mm0	\n\t"\
-						"movq (%0,%2), %%mm1	\n\t"\
-						"movq %%mm0, %%mm5	\n\t"\
+						"movq (%0), %%mm5	\n\t"\
 						"punpcklbw %%mm4, %%mm0 \n\t"\
 						"punpckhbw %%mm4, %%mm5 \n\t"\
 						"psubw %%mm2, %%mm0	\n\t"\
 						"psubw %%mm2, %%mm5	\n\t"\
+						"movq (%0,%2), %%mm1	\n\t"\
 						"psllw $6, %%mm0	\n\t"\
 						"psllw $6, %%mm5	\n\t"\
 						"pmulhw %%mm3, %%mm0	\n\t"\
+						"movq (%0,%2), %%mm6	\n\t"\
 						"pmulhw %%mm3, %%mm5	\n\t"\
-						"packuswb %%mm5, %%mm0	\n\t"\
-						"movq %%mm0, (%1)	\n\t"\
-						"movq %%mm1, %%mm5	\n\t"\
 						"punpcklbw %%mm4, %%mm1 \n\t"\
-						"punpckhbw %%mm4, %%mm5 \n\t"\
+						"punpckhbw %%mm4, %%mm6 \n\t"\
 						"psubw %%mm2, %%mm1	\n\t"\
-						"psubw %%mm2, %%mm5	\n\t"\
+						"psubw %%mm2, %%mm6	\n\t"\
 						"psllw $6, %%mm1	\n\t"\
-						"psllw $6, %%mm5	\n\t"\
+						"psllw $6, %%mm6	\n\t"\
 						"pmulhw %%mm3, %%mm1	\n\t"\
-						"pmulhw %%mm3, %%mm5	\n\t"\
-						"packuswb %%mm5, %%mm1	\n\t"\
+						"pmulhw %%mm3, %%mm6	\n\t"\
+						"addl %%eax, %0		\n\t"\
+						"packuswb %%mm5, %%mm0	\n\t"\
+						"packuswb %%mm6, %%mm1	\n\t"\
+						"movq %%mm0, (%1)	\n\t"\
 						"movq %%mm1, (%1, %3)	\n\t"\
 
-						"1:			\n\t"
 SCALED_CPY
-						"addl %%eax, %0		\n\t"
 						"addl %%ebx, %1		\n\t"
 SCALED_CPY
-						"addl %%eax, %0		\n\t"
 						"addl %%ebx, %1		\n\t"
-						"decl temp0		\n\t"
-						"jnz 1b			\n\t"
+SCALED_CPY
+						"addl %%ebx, %1		\n\t"
+SCALED_CPY
 
 						"popl %1 \n\t"
 						"popl %0 \n\t"
 						: : "r" (src),
 						"r" (dst),
 						"r" (srcStride),
-						"r" (dstStride),
-						"m" (numLines>>2)
+						"r" (dstStride)
 						: "%eax", "%ebx"
 					);
 #else