--- mbcoding.c	2004/12/10 04:10:12	1.50
+++ mbcoding.c	2010/10/15 16:20:48	1.59
@@ -19,7 +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
  *
- * $Id: mbcoding.c,v 1.50 2004/12/10 04:10:12 syskin Exp $
+ * $Id: mbcoding.c,v 1.59 2010/10/15 16:20:48 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -36,6 +36,13 @@
 
 #include "../utils/mbfunctions.h"
 
+#ifdef _DEBUG
+# include "../motion/estimation.h"
+# include "../motion/motion_inlines.h"
+# include <assert.h>
+#endif
+
+
 #define LEVELOFFSET 32
 
 /* Initialized once during xvid_global call
@@ -572,13 +579,28 @@
 #endif
 		}
 	}
+
+	bits = BitstreamPos(bs);
+
 	/* code motion vector(s) if motion is local  */
 	if (!pMB->mcsel)
 		for (i = 0; i < (pMB->mode == MODE_INTER4V ? 4 : 1); i++) {
 			CodeVector(bs, pMB->pmvs[i].x, frame->fcode);
 			CodeVector(bs, pMB->pmvs[i].y, frame->fcode);
+
+#if 0 /* #ifdef _DEBUG */
+			if (i == 0) /* for simplicity */ {
+				int coded_length = BitstreamPos(bs) - bits;
+				int estimated_length = d_mv_bits(pMB->pmvs[i].x, pMB->pmvs[i].y, zeroMV, frame->fcode, 0);
+				assert(estimated_length == coded_length);
+				d_mv_bits(pMB->pmvs[i].x, pMB->pmvs[i].y, zeroMV, frame->fcode, 0);
+			}
+#endif
 		}
 
+	bits = BitstreamPos(bs) - bits;
+	pStat->iMVBits += bits;
+
 	bits = BitstreamPos(bs);
 
 	/* code block coeffs */
@@ -746,6 +768,7 @@
 		}
 	}
 
+	bits = BitstreamPos(bs);
 
 	switch (mb->mode) {
 		case MODE_INTERPOLATE:
@@ -762,6 +785,7 @@
 			CodeVector(bs, mb->pmvs[3].y, 1);	/* prediction is always (0,0) */
 		default: break;
 	}
+	pStat->iMVBits += BitstreamPos(bs) - bits;
 
 	bits = BitstreamPos(bs);
 	for (i = 0; i < 6; i++) {
@@ -1051,7 +1075,7 @@
 	return (level << 20) >> 20;
 
   error:
-	*run = VLC_ERROR;
+	*run = 64;
 	return 0;
 }
 
@@ -1063,15 +1087,16 @@
 {
 
 	const uint16_t *scan = scan_tables[direction];
-	int level, run, last;
+	int level, run, last = 0;
 
 	do {
 		level = get_coeff(bs, &run, &last, 1, 0);
-		if (run == -1) {
-			DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run");
+		coeff += run;
+		if (coeff & ~63) {
+			DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run or index");
 			break;
 		}
-		coeff += run;
+
 		block[scan[coeff]] = level;
 
 		DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i\n", scan[coeff], level);
@@ -1102,16 +1127,16 @@
 	int p;
 	int level;
 	int run;
-	int last;
+	int last = 0;
 
 	p = 0;
 	do {
 		level = get_coeff(bs, &run, &last, 0, 0);
-		if (run == -1) {
-			DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run");
+		p += run;
+		if (p & ~63) {
+			DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run or index");
 			break;
 		}
-		p += run;
 
 		if (level < 0) {
 			level = level*quant_m_2 - quant_add;
@@ -1137,16 +1162,16 @@
 	int p;
 	int level;
 	int run;
-	int last;
+	int last = 0;
 
 	p = 0;
 	do {
 		level = get_coeff(bs, &run, &last, 0, 0);
-		if (run == -1) {
-			DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run");
+		p += run;
+		if (p & ~63) {
+			DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run or index");
 			break;
 		}
-		p += run;
 
 		if (level < 0) {
 			level = ((2 * -level + 1) * matrix[scan[p]] * quant) >> 4;
@@ -1944,14 +1969,14 @@
 };
 
 short const dc_threshold[] = {
-	21514, 26984,  8307, 28531, 29798, 24951, 25970, 26912,
-	 8307, 25956, 26994, 25974,  8292, 29286, 28015, 29728,
-	25960, 18208, 21838, 18208, 19536, 22560, 26998,  8260,
-	28515, 25956,  8291, 25640, 30309, 27749, 11817, 22794,
-	30063,  8306, 28531, 29798, 24951, 25970, 25632, 29545,
-	29300, 25193, 29813, 29295, 26656, 29537, 29728,  8303,
-	26983, 25974, 24864, 25443, 29541,  8307, 28532, 26912,
-	29556, 29472, 30063, 25458,  8293, 28515, 25956,  2606
+	26708, 29545, 29472, 26223, 30580, 29281,  8293, 29545,
+	25632, 29285, 30313, 25701, 26144, 28530,  8301, 26740,
+	 8293, 20039,  8277, 20551,  8268, 30296, 17513, 25376,
+	25711, 25445, 10272, 11825, 11827, 10544,  2606, 28505,
+	29301, 29472, 26223, 30580, 29281,  8293, 26980, 29811,
+	26994, 30050, 28532,  8306, 24936,  8307, 28532, 26400,
+	30313,  8293, 25441, 25955, 29555, 29728,  8303, 29801,
+	 8307, 28531, 29301, 25955, 25376, 25711, 11877,    10
 };
 
 VLC const dc_lum_tab[] = {