--- trunk/xvidcore/src/bitstream/mbcoding.c	2002/06/12 20:38:41	195
+++ trunk/xvidcore/src/bitstream/mbcoding.c	2002/06/30 10:46:29	252
@@ -41,6 +41,7 @@
   *																			   *	
   *  Revision history:                                                         *
   *                                                                            *
+  *  28.06.2002 added check_resync_marker()                                    *
   *  14.04.2002 bframe encoding												   *
   *  08.03.2002 initial version; isibaar					                   *
   *																			   *
@@ -95,7 +96,7 @@
 
 			for (l = 0; l < 64; l++) {	// run
 				int32_t level = k;
-				uint32_t run = l;
+				ptr_t run = l;
 
 				if ((abs(level) <= max_level_ptr[run]) && (run <= (uint32_t) max_run_ptr[abs(level)])) {	// level < max_level and run < max_run
 
@@ -571,15 +572,38 @@
  * decoding stuff starts here                                  *
  ***************************************************************/
 
+
+// for IVOP addbits == 0
+// for PVOP addbits == fcode - 1
+// for BVOP addbits == max(fcode,bcode) - 1
+// returns true or false
+int 
+check_resync_marker(Bitstream * bs, int addbits)
+{
+	uint32_t nbits;
+	uint32_t code;
+	uint32_t nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER + addbits;
+
+	nbits = BitstreamNumBitsToByteAlign(bs);
+	code = BitstreamShowBits(bs, nbits);
+
+	if (code == (((uint32_t)1 << (nbits - 1)) - 1))
+	{
+		return BitstreamShowBitsFromByteAlign(bs, nbitsresyncmarker) == RESYNC_MARKER;
+	}
+
+	return 0;
+}
+
+
+
 int
 get_mcbpc_intra(Bitstream * bs)
 {
 
 	uint32_t index;
 
-	while ((index = BitstreamShowBits(bs, 9)) == 1)
-		BitstreamSkip(bs, 9);
-
+	index = BitstreamShowBits(bs, 9);
 	index >>= 3;
 
 	BitstreamSkip(bs, mcbpc_intra_table[index].len);
@@ -593,9 +617,8 @@
 {
 
 	uint32_t index;
-
-	while ((index = CLIP(BitstreamShowBits(bs, 9), 256)) == 1)
-		BitstreamSkip(bs, 9);
+	
+	index = CLIP(BitstreamShowBits(bs, 9), 256);
 
 	BitstreamSkip(bs, mcbpc_inter_table[index].len);
 
@@ -750,6 +773,10 @@
 		}
 		coeff += run;
 		block[scan[coeff]] = level;
+
+		DPRINTF(DPRINTF_COEFF,"block[%i] %i", scan[coeff], level);
+		//DPRINTF(DPRINTF_COEFF,"block[%i] %i %08x", scan[coeff], level, BitstreamShowBits(bs, 32));
+
 		if (level < -127 || level > 127) {
 			DEBUG1("warning: intra_overflow", level);
 		}
@@ -779,6 +806,10 @@
 		p += run;
 
 		block[scan[p]] = level;
+
+		DPRINTF(DPRINTF_COEFF,"block[%i] %i", scan[p], level);
+		// DPRINTF(DPRINTF_COEFF,"block[%i] %i %08x", scan[p], level, BitstreamShowBits(bs, 32));
+
 		if (level < -127 || level > 127) {
 			DEBUG1("warning: inter_overflow", level);
 		}