--- decoder.c	2002/06/22 07:23:09	1.21
+++ decoder.c	2002/06/30 10:46:29	1.23
@@ -32,6 +32,7 @@
  *
  *  History:
  *
+ *  28.06.2002  added basic resync support to iframe/pframe_decode()
  *	22.06.2002	added primative N_VOP support
  *				#define BFRAMES_DEC now enables Minchenm's bframe decoder
  *  08.05.2002  add low_delay support for B_VOP decode
@@ -49,7 +50,7 @@
  *  22.12.2001  lock based interpolation
  *  01.12.2001  inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
  *
- *  $Id: decoder.c,v 1.21 2002/06/22 07:23:09 suxen_drol Exp $
+ *  $Id: decoder.c,v 1.23 2002/06/30 10:46:29 suxen_drol Exp $
  *
  *************************************************************************/
 
@@ -203,7 +204,8 @@
 				const uint32_t cbp,
 				Bitstream * bs,
 				const uint32_t quant,
-				const uint32_t intra_dc_threshold)
+				const uint32_t intra_dc_threshold,
+				const unsigned int bound)
 {
 
 	DECLARE_ALIGNED_MATRIX(block, 6, 64, int16_t, CACHE_LINE);
@@ -229,7 +231,7 @@
 
 		start_timer();
 		predict_acdc(dec->mbs, x_pos, y_pos, dec->mb_width, i, &block[i * 64],
-					 iQuant, iDcScaler, predictors);
+					 iQuant, iDcScaler, predictors, bound);
 		if (!acpred_flag) {
 			pMB->acpred_directions[i] = 0;
 		}
@@ -248,6 +250,8 @@
 
 			block[i * 64 + 0] = dc_dif;
 			start_coeff = 1;
+
+			DPRINTF(DPRINTF_COEFF,"block[0] %i", dc_dif);
 		} else {
 			start_coeff = 0;
 		}
@@ -422,30 +426,39 @@
 			   int quant,
 			   int intra_dc_threshold)
 {
-
+	uint32_t bound;
 	uint32_t x, y;
 
+	bound = 0;
+
 	for (y = 0; y < dec->mb_height; y++) {
 		for (x = 0; x < dec->mb_width; x++) {
-			MACROBLOCK *mb = &dec->mbs[y * dec->mb_width + x];
-
+			MACROBLOCK *mb;
 			uint32_t mcbpc;
 			uint32_t cbpc;
 			uint32_t acpred_flag;
 			uint32_t cbpy;
 			uint32_t cbp;
 
+			while (BitstreamShowBits(bs, 9) == 1)
+				BitstreamSkip(bs, 9);
+
+			if (check_resync_marker(bs, 0))
+			{
+				bound = read_video_packet_header(bs, 0, &quant);
+				x = bound % dec->mb_width;
+				y = bound / dec->mb_width;
+			}
+			mb = &dec->mbs[y * dec->mb_width + x];
+
+			DPRINTF(DPRINTF_MB, "macroblock (%i,%i) %08x", x, y, BitstreamShowBits(bs, 32));
+
 			mcbpc = get_mcbpc_intra(bs);
 			mb->mode = mcbpc & 7;
 			cbpc = (mcbpc >> 4);
 
 			acpred_flag = BitstreamGetBit(bs);
 
-			if (mb->mode == MODE_STUFFING) {
-				DEBUG("-- STUFFING ?");
-				continue;
-			}
-
 			cbpy = get_cbpy(bs, 1);
 			cbp = (cbpy << 2) | cbpc;
 
@@ -465,7 +478,7 @@
 			}
 
 			decoder_mbintra(dec, mb, x, y, acpred_flag, cbp, bs, quant,
-							intra_dc_threshold);
+							intra_dc_threshold, bound);
 		}
 	}
 
@@ -479,7 +492,8 @@
 				  int y,
 				  int k,
 				  VECTOR * mv,
-				  int fcode)
+				  int fcode,
+				  const int bound)
 {
 
 	int scale_fac = 1 << (fcode - 1);
@@ -494,7 +508,7 @@
 	int pmv_x, pmv_y;
 
 
-	get_pmvdata(dec->mbs, x, y, dec->mb_width, k, pmv, psad);
+	get_pmvdata2(dec->mbs, x, y, dec->mb_width, k, pmv, psad, bound);
 
 	pmv_x = pmv[0].x;
 	pmv_y = pmv[0].y;
@@ -502,6 +516,8 @@
 	mv_x = get_mv(bs, fcode);
 	mv_y = get_mv(bs, fcode);
 
+	DPRINTF(DPRINTF_MV,"mv_diff (%i,%i) pred (%i,%i)", mv_x, mv_y, pmv_x, pmv_y);
+
 	mv_x += pmv_x;
 	mv_y += pmv_y;
 
@@ -533,15 +549,32 @@
 {
 
 	uint32_t x, y;
+	uint32_t bound;
 
 	start_timer();
 	image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,
 				   dec->width, dec->height, dec->interlacing);
 	stop_edges_timer();
 
+	bound = 0;
+
 	for (y = 0; y < dec->mb_height; y++) {
 		for (x = 0; x < dec->mb_width; x++) {
-			MACROBLOCK *mb = &dec->mbs[y * dec->mb_width + x];
+			MACROBLOCK *mb;
+
+			// skip stuffing
+			while (BitstreamShowBits(bs, 10) == 1)
+				BitstreamSkip(bs, 10);
+
+			if (check_resync_marker(bs, fcode - 1))
+			{
+				bound = read_video_packet_header(bs, fcode - 1, &quant);
+				x = bound % dec->mb_width;
+				y = bound / dec->mb_width;
+			}
+			mb = &dec->mbs[y * dec->mb_width + x];
+
+			DPRINTF(DPRINTF_MB, "macroblock (%i,%i) %08x", x, y, BitstreamShowBits(bs, 32));
 
 			//if (!(dec->mb_skip[y*dec->mb_width + x]=BitstreamGetBit(bs)))         // not_coded
 			if (!(BitstreamGetBit(bs)))	// not_coded
@@ -556,6 +589,9 @@
 				mcbpc = get_mcbpc_inter(bs);
 				mb->mode = mcbpc & 7;
 				cbpc = (mcbpc >> 4);
+				
+				DPRINTF(DPRINTF_MB, "mode %i", mb->mode);
+				DPRINTF(DPRINTF_MB, "cbpc %i", cbpc);
 				acpred_flag = 0;
 
 				intra = (mb->mode == MODE_INTRA || mb->mode == MODE_INTRA_Q);
@@ -564,21 +600,21 @@
 					acpred_flag = BitstreamGetBit(bs);
 				}
 
-				if (mb->mode == MODE_STUFFING) {
-					DEBUG("-- STUFFING ?");
-					continue;
-				}
-
 				cbpy = get_cbpy(bs, intra);
+				DPRINTF(DPRINTF_MB, "cbpy %i", cbpy);
+
 				cbp = (cbpy << 2) | cbpc;
 
 				if (mb->mode == MODE_INTER_Q || mb->mode == MODE_INTRA_Q) {
-					quant += dquant_table[BitstreamGetBits(bs, 2)];
+					int dquant = dquant_table[BitstreamGetBits(bs, 2)];
+					DPRINTF(DPRINTF_MB, "dquant %i", dquant);
+					quant += dquant;
 					if (quant > 31) {
 						quant = 31;
-					} else if (mb->quant < 1) {
+					} else if (quant < 1) {
 						quant = 1;
 					}
+					DPRINTF(DPRINTF_MB, "quant %i", quant);
 				}
 				mb->quant = quant;
 
@@ -602,12 +638,12 @@
 				if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) {
 					if (dec->interlacing && mb->field_pred) {
 						get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0],
-										  fcode);
+										  fcode, bound);
 						get_motion_vector(dec, bs, x, y, 0, &mb->mvs[1],
-										  fcode);
+										  fcode, bound);
 					} else {
 						get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0],
-										  fcode);
+										  fcode, bound);
 						mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x =
 							mb->mvs[0].x;
 						mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y =
@@ -615,10 +651,10 @@
 					}
 				} else if (mb->mode ==
 						   MODE_INTER4V /* || mb->mode == MODE_INTER4V_Q */ ) {
-					get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0], fcode);
-					get_motion_vector(dec, bs, x, y, 1, &mb->mvs[1], fcode);
-					get_motion_vector(dec, bs, x, y, 2, &mb->mvs[2], fcode);
-					get_motion_vector(dec, bs, x, y, 3, &mb->mvs[3], fcode);
+					get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0], fcode, bound);
+					get_motion_vector(dec, bs, x, y, 1, &mb->mvs[1], fcode, bound);
+					get_motion_vector(dec, bs, x, y, 2, &mb->mvs[2], fcode, bound);
+					get_motion_vector(dec, bs, x, y, 3, &mb->mvs[3], fcode, bound);
 				} else			// MODE_INTRA, MODE_INTRA_Q
 				{
 					mb->mvs[0].x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x =
@@ -626,7 +662,7 @@
 					mb->mvs[0].y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y =
 						0;
 					decoder_mbintra(dec, mb, x, y, acpred_flag, cbp, bs, quant,
-									intra_dc_threshold);
+									intra_dc_threshold, bound);
 					continue;
 				}
 
@@ -1100,7 +1136,7 @@
 
 					if (quant > 31) {
 						quant = 31;
-					} else if (mb->quant < 1) {
+					} else if (quant < 1) {
 						quant = 1;
 					}
 				} else {
@@ -1243,12 +1279,16 @@
 	case P_VOP:
 		decoder_pframe(dec, &bs, rounding, quant, fcode_forward,
 					   intra_dc_threshold);
+#ifdef BFRAMES_DEC
 		DEBUG1("P_VOP  Time=", dec->time);
+#endif
 		break;
 
 	case I_VOP:
 		decoder_iframe(dec, &bs, quant, intra_dc_threshold);
+#ifdef BFRAMES_DEC
 		DEBUG1("I_VOP  Time=", dec->time);
+#endif
 		break;
 
 	case B_VOP: