--- image.c	2002/11/27 14:29:34	1.20.2.8
+++ image.c	2002/12/12 12:40:19	1.20.2.10
@@ -59,6 +59,7 @@
 #include "image.h"
 #include "colorspace.h"
 #include "interpolate8x8.h"
+#include "reduced.h"
 #include "../divx4.h"
 #include "../utils/mem_align.h"
 
@@ -475,6 +476,48 @@
 }
 
 
+/*
+chroma optimize filter, invented by mf
+a chroma pixel is average from the surrounding pixels, when the
+correpsonding luma pixels are pure black or white.
+*/
+
+void
+image_chroma_optimize(IMAGE * img, int width, int height, int edged_width)
+{
+	int x,y;
+	int pixels = 0;
+
+	for (y = 1; y < height/2 - 1; y++)
+	for (x = 1; x < width/2 - 1; x++)
+	{
+#define IS_PURE(a)  ((a)<=16||(a)>=235)
+#define IMG_Y(Y,X)	img->y[(Y)*edged_width + (X)]
+#define IMG_U(Y,X)	img->u[(Y)*edged_width/2 + (X)]
+#define IMG_V(Y,X)	img->v[(Y)*edged_width/2 + (X)]
+
+		if (IS_PURE(IMG_Y(y*2  ,x*2  )) && 
+			IS_PURE(IMG_Y(y*2  ,x*2+1)) &&
+			IS_PURE(IMG_Y(y*2+1,x*2  )) && 
+			IS_PURE(IMG_Y(y*2+1,x*2+1)))
+		{
+			IMG_U(y,x) = (IMG_U(y,x-1) + IMG_U(y-1, x) + IMG_U(y, x+1) + IMG_U(y+1, x)) / 4;
+			IMG_V(y,x) = (IMG_V(y,x-1) + IMG_V(y-1, x) + IMG_V(y, x+1) + IMG_V(y+1, x)) / 4;
+			pixels++;
+		}
+
+#undef IS_PURE
+#undef IMG_Y
+#undef IMG_U
+#undef IMG_V
+	}
+	
+	DPRINTF(DPRINTF_DEBUG,"chroma_optimized_pixels = %i/%i", pixels, width*height/4);
+}
+
+
+
+
 
 /*
   perform safe packed colorspace conversion, by splitting
@@ -1055,3 +1098,68 @@
     sV += std2;
   }
 }
+
+
+/* reduced resolution deblocking filter */
+void
+image_deblock_rrv(IMAGE * img, int edged_width,
+				const MACROBLOCK * mbs, int mb_width, int mb_height, int mb_stride)
+{
+	const int edged_width2 = edged_width /2;
+	int i,j;
+
+	/* horizontal deblocking */
+
+	for (j = 1; j < mb_height*2; j++)	// luma: j,i in block units
+	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)
+		{
+			xvid_HFilter_31_C(img->y + (j*16 - 1)*edged_width + i*16,
+							  img->y + (j*16 + 0)*edged_width + i*16, 2);
+		}
+	}
+
+	for (j = 1; j < mb_height; j++)	// chroma
+	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*16 - 1)*edged_width2 + i*16,
+					   img->u + (j*16 + 0)*edged_width2 + i*16, 2);
+			hfilter_31(img->v + (j*16 - 1)*edged_width2 + i*16,
+					   img->v + (j*16 + 0)*edged_width2 + i*16, 2);
+		}
+	}
+
+	/* vertical deblocking */
+
+	for (j = 0; j < mb_height*2; j++)		// luma: i,j in block units
+	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*16)*edged_width + i*16 - 1,
+					   img->y + (j*16)*edged_width + i*16 + 0,
+					   edged_width, 2);
+		}
+	}
+
+	for (j = 0; j < mb_height; j++)	// chroma
+	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*16)*edged_width2 + i*16 - 1,
+					   img->u + (j*16)*edged_width2 + i*16 + 0,
+					   edged_width2, 2);
+			vfilter_31(img->v + (j*16)*edged_width2 + i*16 - 1,
+					   img->v + (j*16)*edged_width2 + i*16 + 0,
+					   edged_width2, 2);
+		}
+	}
+}