[Mplayer-cvslog] CVS: main/postproc postprocess.c,1.15,1.16 postprocess.h,1.11,1.12

[Michael Niedermayer]

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

Modified Files:
	postprocess.c postprocess.h 
Log Message:
added compiletime option to turn width%8==0 on


Index: postprocess.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/postprocess.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- postprocess.c	19 Oct 2001 13:41:37 -0000	1.15
+++ postprocess.c	19 Oct 2001 13:56:12 -0000	1.16
@@ -2561,6 +2561,7 @@
 
 			if(!isColor) yHistogram[ srcBlock[srcStride*5] ]++;
 
+#ifdef PP_FUNNY_STRIDE
 			//can we mess with a 8x16 block, if not use a temp buffer, yes again
 			if(x+7 >= width)
 			{
@@ -2577,6 +2578,7 @@
 				dstBlock= tempDstBlock;
 				srcBlock= tempSrcBlock;
 			}
+#endif
 
 			blockCopy(dstBlock + dstStride*5, dstStride,
 				srcBlock + srcStride*5, srcStride, 8, mode & LEVEL_FIX);
@@ -2657,6 +2659,7 @@
 				dering(dstBlock - stride*9 + width-9, stride, QP);
 			//FIXME dering filter will not be applied to last block (bottom right)
 
+#ifdef PP_FUNNY_STRIDE
 			/* did we use a tmp-block buffer */
 			if(x+7 >= width)
 			{
@@ -2669,6 +2672,7 @@
 					memcpy(dstBlock+i*dstStride, tempDstBlock+i*dstStride, width-x);
 				}
 			}
+#endif
 
 			dstBlock+=8;
 			srcBlock+=8;

Index: postprocess.h
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/postprocess.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- postprocess.h	19 Oct 2001 13:41:38 -0000	1.11
+++ postprocess.h	19 Oct 2001 13:56:12 -0000	1.12
@@ -59,6 +59,9 @@
 
 #define GET_PP_QUALITY_MAX 6
 
+//must be defined if stride%8 != 0
+#define PP_FUNNY_STRIDE
+
 //#define TIMING
 //#define MORE_TIMING