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

[Michael Niedermayer]

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

Modified Files:
	postprocess.c 
Log Message:
negative black bugfix


Index: postprocess.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/postprocess.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- postprocess.c	22 Oct 2001 23:36:35 -0000	1.18
+++ postprocess.c	23 Oct 2001 00:03:19 -0000	1.19
@@ -136,7 +136,6 @@
 double maxClippedThreshold= 0.01;
 
 int maxAllowedY=234;
-//FIXME can never make a movie´s black brighter (anyone needs that?)
 int minAllowedY=16;
 
 static struct PPFilter filters[]=
@@ -2507,13 +2506,13 @@
 #define SCALED_CPY					\
 						"movq (%0), %%mm0	\n\t"\
 						"movq (%0,%2), %%mm1	\n\t"\
-						"psubusb %%mm2, %%mm0	\n\t"\
-						"psubusb %%mm2, %%mm1	\n\t"\
 						"movq %%mm0, %%mm5	\n\t"\
 						"punpcklbw %%mm4, %%mm0 \n\t"\
 						"punpckhbw %%mm4, %%mm5 \n\t"\
-						"psllw $7, %%mm0	\n\t"\
-						"psllw $7, %%mm5	\n\t"\
+						"psubw %%mm2, %%mm0	\n\t"\
+						"psubw %%mm2, %%mm5	\n\t"\
+						"psllw $6, %%mm0	\n\t"\
+						"psllw $6, %%mm5	\n\t"\
 						"pmulhw %%mm3, %%mm0	\n\t"\
 						"pmulhw %%mm3, %%mm5	\n\t"\
 						"packuswb %%mm5, %%mm0	\n\t"\
@@ -2521,8 +2520,10 @@
 						"movq %%mm1, %%mm5	\n\t"\
 						"punpcklbw %%mm4, %%mm1 \n\t"\
 						"punpckhbw %%mm4, %%mm5 \n\t"\
-						"psllw $7, %%mm1	\n\t"\
-						"psllw $7, %%mm5	\n\t"\
+						"psubw %%mm2, %%mm1	\n\t"\
+						"psubw %%mm2, %%mm5	\n\t"\
+						"psllw $6, %%mm1	\n\t"\
+						"psllw $6, %%mm5	\n\t"\
 						"pmulhw %%mm3, %%mm1	\n\t"\
 						"pmulhw %%mm3, %%mm5	\n\t"\
 						"packuswb %%mm5, %%mm1	\n\t"\
@@ -2685,15 +2686,13 @@
 			clipped-= yHistogram[white];
 		}
 
-		// we cant handle negative correctures
-		packedYOffset= MAX(black - minAllowedY, 0);
+		packedYOffset= (black - minAllowedY) & 0xFFFF;
 		packedYOffset|= packedYOffset<<32;
 		packedYOffset|= packedYOffset<<16;
-		packedYOffset|= packedYOffset<<8;
 
 		scale= (double)(maxAllowedY - minAllowedY) / (double)(white-black);
 
-		packedYScale= (uint16_t)(scale*512.0 + 0.5);
+		packedYScale= (uint16_t)(scale*1024.0 + 0.5);
 		packedYScale|= packedYScale<<32;
 		packedYScale|= packedYScale<<16;
 	}