--- trunk/xvidcore/src/motion/sad.h	2002/07/21 23:34:08	326
+++ branches/dev-api-3/xvidcore/src/motion/sad.h	2002/09/24 16:30:34	534
@@ -26,6 +26,17 @@
 
 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;
+sad8Func sad8_mmx;
+sad8Func sad8_xmm;
+sad8Func sad8_altivec;
+sad8Func sad8_ia64;
+
 
 typedef uint32_t(sad16biFunc) (const uint8_t * const cur,
 							   const uint8_t * const ref1,
@@ -35,23 +46,21 @@
 extern sad16biFuncPtr sad16bi;
 sad16biFunc sad16bi_c;
 sad16biFunc sad16bi_ia64;
-
-//sad16biFunc sad16bi_mmx;
+sad16biFunc sad16bi_mmx;
 sad16biFunc sad16bi_xmm;
+sad16biFunc sad16bi_3dn;
 
-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;
-sad8Func sad8_mmx;
-sad8Func sad8_xmm;
-sad8Func sad8_altivec;
-sad8Func sad8_ia64;
 
-extern sad16biFuncPtr sad8bi;
-sad16biFunc sad8bi_c;		// same as sad8bi
+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;
+sad8biFunc sad8bi_mmx;
+sad8biFunc sad8bi_xmm;
+sad8biFunc sad8bi_3dn;
 
 
 typedef uint32_t(dev16Func) (const uint8_t * const cur,
@@ -65,51 +74,22 @@
 dev16Func dev16_altivec;
 dev16Func dev16_ia64;
 
-/* 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_xmm;
+sad16vFunc sad16v_mmx;
+sad16vFunc sad16v_c;
+sad16vFunc mrsad16v;
+sad16vFunc mrsad16v_c;
+
+int32_t sad8x8mean_mmx(	const uint8_t * const current,
+						const uint8_t * const reference,
+						const uint32_t stride,
+						const int mean);
 
-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);
-*/
+void sad16x8total_mmx(const uint8_t *, const uint32_t, int32_t[]);
 
 #endif							/* _ENCODER_SAD_H_ */