--- sad.h	2003/08/13 11:43:59	1.18.2.2
+++ sad.h	2004/04/12 15:49:56	1.21
@@ -19,14 +19,13 @@
  *  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.18.2.2 2003/08/13 11:43:59 edgomez Exp $
+ * $Id: sad.h,v 1.21 2004/04/12 15:49:56 edgomez Exp $
  *
  ****************************************************************************/
 
 #ifndef _ENCODER_SAD_H_
 #define _ENCODER_SAD_H_
 
-
 #include "../portab.h"
 
 typedef void (sadInitFunc) (void);
@@ -35,7 +34,6 @@
 extern sadInitFuncPtr sadInit;
 sadInitFunc sadInit_altivec;
 
-
 typedef uint32_t(sad16Func) (const uint8_t * const cur,
 							 const uint8_t * const ref,
 							 const uint32_t stride,
@@ -51,14 +49,14 @@
 sad16Func sad16_sse2;
 #endif
 
-#ifdef ARCH_IS_ALTIVEC
-sad16Func sad16_altivec;
-#endif
-
 #ifdef ARCH_IS_IA64
 sad16Func sad16_ia64;
 #endif
 
+#ifdef ARCH_IS_PPC
+sad16Func sad16_altivec_c;
+#endif
+
 sad16Func mrsad16_c;
 
 typedef uint32_t(sad8Func) (const uint8_t * const cur,
@@ -74,14 +72,14 @@
 sad8Func sad8_3dne;
 #endif
 
-#ifdef ARCH_IS_ALTIVEC
-sad8Func sad8_altivec;
-#endif
-
 #ifdef ARCH_IS_IA64
 sad8Func sad8_ia64;
 #endif
 
+#ifdef ARCH_IS_PPC
+sad8Func sad8_altivec_c;
+#endif
+
 typedef uint32_t(sad16biFunc) (const uint8_t * const cur,
 							   const uint8_t * const ref1,
 							   const uint8_t * const ref2,
@@ -101,6 +99,10 @@
 sad16biFunc sad16bi_ia64;
 #endif
 
+#ifdef ARCH_IS_PPC
+sad16biFunc sad16bi_altivec_c;
+#endif
+
 typedef uint32_t(sad8biFunc) (const uint8_t * const cur,
 							   const uint8_t * const ref1,
 							   const uint8_t * const ref2,
@@ -123,42 +125,58 @@
 extern dev16FuncPtr dev16;
 dev16Func dev16_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;
+
 #ifdef ARCH_IS_IA32
 dev16Func dev16_mmx;
 dev16Func dev16_xmm;
 dev16Func dev16_3dne;
 dev16Func dev16_sse2;
-#endif
-
-#ifdef ARCH_IS_ALTIVEC
-dev16Func dev16_altivec;
+sad16vFunc sad16v_xmm;
+sad16vFunc sad16v_mmx;
 #endif
 
 #ifdef ARCH_IS_IA64
 dev16Func dev16_ia64;
 #endif
 
-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;
+#ifdef ARCH_IS_PPC
+dev16Func dev16_altivec_c;
+#endif
 
-sad16vFunc sad16v_c;
-sad16vFunc sad32v_c;
-sad16vFunc mrsad16v;
-sad16vFunc mrsad16v_c;
+/* 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
-sad16vFunc sad16v_xmm;
-sad16vFunc sad16v_mmx;
+sse8Func_16bit sse8_16bit_mmx;
+#endif
+
+#ifdef ARCH_IS_PPC
+sse8Func_16bit sse8_16bit_altivec_c;
+#endif
 
-int32_t sad8x8mean_mmx(	const uint8_t * const current,
-						const uint8_t * const reference,
-						const uint32_t stride,
-						const int mean);
+/* 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;
 
-void sad16x8total_mmx(const uint8_t *, const uint32_t, int32_t[]);
+sse8Func_8bit sse8_8bit_c;
+#ifdef ARCH_IS_IA32
+sse8Func_8bit sse8_8bit_mmx;
 #endif
 
 #endif							/* _ENCODER_SAD_H_ */