--- image.h	2002/07/21 03:30:25	1.8
+++ image.h	2004/03/22 22:36:23	1.12
@@ -1,22 +1,48 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Image related header  -
+ *
+ *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
+ *
+ *  This program is free software ; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation ; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  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.h,v 1.12 2004/03/22 22:36:23 edgomez Exp $
+ *
+ ****************************************************************************/
+
 #ifndef _IMAGE_H_
 #define _IMAGE_H_
 
+#include <stdlib.h>
+
 #include "../portab.h"
+#include "../global.h"
 #include "colorspace.h"
 #include "../xvid.h"
 
-#define EDGE_SIZE  32
+#define EDGE_SIZE  64
+
+void init_image(uint32_t cpu_flags);
 
 
-typedef struct
+static void __inline
+image_null(IMAGE * image)
 {
-	uint8_t *y;
-	uint8_t *u;
-	uint8_t *v;
+	image->y = image->u = image->v = NULL;
 }
-IMAGE;
-
-void init_image(uint32_t cpu_flags);
 
 int32_t image_create(IMAGE * image,
 					 uint32_t edged_width,
@@ -27,22 +53,26 @@
 
 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,
-					uint32_t interlacing);
+					int bs_version);
+
 void image_interpolate(const IMAGE * refn,
 					   IMAGE * refh,
 					   IMAGE * refv,
 					   IMAGE * refhv,
 					   uint32_t edged_width,
 					   uint32_t edged_height,
+					   uint32_t quarterpel,
 					   uint32_t rounding);
 
 float image_psnr(IMAGE * orig_image,
@@ -52,20 +82,35 @@
 				 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 csp);
+				uint8_t * src[4],
+				int src_stride[4],
+				int csp,
+				int interlaced);
 
 int image_output(IMAGE * image,
 				 uint32_t width,
 				 int height,
 				 uint32_t edged_width,
-				 uint8_t * dst,
-				 uint32_t dst_stride,
-				 int csp);
+				 uint8_t * dst[4],
+				 uint32_t dst_stride[4],
+				 int csp,
+				 int interlaced);
 
 
 
@@ -82,6 +127,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_ */