--- sad.h	2002/04/13 16:30:02	1.5
+++ sad.h	2005/01/05 23:02:15	1.22
@@ -1,104 +1,211 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Sum Of Absolute Difference 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: sad.h,v 1.22 2005/01/05 23:02:15 edgomez Exp $
+ *
+ ****************************************************************************/
+
 #ifndef _ENCODER_SAD_H_
 #define _ENCODER_SAD_H_
 
-
 #include "../portab.h"
 
-typedef void (sadInitFunc)(void);
-typedef sadInitFunc* sadInitFuncPtr;
+typedef void (sadInitFunc) (void);
+typedef sadInitFunc *sadInitFuncPtr;
 
 extern sadInitFuncPtr sadInit;
 sadInitFunc sadInit_altivec;
 
-
-typedef uint32_t (sad16Func)(const uint8_t * const cur,
-						 const uint8_t * const ref,
-						 const uint32_t stride,
-						 const uint32_t best_sad);
-typedef sad16Func* sad16FuncPtr;	
+typedef uint32_t(sad16Func) (const uint8_t * const cur,
+							 const uint8_t * const ref,
+							 const uint32_t stride,
+							 const uint32_t best_sad);
+typedef sad16Func *sad16FuncPtr;
 extern sad16FuncPtr sad16;
 sad16Func sad16_c;
+
+#ifdef ARCH_IS_IA32
 sad16Func sad16_mmx;
 sad16Func sad16_xmm;
-sad16Func sad16_altivec;
-
-
-typedef uint32_t (sad16biFunc)(const uint8_t * const cur,
-						 const uint8_t * const ref1,
-						 const uint8_t * const ref2,
-						 const uint32_t stride);
-typedef sad16biFunc* sad16biFuncPtr;	
-extern sad16biFuncPtr sad16bi;
-sad16biFunc sad16bi_c;
-//sad16biFunc sad16bi_mmx;
-//sad16biFunc sad16bi_xmm;
-
-
-typedef uint32_t (sad8Func)(const uint8_t * const cur,
-						const uint8_t * const ref,
-						const uint32_t stride);
-typedef sad8Func* sad8FuncPtr;	
+sad16Func sad16_3dne;
+sad16Func sad16_sse2;
+#endif
+
+#ifdef ARCH_IS_IA64
+sad16Func sad16_ia64;
+#endif
+
+#ifdef ARCH_IS_PPC
+sad16Func sad16_altivec_c;
+#endif
+
+#ifdef ARCH_IS_X86_64
+sad16Func sad16_x86_64;
+#endif
+
+sad16Func mrsad16_c;
+
+typedef uint32_t(sad8Func) (const uint8_t * const cur,
+							const uint8_t * const ref,
+							const uint32_t stride);
+typedef sad8Func *sad8FuncPtr;
 extern sad8FuncPtr sad8;
 sad8Func sad8_c;
+
+#ifdef ARCH_IS_IA32
 sad8Func sad8_mmx;
 sad8Func sad8_xmm;
-sad8Func sad8_altivec;
+sad8Func sad8_3dne;
+#endif
 
+#ifdef ARCH_IS_IA64
+sad8Func sad8_ia64;
+#endif
+
+#ifdef ARCH_IS_PPC
+sad8Func sad8_altivec_c;
+#endif
+
+#ifdef ARCH_IS_X86_64
+sad8Func sad8_x86_64;
+#endif
+
+typedef uint32_t(sad16biFunc) (const uint8_t * const cur,
+							   const uint8_t * const ref1,
+							   const uint8_t * const ref2,
+							   const uint32_t stride);
+typedef sad16biFunc *sad16biFuncPtr;
+extern sad16biFuncPtr sad16bi;
+sad16biFunc sad16bi_c;
 
-typedef uint32_t (dev16Func)(const uint8_t * const cur,
-				const uint32_t stride);
-typedef dev16Func *dev16FuncPtr;	
+#ifdef ARCH_IS_IA32
+sad16biFunc sad16bi_mmx;
+sad16biFunc sad16bi_xmm;
+sad16biFunc sad16bi_3dne;
+sad16biFunc sad16bi_3dn;
+#endif
+
+#ifdef ARCH_IS_IA64
+sad16biFunc sad16bi_ia64;
+#endif
+
+#ifdef ARCH_IS_PPC
+sad16biFunc sad16bi_altivec_c;
+#endif
+
+#ifdef ARCH_IS_X86_64
+sad16biFunc sad16bi_x86_64;
+#endif
+
+typedef uint32_t(sad8biFunc) (const uint8_t * const cur,
+							   const uint8_t * const ref1,
+							   const uint8_t * const ref2,
+							   const uint32_t stride);
+typedef sad8biFunc *sad8biFuncPtr;
+extern sad8biFuncPtr sad8bi;
+sad8biFunc sad8bi_c;
+
+#ifdef ARCH_IS_IA32
+sad8biFunc sad8bi_mmx;
+sad8biFunc sad8bi_xmm;
+sad8biFunc sad8bi_3dne;
+sad8biFunc sad8bi_3dn;
+#endif
+
+#ifdef ARCH_IS_X86_64
+sad8biFunc sad8bi_x86_64;
+#endif
+
+typedef uint32_t(dev16Func) (const uint8_t * const cur,
+							 const uint32_t stride);
+typedef dev16Func *dev16FuncPtr;
 extern dev16FuncPtr dev16;
 dev16Func dev16_c;
-dev16Func dev16_mmx;
-dev16Func dev16_xmm;
-dev16Func dev16_altivec;
 
-/* plain c */
-/*
+typedef uint32_t (sad16vFunc)(	const uint8_t * const cur,
+								const uint8_t * const ref,
+								const uint32_t stride, int32_t *sad8);
+typedef sad16vFunc *sad16vFuncPtr;
+extern sad16vFuncPtr sad16v;
+
+sad16vFunc sad16v_c;
+sad16vFunc sad32v_c;
 
-uint32_t sad16(const uint8_t * const cur,
-				const uint8_t * const ref,
-				const uint32_t stride,
-				const uint32_t best_sad);
-
-uint32_t sad8(const uint8_t * const cur,
-				const uint8_t * const ref,
-				const uint32_t stride);
-
-uint32_t dev16(const uint8_t * const cur,
-				const uint32_t stride);
-*/
-/* mmx */
-/*
-
-uint32_t sad16_mmx(const uint8_t * const cur,
-				const uint8_t * const ref,
-				const uint32_t stride,
-				const uint32_t best_sad);
-
-uint32_t sad8_mmx(const uint8_t * const cur,
-				const uint8_t * const ref,
-				const uint32_t stride);
-
-
-uint32_t dev16_mmx(const uint8_t * const cur,
-				const uint32_t stride);
-
-*/
-/* xmm */
-/*
-uint32_t sad16_xmm(const uint8_t * const cur,
-				const uint8_t * const ref,
-				const uint32_t stride,
-				const uint32_t best_sad);
-
-uint32_t sad8_xmm(const uint8_t * const cur,
-				const uint8_t * const ref,
-				const uint32_t stride);
-
-uint32_t dev16_xmm(const uint8_t * const cur,
-				const uint32_t stride);
-*/
+#ifdef ARCH_IS_IA32
+dev16Func dev16_mmx;
+dev16Func dev16_xmm;
+dev16Func dev16_3dne;
+dev16Func dev16_sse2;
+sad16vFunc sad16v_xmm;
+sad16vFunc sad16v_mmx;
+#endif
+
+#ifdef ARCH_IS_IA64
+dev16Func dev16_ia64;
+#endif
+
+#ifdef ARCH_IS_PPC
+dev16Func dev16_altivec_c;
+#endif
+
+#ifdef ARCH_IS_X86_64
+dev16Func dev16_x86_64;
+sad16vFunc sad16v_x86_64;
+#endif
+
+/* This function assumes blocks use 16bit signed elements */
+typedef uint32_t (sse8Func_16bit)(const int16_t * cur,
+								  const int16_t * ref,
+								  const uint32_t stride);
+typedef sse8Func_16bit *sse8Func_16bitPtr;
+extern sse8Func_16bitPtr sse8_16bit;
+
+sse8Func_16bit sse8_16bit_c;
+#ifdef ARCH_IS_IA32
+sse8Func_16bit sse8_16bit_mmx;
+#endif
+
+#ifdef ARCH_IS_PPC
+sse8Func_16bit sse8_16bit_altivec_c;
+#endif
+
+#ifdef ARCH_IS_X86_64
+sse8Func_16bit sse8_16bit_x86_64;
+#endif
+
+/* This function assumes blocks use 8bit *un*signed elements */
+typedef uint32_t (sse8Func_8bit)(const uint8_t * cur,
+								 const uint8_t * ref,
+								 const uint32_t stride);
+typedef sse8Func_8bit *sse8Func_8bitPtr;
+extern sse8Func_8bitPtr sse8_8bit;
+
+sse8Func_8bit sse8_8bit_c;
+
+#ifdef ARCH_IS_IA32
+sse8Func_8bit sse8_8bit_mmx;
+#endif
+
+#ifdef ARCH_IS_X86_64
+sse8Func_8bit sse8_8bit_x86_64;
+#endif
 
-#endif /* _ENCODER_SAD_H_ */
+#endif							/* _ENCODER_SAD_H_ */