--- trunk/xvidcore/src/image/image.c	2004/04/01 11:11:28	1397
+++ trunk/xvidcore/src/image/image.c	2005/05/23 09:29:43	1617
@@ -19,22 +19,21 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: image.c,v 1.28 2004-04-01 11:11:28 suxen_drol Exp $
+ * $Id: image.c,v 1.31 2005-05-23 09:29:43 Skal Exp $
  *
  ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>				/* memcpy, memset */
 #include <math.h>
-
 #include "../portab.h"
 #include "../global.h"			/* XVID_CSP_XXX's */
 #include "../xvid.h"			/* XVID_CSP_XXX's */
 #include "image.h"
 #include "colorspace.h"
 #include "interpolate8x8.h"
-#include "reduced.h"
 #include "../utils/mem_align.h"
+#include "../motion/sad.h"
 
 #include "font.h"		/* XXX: remove later */
 
@@ -718,7 +717,7 @@
 			 int height,
 			 uint32_t edged_width,
 			 uint8_t * dst[4],
-			 uint32_t dst_stride[4],
+			 int dst_stride[4],
 			 int csp,
 			 int interlacing)
 {
@@ -893,24 +892,64 @@
 
 }
 
-long plane_sse(uint8_t * orig,
-		   uint8_t * recon,
-		   uint16_t stride,
-		   uint16_t width,
-		   uint16_t height)
+long plane_sse(uint8_t *orig,
+			   uint8_t *recon,
+			   uint16_t stride,
+			   uint16_t width,
+			   uint16_t height)
 {
-	int diff, x, y;
-	long sse=0;
+	int y, bwidth, bheight;
+	long sse = 0;
 
-	for (y = 0; y < height; y++) {
+	bwidth  = width  & (~0x07);
+	bheight = height & (~0x07);
+
+	/* Compute the 8x8 integer part */
+	for (y = 0; y<bheight; y += 8) {
+		int x;
+
+		/* Compute sse for the band */
+		for (x = 0; x<bwidth; x += 8)
+			sse += sse8_8bit(orig  + x, recon + x, stride);
+
+		/* remaining pixels of the 8 pixels high band */
+		for (x = bwidth; x < width; x++) {
+			int diff;
+			diff = *(orig + 0*stride + x) - *(recon + 0*stride + x);
+			sse += diff * diff;
+			diff = *(orig + 1*stride + x) - *(recon + 1*stride + x);
+			sse += diff * diff;
+			diff = *(orig + 2*stride + x) - *(recon + 2*stride + x);
+			sse += diff * diff;
+			diff = *(orig + 3*stride + x) - *(recon + 3*stride + x);
+			sse += diff * diff;
+			diff = *(orig + 4*stride + x) - *(recon + 4*stride + x);
+			sse += diff * diff;
+			diff = *(orig + 5*stride + x) - *(recon + 5*stride + x);
+			sse += diff * diff;
+			diff = *(orig + 6*stride + x) - *(recon + 6*stride + x);
+			sse += diff * diff;
+			diff = *(orig + 7*stride + x) - *(recon + 7*stride + x);
+			sse += diff * diff;
+		}
+
+		orig  += 8*stride;
+		recon += 8*stride;
+	}
+
+	/* Compute the down rectangle sse */
+	for (y = bheight; y < height; y++) {
+		int x;
 		for (x = 0; x < width; x++) {
+			int diff;
 			diff = *(orig + x) - *(recon + x);
 			sse += diff * diff;
 		}
 		orig += stride;
 		recon += stride;
 	}
-	return sse;
+
+	return (sse);
 }
 
 #if 0
@@ -1098,78 +1137,3 @@
 		p += edged_width/2;
 	}
 }
-
-
-/* reduced resolution deblocking filter
-	block = block size (16=rrv, 8=full resolution)
-	flags = XVID_DEC_YDEBLOCK|XVID_DEC_UVDEBLOCK
-*/
-void
-image_deblock_rrv(IMAGE * img, int edged_width,
-				const MACROBLOCK * mbs, int mb_width, int mb_height, int mb_stride,
-				int block, int flags)
-{
-	const int edged_width2 = edged_width /2;
-	const int nblocks = block / 8;	/* skals code uses 8pixel block uints */
-	int i,j;
-
-	/* luma: j,i in block units */
-
-		for (j = 1; j < mb_height*2; j++)		/* horizontal deblocking */
-		for (i = 0; i < mb_width*2; i++)
-		{
-			if (mbs[(j-1)/2*mb_stride + (i/2)].mode != MODE_NOT_CODED ||
-				mbs[(j+0)/2*mb_stride + (i/2)].mode != MODE_NOT_CODED)
-			{
-				hfilter_31(img->y + (j*block - 1)*edged_width + i*block,
-								  img->y + (j*block + 0)*edged_width + i*block, nblocks);
-			}
-		}
-
-		for (j = 0; j < mb_height*2; j++)		/* vertical deblocking */
-		for (i = 1; i < mb_width*2; i++)
-		{
-			if (mbs[(j/2)*mb_stride + (i-1)/2].mode != MODE_NOT_CODED ||
-				mbs[(j/2)*mb_stride + (i+0)/2].mode != MODE_NOT_CODED)
-			{
-				vfilter_31(img->y + (j*block)*edged_width + i*block - 1,
-						   img->y + (j*block)*edged_width + i*block + 0,
-						   edged_width, nblocks);
-			}
-		}
-
-
-
-	/* chroma */
-
-		for (j = 1; j < mb_height; j++)		/* horizontal deblocking */
-		for (i = 0; i < mb_width; i++)
-		{
-			if (mbs[(j-1)*mb_stride + i].mode != MODE_NOT_CODED ||
-				mbs[(j+0)*mb_stride + i].mode != MODE_NOT_CODED)
-			{
-				hfilter_31(img->u + (j*block - 1)*edged_width2 + i*block,
-						   img->u + (j*block + 0)*edged_width2 + i*block, nblocks);
-				hfilter_31(img->v + (j*block - 1)*edged_width2 + i*block,
-						   img->v + (j*block + 0)*edged_width2 + i*block, nblocks);
-			}
-		}
-
-		for (j = 0; j < mb_height; j++)		/* vertical deblocking */
-		for (i = 1; i < mb_width; i++)
-		{
-			if (mbs[j*mb_stride + i - 1].mode != MODE_NOT_CODED ||
-				mbs[j*mb_stride + i + 0].mode != MODE_NOT_CODED)
-			{
-				vfilter_31(img->u + (j*block)*edged_width2 + i*block - 1,
-						   img->u + (j*block)*edged_width2 + i*block + 0,
-						   edged_width2, nblocks);
-				vfilter_31(img->v + (j*block)*edged_width2 + i*block - 1,
-						   img->v + (j*block)*edged_width2 + i*block + 0,
-						   edged_width2, nblocks);
-			}
-		}
-
-
-}
-