--- image.h	2002/11/07 10:28:15	1.8.2.4
+++ image.h	2003/02/22 08:49:45	1.11.2.1
@@ -1,21 +1,15 @@
 #ifndef _IMAGE_H_
 #define _IMAGE_H_
 
+#include <stdlib.h>
+
 #include "../portab.h"
+#include "../global.h"
 #include "colorspace.h"
 #include "../xvid.h"
 
 #define EDGE_SIZE  64
 
-
-typedef struct
-{
-	uint8_t *y;
-	uint8_t *u;
-	uint8_t *v;
-}
-IMAGE;
-
 void init_image(uint32_t cpu_flags);
 
 
@@ -34,15 +28,18 @@
 
 void image_swap(IMAGE * image1,
 				IMAGE * image2);
+				
 void image_copy(IMAGE * image1,
 				IMAGE * image2,
 				uint32_t edged_width,
 				uint32_t height);
+				
 void image_setedges(IMAGE * image,
 					uint32_t edged_width,
 					uint32_t edged_height,
 					uint32_t width,
 					uint32_t height);
+					
 void image_interpolate(const IMAGE * refn,
 					   IMAGE * refh,
 					   IMAGE * refv,
@@ -59,12 +56,24 @@
 				 uint16_t height);
 
 
+float sse_to_PSNR(long sse, int pixels);
+
+long plane_sse(uint8_t * orig,
+		   uint8_t * recon,
+		   uint16_t stride,
+		   uint16_t width,
+		   uint16_t height);
+
+void
+image_chroma_optimize(IMAGE * img, int width, int height, int edged_width);
+
+
 int image_input(IMAGE * image,
 				uint32_t width,
 				int height,
 				uint32_t edged_width,
-				uint8_t * src,
-				int src_stride,
+				uint8_t * src[4],
+				int src_stride[4],
 				int csp,
 				int interlaced);
 
@@ -72,8 +81,8 @@
 				 uint32_t width,
 				 int height,
 				 uint32_t edged_width,
-				 uint8_t * dst,
-				 uint32_t dst_stride,
+				 uint8_t * dst[4],
+				 uint32_t dst_stride[4],
 				 int csp,
 				 int interlaced);
 
@@ -92,6 +101,18 @@
 				uint32_t height);
 
 void
-output_slice(IMAGE * cur, int edged_width, int width, XVID_DEC_PICTURE* out_frm, int mbx, int mby,int mbl);
+output_slice(IMAGE * cur, int edged_width, int width, xvid_image_t* out_frm, int mbx, int mby,int mbl);
+
+
+void
+image_clear(IMAGE * img, int width, int height, int edged_width,
+					int y, int u, int v);
+
+
+void
+image_deblock_rrv(IMAGE * img, int edgeg_width,
+				const MACROBLOCK * mbs, int mb_width, int mb_height, int mb_stride,
+				int block, int flags);
+
 
 #endif							/* _IMAGE_H_ */