--- mbprediction.h	2002/07/10 19:17:49	1.13
+++ mbprediction.h	2002/10/05 21:32:48	1.13.2.1
@@ -26,7 +26,7 @@
  *  along with this program; if not, write to the xvid_free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  $Id: mbprediction.h,v 1.13 2002/07/10 19:17:49 chl Exp $
+ *  $Id: mbprediction.h,v 1.13.2.1 2002/10/05 21:32:48 Isibaar Exp $
  *
  *************************************************************************/
 
@@ -208,6 +208,127 @@
 }
 
 
+static __inline VECTOR
+get_qpmv(const MACROBLOCK * const pMBs,
+		const uint32_t x,
+		const uint32_t y,
+		const uint32_t x_dim,
+		const uint32_t block)
+{
+
+	int xin1, xin2, xin3;
+	int yin1, yin2, yin3;
+	int vec1, vec2, vec3;
+	VECTOR lneigh, tneigh, trneigh;	/* left neighbour, top neighbour, topright neighbour */
+	VECTOR median;
+
+	static VECTOR zeroMV = { 0, 0 };
+	uint32_t index = x + y * x_dim;
+
+	/* first row (special case) */
+	if (y == 0 && (block == 0 || block == 1)) {
+		if ((x == 0) && (block == 0))	// first column, first block
+		{
+			return zeroMV;
+		}
+		if (block == 1)			// second block; has only a left neighbour
+		{
+			return pMBs[index].qmvs[0];
+		} else {				/* block==0, but x!=0, so again, there is a left neighbour */
+
+			return pMBs[index - 1].qmvs[1];
+		}
+	}
+
+	/*
+	 * MODE_INTER, vm18 page 48
+	 * MODE_INTER4V vm18 page 51
+	 *
+	 *   (x,y-1)      (x+1,y-1)
+	 *   [   |   ]    [   |   ]
+	 *   [ 2 | 3 ]    [ 2 |   ]
+	 *
+	 *   (x-1,y)       (x,y)        (x+1,y)
+	 *   [   | 1 ]    [ 0 | 1 ]    [ 0 |   ]
+	 *   [   | 3 ]    [ 2 | 3 ]    [   |   ]
+	 */
+
+	switch (block) {
+	case 0:
+		xin1 = x - 1;
+		yin1 = y;
+		vec1 = 1;				/* left */
+		xin2 = x;
+		yin2 = y - 1;
+		vec2 = 2;				/* top */
+		xin3 = x + 1;
+		yin3 = y - 1;
+		vec3 = 2;				/* top right */
+		break;
+	case 1:
+		xin1 = x;
+		yin1 = y;
+		vec1 = 0;
+		xin2 = x;
+		yin2 = y - 1;
+		vec2 = 3;
+		xin3 = x + 1;
+		yin3 = y - 1;
+		vec3 = 2;
+		break;
+	case 2:
+		xin1 = x - 1;
+		yin1 = y;
+		vec1 = 3;
+		xin2 = x;
+		yin2 = y;
+		vec2 = 0;
+		xin3 = x;
+		yin3 = y;
+		vec3 = 1;
+		break;
+	default:
+		xin1 = x;
+		yin1 = y;
+		vec1 = 2;
+		xin2 = x;
+		yin2 = y;
+		vec2 = 0;
+		xin3 = x;
+		yin3 = y;
+		vec3 = 1;
+	}
+
+
+	if (xin1 < 0 || /* yin1 < 0  || */ xin1 >= (int32_t) x_dim) {
+		lneigh = zeroMV;
+	} else {
+		lneigh = pMBs[xin1 + yin1 * x_dim].qmvs[vec1];
+	}
+
+	if (xin2 < 0 || /* yin2 < 0 || */ xin2 >= (int32_t) x_dim) {
+		tneigh = zeroMV;
+	} else {
+		tneigh = pMBs[xin2 + yin2 * x_dim].qmvs[vec2];
+	}
+
+	if (xin3 < 0 || /* yin3 < 0 || */ xin3 >= (int32_t) x_dim) {
+		trneigh = zeroMV;
+	} else {
+		trneigh = pMBs[xin3 + yin3 * x_dim].qmvs[vec3];
+	}
+
+	/* median,minimum */
+
+	median.x =
+		MIN(MAX(lneigh.x, tneigh.x),
+			MIN(MAX(tneigh.x, trneigh.x), MAX(lneigh.x, trneigh.x)));
+	median.y =
+		MIN(MAX(lneigh.y, tneigh.y),
+			MIN(MAX(tneigh.y, trneigh.y), MAX(lneigh.y, trneigh.y)));
+	return median;
+}
+
 /* This is somehow a copy of get_pmv, but returning all MVs and Minimum SAD 
    instead of only Median MV */
 
@@ -473,6 +594,105 @@
 
 
 	/*
+	 * MODE_INTER, vm18 page 48
+	 * MODE_INTER4V vm18 page 51
+	 *
+	 *   (x,y-1)      (x+1,y-1)
+	 *   [   |   ]    [   |   ]
+	 *   [ 2 | 3 ]    [ 2 |   ]
+	 *
+	 *   (x-1,y)       (x,y)        (x+1,y)
+	 *   [   | 1 ]    [ 0 | 1 ]    [ 0 |   ]
+	 *   [   | 3 ]    [ 2 | 3 ]    [   |   ]
+	 */
+
+static __inline VECTOR
+get_qpmv2(const MACROBLOCK * const mbs,
+         const int mb_width,
+         const int bound,
+         const int x,
+         const int y,
+         const int block)
+{
+	static const VECTOR zeroMV = { 0, 0 };
+    
+    int lx, ly, lz;         /* left */
+    int tx, ty, tz;         /* top */
+    int rx, ry, rz;         /* top-right */
+    int lpos, tpos, rpos;
+    int num_cand, last_cand;
+
+	VECTOR pmv[4];	/* left neighbour, top neighbour, top-right neighbour */
+
+	switch (block) {
+	case 0:
+		lx = x - 1;	ly = y;		lz = 1;
+		tx = x;		ty = y - 1;	tz = 2;
+		rx = x + 1;	ry = y - 1;	rz = 2;
+		break;
+	case 1:
+		lx = x;		ly = y;		lz = 0;
+		tx = x;		ty = y - 1;	tz = 3;
+		rx = x + 1;	ry = y - 1;	rz = 2;
+		break;
+	case 2:
+		lx = x - 1;	ly = y;		lz = 3;
+		tx = x;		ty = y;		tz = 0;
+		rx = x;		ry = y;		rz = 1;
+		break;
+	default:
+		lx = x;		ly = y;		lz = 2;
+		tx = x;		ty = y;		tz = 0;
+		rx = x;		ry = y;		rz = 1;
+	}
+
+    lpos = lx + ly * mb_width;
+    rpos = rx + ry * mb_width;
+    tpos = tx + ty * mb_width;
+    num_cand = 0;
+
+    if (lpos >= bound && lx >= 0) {
+        num_cand++;
+        last_cand = 1;
+        pmv[1] = mbs[lpos].qmvs[lz];
+    } else {
+        pmv[1] = zeroMV;
+    }
+
+    if (tpos >= bound) {
+        num_cand++;
+        last_cand = 2;
+        pmv[2] = mbs[tpos].qmvs[tz];
+    } else {
+        pmv[2] = zeroMV;
+    }
+    
+    if (rpos >= bound && rx < mb_width) {
+        num_cand++;
+        last_cand = 3;
+        pmv[3] = mbs[rpos].qmvs[rz];
+    } else {
+        pmv[3] = zeroMV;
+    }
+
+    /* if only one valid candidate predictor, the invalid candiates are set to the canidate */
+	if (num_cand != 1) {
+		/* set median */
+   
+   		pmv[0].x =
+			MIN(MAX(pmv[1].x, pmv[2].x),
+				MIN(MAX(pmv[2].x, pmv[3].x), MAX(pmv[1].x, pmv[3].x)));
+		pmv[0].y =
+			MIN(MAX(pmv[1].y, pmv[2].y),
+				MIN(MAX(pmv[2].y, pmv[3].y), MAX(pmv[1].y, pmv[3].y)));
+		return pmv[0];
+	 }
+
+	 return pmv[last_cand];  /* no point calculating median mv */
+}
+
+
+	/*
 	 * pmv are filled with: 
 	 *  [0]: Median (or whatever is correct in a special case)
 	 *  [1]: left neighbour