--- mem_transfer.h	2003/02/12 11:44:57	1.8.2.3
+++ mem_transfer.h	2002/09/07 10:19:26	1.9
@@ -3,6 +3,8 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - 8<->16 bit buffer transfer header -
  *
+ *  Copyright(C) 2002 Michael Militzer
+ *
  *  This program is an implementation of a part of one or more MPEG-4
  *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
  *  to use this software module in hardware or software products are
@@ -26,18 +28,10 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- ****************************************************************************/
-/*****************************************************************************
- *
- *  History
- *
- *  - Sun Jun 16 00:12:49 2002 Added legal header
- *                             Cosmetic
- *  $Id: mem_transfer.h,v 1.8.2.3 2003/02/12 11:44:57 syskin Exp $
+ *  $Id: mem_transfer.h,v 1.9 2002/09/07 10:19:26 edgomez Exp $
  *
  ****************************************************************************/
 
-
 #ifndef _MEM_TRANSFER_H
 #define _MEM_TRANSFER_H
 
@@ -57,7 +51,6 @@
 /* Implemented functions */
 TRANSFER_8TO16COPY transfer_8to16copy_c;
 TRANSFER_8TO16COPY transfer_8to16copy_mmx;
-TRANSFER_8TO16COPY transfer_8to16copy_3dne;
 TRANSFER_8TO16COPY transfer_8to16copy_ia64;
 
 /*****************************************************************************
@@ -75,11 +68,10 @@
 /* Implemented functions */
 TRANSFER_16TO8COPY transfer_16to8copy_c;
 TRANSFER_16TO8COPY transfer_16to8copy_mmx;
-TRANSFER_16TO8COPY transfer_16to8copy_3dne;
 TRANSFER_16TO8COPY transfer_16to8copy_ia64;
 
 /*****************************************************************************
- * transfer8to16 + substraction *writeback* op API
+ * transfer8to16 + substraction op API
  ****************************************************************************/
 
 typedef void (TRANSFER_8TO16SUB) (int16_t * const dct,
@@ -95,29 +87,9 @@
 /* Implemented functions */
 TRANSFER_8TO16SUB transfer_8to16sub_c;
 TRANSFER_8TO16SUB transfer_8to16sub_mmx;
-TRANSFER_8TO16SUB transfer_8to16sub_3dne;
 TRANSFER_8TO16SUB transfer_8to16sub_ia64;
 
 /*****************************************************************************
- * transfer8to16 + substraction *readonly* op API
- ****************************************************************************/
-
-typedef void (TRANSFER_8TO16SUBRO) (int16_t * const dct,
-								  const uint8_t * const cur,
-								  const uint8_t * ref,
-								  const uint32_t stride);
-
-typedef TRANSFER_8TO16SUBRO *TRANSFER_8TO16SUBRO_PTR;
-
-/* Our global function pointer - Initialized in xvid.c */
-extern TRANSFER_8TO16SUBRO_PTR transfer_8to16subro;
-
-/* Implemented functions */
-TRANSFER_8TO16SUBRO transfer_8to16subro_c;
-TRANSFER_8TO16SUBRO transfer_8to16subro_mmx;
-TRANSFER_8TO16SUBRO transfer_8to16subro_3dne;
-
-/*****************************************************************************
  * transfer8to16 + substraction op API - Bidirectionnal Version
  ****************************************************************************/
 
@@ -136,7 +108,6 @@
 TRANSFER_8TO16SUB2 transfer_8to16sub2_c;
 TRANSFER_8TO16SUB2 transfer_8to16sub2_mmx;
 TRANSFER_8TO16SUB2 transfer_8to16sub2_xmm;
-TRANSFER_8TO16SUB2 transfer_8to16sub2_3dne;
 TRANSFER_8TO16SUB2 transfer_8to16sub2_ia64;
 
 
@@ -156,7 +127,6 @@
 /* Implemented functions */
 TRANSFER_16TO8ADD transfer_16to8add_c;
 TRANSFER_16TO8ADD transfer_16to8add_mmx;
-TRANSFER_16TO8ADD transfer_16to8add_3dne;
 TRANSFER_16TO8ADD transfer_16to8add_ia64;
 
 /*****************************************************************************
@@ -175,31 +145,6 @@
 /* Implemented functions */
 TRANSFER8X8_COPY transfer8x8_copy_c;
 TRANSFER8X8_COPY transfer8x8_copy_mmx;
-TRANSFER8X8_COPY transfer8x8_copy_3dne;
 TRANSFER8X8_COPY transfer8x8_copy_ia64;
 
-
-static __inline void
-transfer16x16_copy(uint8_t * const dst,
-					const uint8_t * const src,
-					const uint32_t stride)
-{
-	transfer8x8_copy(dst, src, stride);
-	transfer8x8_copy(dst + 8, src + 8, stride);
-	transfer8x8_copy(dst + 8*stride, src + 8*stride, stride);
-	transfer8x8_copy(dst + 8*stride + 8, src + 8*stride + 8, stride);
-}
-
-static __inline void
-transfer32x32_copy(uint8_t * const dst,
-					const uint8_t * const src,
-					const uint32_t stride)
-{
-	transfer16x16_copy(dst, src, stride);
-	transfer16x16_copy(dst + 16, src + 16, stride);
-	transfer16x16_copy(dst + 16*stride, src + 16*stride, stride);
-	transfer16x16_copy(dst + 16*stride + 16, src + 16*stride + 16, stride);
-}
-
-
 #endif