--- image.h	2002/04/09 13:35:40	1.3
+++ image.h	2002/09/25 23:37:09	1.9
@@ -3,36 +3,84 @@
 
 #include "../portab.h"
 #include "colorspace.h"
+#include "../xvid.h"
 
 #define EDGE_SIZE  32
 
 
 typedef struct
 {
-	uint8_t * y;
-	uint8_t * u;
-	uint8_t * v;
-} IMAGE;
+	uint8_t *y;
+	uint8_t *u;
+	uint8_t *v;
+}
+IMAGE;
 
 void init_image(uint32_t cpu_flags);
 
-int32_t image_create(IMAGE * image, uint32_t edged_width, uint32_t edged_height);
-void image_destroy(IMAGE * image, uint32_t edged_width, uint32_t edged_height);
+int32_t image_create(IMAGE * image,
+					 uint32_t edged_width,
+					 uint32_t edged_height);
+void image_destroy(IMAGE * image,
+				   uint32_t edged_width,
+				   uint32_t edged_height);
+
+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,
+					   IMAGE * refhv,
+					   uint32_t edged_width,
+					   uint32_t edged_height,
+					   uint32_t rounding);
+
+float image_psnr(IMAGE * orig_image,
+				 IMAGE * recon_image,
+				 uint16_t stride,
+				 uint16_t width,
+				 uint16_t height);
+
+
+int image_input(IMAGE * image,
+				uint32_t width,
+				int height,
+				uint32_t edged_width,
+				uint8_t * src,
+				int csp);
+
+int image_output(IMAGE * image,
+				 uint32_t width,
+				 int height,
+				 uint32_t edged_width,
+				 uint8_t * dst,
+				 uint32_t dst_stride,
+				 int csp);
+
+
+
+int image_dump_yuvpgm(const IMAGE * image,
+					  const uint32_t edged_width,
+					  const uint32_t width,
+					  const uint32_t height,
+					  char *filename);
+
+float image_mad(const IMAGE * img1,
+				const IMAGE * img2,
+				uint32_t stride,
+				uint32_t width,
+				uint32_t height);
 
-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);
-void image_interpolate(const IMAGE * refn, 
-					   IMAGE * refh, IMAGE * refv,	IMAGE * refhv, 
-					   uint32_t edged_width, uint32_t edged_height, uint32_t rounding);
-
-float image_psnr(IMAGE *orig_image, IMAGE *recon_image,
-              uint16_t stride, uint16_t width, uint16_t height);
+void
+output_slice(IMAGE * cur, int edged_width, int width, XVID_DEC_PICTURE* out_frm, int mbx, int mby,int mbl);
 
-int image_input(IMAGE * image, uint32_t width, int height, uint32_t edged_width,
-			uint8_t * src, int csp);
-
-int image_output(IMAGE * image, uint32_t width, int height, uint32_t edged_width,
-			uint8_t * dst, uint32_t dst_stride, int csp);
-
-#endif /* _IMAGE_H_ */
+#endif							/* _IMAGE_H_ */