--- decoder.c	2004/04/15 12:05:19	1.55
+++ decoder.c	2004/05/21 14:40:15	1.57
@@ -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.55 2004/04/15 12:05:19 suxen_drol Exp $
+ * $Id: decoder.c,v 1.57 2004/05/21 14:40:15 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;
 		}
@@ -814,10 +815,13 @@
 		mb_height = (dec->height + 31) / 32;
 	}
 
-	start_timer();
-	image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,
-					dec->width, dec->height, dec->bs_version);
-	stop_edges_timer();
+	if (!dec->is_edged[0]) {
+		start_timer();
+		image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,
+						dec->width, dec->height, dec->bs_version);
+		dec->is_edged[0] = 1;
+		stop_edges_timer();	
+	}
 
 	if (gmc_warp) {
 		/* accuracy: 0==1/2, 1=1/4, 2=1/8, 3=1/16 */
@@ -1214,15 +1218,24 @@
 	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;
+	const int32_t TRB = dec->time_pp - dec->time_bp, TRD = dec->time_pp;
 	int i;
 
-	start_timer();
-	image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,
-					dec->width, dec->height, dec->bs_version);
-	image_setedges(&dec->refn[1], dec->edged_width, dec->edged_height,
-					dec->width, dec->height, dec->bs_version);
-	stop_edges_timer();
+	if (!dec->is_edged[0]) {
+		start_timer();
+		image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,
+						dec->width, dec->height, dec->bs_version);
+		dec->is_edged[0] = 1;
+		stop_edges_timer();
+	}
+
+	if (!dec->is_edged[1]) {
+		start_timer();
+		image_setedges(&dec->refn[1], dec->edged_width, dec->edged_height,
+						dec->width, dec->height, dec->bs_version);
+		dec->is_edged[1] = 1;
+		stop_edges_timer();
+	}
 
 	for (y = 0; y < dec->mb_height; y++) {
 		/* Initialize Pred Motion Vector */
@@ -1492,6 +1505,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 */
@@ -1541,7 +1559,9 @@
 		}
 
 		image_swap(&dec->refn[0], &dec->refn[1]);
+		dec->is_edged[1] = dec->is_edged[0];
 		image_swap(&dec->cur, &dec->refn[0]);
+		dec->is_edged[0] = 0;
 		SWAP(MACROBLOCK *, dec->mbs, dec->last_mbs);
 		dec->last_reduced_resolution = reduced_resolution;
 		dec->last_coding_type = coding_type;