--- decoder.c	2004/03/22 22:36:23	1.51
+++ decoder.c	2004/05/31 21:26:23	1.51.2.4
@@ -20,7 +20,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: decoder.c,v 1.51 2004/03/22 22:36:23 edgomez Exp $
+ * $Id: decoder.c,v 1.51.2.4 2004/05/31 21:26:23 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -222,6 +222,7 @@
 	dec->time = dec->time_base = dec->last_time_base = 0;
 	dec->low_delay = 0;
 	dec->packed_mode = 0;
+	dec->time_inc_resolution = 1; /* until VOL header says otherwise */
 
 	dec->fixed_dimensions = (dec->width > 0 && dec->height > 0);
 
@@ -302,7 +303,7 @@
 
 		start_timer();
 		predict_acdc(dec->mbs, x_pos, y_pos, dec->mb_width, i, &block[i * 64],
-					 iQuant, iDcScaler, predictors, bound);
+					 iQuant, iDcScaler, predictors, bound, dec->bs_version);
 		if (!acpred_flag) {
 			pMB->acpred_directions[i] = 0;
 		}
@@ -496,6 +497,33 @@
 			mv[i] = pMB->mvs[i];
 	}
 
+	for (i = 0; i < 4; i++) {
+		/* clip to valid range */
+		int border = (int)(dec->mb_width - x_pos) << (5 + dec->quarterpel);
+		if (mv[i].x > border) {
+			DPRINTF(XVID_DEBUG_MV, "mv.x > max -- %d > %d, MB %d, %d", mv[i].x, border, x_pos, y_pos);
+			mv[i].x = border;
+		} else {
+			border = (-(int)x_pos-1) << (5 + dec->quarterpel);
+			if (mv[i].x < border) {
+				DPRINTF(XVID_DEBUG_MV, "mv.x < min -- %d < %d, MB %d, %d", mv[i].x, border, x_pos, y_pos);
+				mv[i].x = border;
+			}
+		}
+
+		border = (int)(dec->mb_height - y_pos) << (5 + dec->quarterpel);
+		if (mv[i].y >  border) {
+			DPRINTF(XVID_DEBUG_MV, "mv.y > max -- %d > %d, MB %d, %d", mv[i].y, border, x_pos, y_pos);
+			mv[i].y = border;
+		} else {
+			border = (-(int)y_pos-1) << (5 + dec->quarterpel);
+			if (mv[i].y < border) {
+				DPRINTF(XVID_DEBUG_MV, "mv.y < min -- %d < %d, MB %d, %d", mv[i].y, border, x_pos, y_pos);
+				mv[i].y = border;
+			}
+		}
+	}
+
 	start_timer();
 
 	if (pMB->mode != MODE_INTER4V) { /* INTER, INTER_Q, NOT_CODED, FORWARD, BACKWARD */
@@ -761,20 +789,6 @@
 		mv.y -= range;
 	}
 
-	/* clip to valid range */
-
-	if (mv.x > ((int)(dec->mb_width - x) << (5 + dec->quarterpel)) )
-		mv.x = (int)(dec->mb_width - x) << (5 + dec->quarterpel);
-	
-	else if (mv.x < (int)(-x-1) << (5 + dec->quarterpel))
-		mv.x = (int)(-x-1) << (5 + dec->quarterpel);
-
-	if (mv.y > ((int)(dec->mb_height - y) << (5 + dec->quarterpel)) )
-		mv.y = (int)(dec->mb_height - y) << (5 + dec->quarterpel);
-
-	else if (mv.y < ((int)(-y-1)) << (5 + dec->quarterpel) )
-		mv.y = (int)(-y-1) << (5 + dec->quarterpel);
-
 	ret_mv->x = mv.x;
 	ret_mv->y = mv.y;
 }
@@ -986,20 +1000,6 @@
 	else if (mv_y > high)
 		mv_y -= range;
 
-
-	/* clip to valid range */
-	if (mv_x > ((int)(dec->mb_width - x) << (5 + dec->quarterpel)) )
-		mv_x = (int)(dec->mb_width - x) << (5 + dec->quarterpel);
-	
-	else if (mv_x < (int)(-x-1) << (5 + dec->quarterpel))
-		mv_x = (int)(-x-1) << (5 + dec->quarterpel);
-
-	if (mv_y > ((int)(dec->mb_height - y) << (5 + dec->quarterpel)) )
-		mv_y = (int)(dec->mb_height - y) << (5 + dec->quarterpel);
-
-	else if (mv_y < ((int)(-y-1)) << (5 + dec->quarterpel) )
-		mv_y = (int)(-y-1) << (5 + dec->quarterpel);
-
 	mv->x = mv_x;
 	mv->y = mv_y;
 }
@@ -1215,7 +1215,6 @@
 	uint32_t x, y;
 	VECTOR mv;
 	const VECTOR zeromv = {0,0};
-	const int64_t TRB = dec->time_pp - dec->time_bp, TRD = dec->time_pp;
 	int i;
 
 	start_timer();
@@ -1310,14 +1309,15 @@
 
 			case MODE_DIRECT_NONE_MV:
 				for (i = 0; i < 4; i++) {
-					mb->mvs[i].x = (int32_t) ((TRB * last_mb->mvs[i].x) / TRD + mv.x);
-					mb->b_mvs[i].x = (int32_t) ((mv.x == 0)
-									? ((TRB - TRD) * last_mb->mvs[i].x) / TRD
-									: mb->mvs[i].x - last_mb->mvs[i].x);
-					mb->mvs[i].y = (int32_t) ((TRB * last_mb->mvs[i].y) / TRD + mv.y);
-					mb->b_mvs[i].y = (int32_t) ((mv.y == 0)
-									? ((TRB - TRD) * last_mb->mvs[i].y) / TRD
-									: mb->mvs[i].y - last_mb->mvs[i].y);
+					mb->mvs[i].x = last_mb->mvs[i].x*dec->time_bp/dec->time_pp + mv.x;
+					mb->mvs[i].y = last_mb->mvs[i].y*dec->time_bp/dec->time_pp + mv.y;
+					
+					mb->b_mvs[i].x = (mv.x)
+						?  mb->mvs[i].x - last_mb->mvs[i].x
+						: last_mb->mvs[i].x*(dec->time_bp - dec->time_pp)/dec->time_pp;
+					mb->b_mvs[i].y = (mv.y)
+						? mb->mvs[i].y - last_mb->mvs[i].y
+						: last_mb->mvs[i].y*(dec->time_bp - dec->time_pp)/dec->time_pp;
 				}
 
 				decoder_bf_interpolate_mbinter(dec, dec->refn[1], dec->refn[0],
@@ -1490,6 +1490,11 @@
 		goto repeat;
 	}
 
+	if(dec->frames == 0 && coding_type != I_VOP) {
+		/* 1st frame is not an i-vop */
+		goto repeat;
+	}
+
 	dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0;	/* init pred vector to 0 */
 
 	/* packed_mode: special-N_VOP treament */