--- mem_transfer.c	2003/02/15 15:22:19	1.9
+++ mem_transfer.c	2004/12/19 13:16:50	1.12
@@ -3,6 +3,8 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - 8bit<->16bit transfer  -
  *
+ *  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
@@ -17,18 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- ****************************************************************************/
-/*****************************************************************************
- *
- *  History
- *
- *  - 14.06.2002 Changed legal header with the new FSF address
- *	- 14.04.2002 added transfer_8to16sub2
- *	- 07.01.2002 merge functions from compensate; rename functions
- *	- 22.12.2001 transfer_8to8add16 limit fix
- *	- 07.11.2001 initial version; (c)2001 peter ross <pross@cs.rmit.edu.au>
- *
- *  $Id: mem_transfer.c,v 1.9 2003/02/15 15:22:19 edgomez Exp $
+ * $Id: mem_transfer.c,v 1.12 2004/12/19 13:16:50 syskin Exp $
  *
  ****************************************************************************/
 
@@ -43,6 +34,7 @@
 TRANSFER_8TO16SUB_PTR  transfer_8to16sub;
 TRANSFER_8TO16SUBRO_PTR  transfer_8to16subro;
 TRANSFER_8TO16SUB2_PTR transfer_8to16sub2;
+TRANSFER_8TO16SUB2RO_PTR transfer_8to16sub2ro;
 TRANSFER_16TO8ADD_PTR  transfer_16to8add;
 
 TRANSFER8X8_COPY_PTR transfer8x8_copy;
@@ -175,8 +167,9 @@
  *
  *    R1  (8bit) = R1
  *    R2  (8bit) = R2
- *    C   (8bit) = C
- *    DCT (16bit)= C - min((R1 + R2)/2, 255)
+ *    R   (temp) = min((R1 + R2)/2, 255)
+ *    DCT (16bit)= C - R
+ *    C   (8bit) = R
  */
 void
 transfer_8to16sub2_c(int16_t * const dct,
@@ -195,7 +188,25 @@
 			if (r > 255) {
 				r = 255;
 			}
-			//cur[j * stride + i] = r;
+			cur[j * stride + i] = r;
+			dct[j * 8 + i] = (int16_t) c - (int16_t) r;
+		}
+	}
+}
+
+void
+transfer_8to16sub2ro_c(int16_t * const dct,
+					 const uint8_t * const cur,
+					 const uint8_t * ref1,
+					 const uint8_t * ref2,
+					 const uint32_t stride)
+{
+	uint32_t i, j;
+
+	for (j = 0; j < 8; j++) {
+		for (i = 0; i < 8; i++) {
+			uint8_t c = cur[j * stride + i];
+			int r = (ref1[j * stride + i] + ref2[j * stride + i] + 1) / 2;
 			dct[j * 8 + i] = (int16_t) c - (int16_t) r;
 		}
 	}
@@ -246,11 +257,12 @@
 				   const uint8_t * const src,
 				   const uint32_t stride)
 {
-	uint32_t i, j;
+	uint32_t j;
 
 	for (j = 0; j < 8; j++) {
-		for (i = 0; i < 8; i++) {
-			dst[j * stride + i] = src[j * stride + i];
-		}
+		uint32_t *d= (uint32_t*)(dst + j*stride);
+		const uint32_t *s = (const uint32_t*)(src + j*stride);
+		*(d+0) = *(s+0);
+		*(d+1) = *(s+1);
 	}
 }