--- decoder.c	2002/06/12 20:38:39	1.19
+++ decoder.c	2002/06/22 07:23:09	1.21
@@ -32,6 +32,8 @@
  *
  *  History:
  *
+ *	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
  *              MinChen <chenm001@163.com>
  *  05.05.2002  fix some B-frame decode problem
@@ -47,7 +49,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.19 2002/06/12 20:38:39 edgomez Exp $
+ *  $Id: decoder.c,v 1.21 2002/06/22 07:23:09 suxen_drol Exp $
  *
  *************************************************************************/
 
@@ -96,6 +98,7 @@
 
 	dec->edged_width = 16 * dec->mb_width + 2 * EDGE_SIZE;
 	dec->edged_height = 16 * dec->mb_height + 2 * EDGE_SIZE;
+	dec->low_delay = 0;
 
 	if (image_create(&dec->cur, dec->edged_width, dec->edged_height)) {
 		xvid_free(dec);
@@ -134,6 +137,9 @@
 		xvid_free(dec);
 		return XVID_ERR_MEMORY;
 	}
+
+	memset(dec->mbs, 0, sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height);
+
 	// add by chenm001 <chenm001@163.com>
 	// for skip MB flag
 	dec->last_mbs =
@@ -149,6 +155,8 @@
 		return XVID_ERR_MEMORY;
 	}
 
+	memset(dec->last_mbs, 0, sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height);
+
 	init_timer();
 
 	// add by chenm001 <chenm001@163.com>
@@ -1244,17 +1252,21 @@
 		break;
 
 	case B_VOP:
-#ifdef BFRAMES
+#ifdef BFRAMES_DEC
 		if (dec->time_pp > dec->time_bp) {
 			DEBUG1("B_VOP  Time=", dec->time);
 			decoder_bframe(dec, &bs, quant, fcode_forward, fcode_backward);
 		} else {
 			DEBUG("broken B-frame!");
 		}
+#else
+		image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height);
 #endif
 		break;
 
 	case N_VOP:				// vop not coded
+		// when low_delay==0, N_VOP's should interpolate between the past and future frames
+		image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height);
 		break;
 
 	default:
@@ -1263,13 +1275,13 @@
 
 	frame->length = BitstreamPos(&bs) / 8;
 
-#ifdef BFRAMES
+#ifdef BFRAMES_DEC
 	// test if no B_VOP
 	if (dec->low_delay) {
 #endif
 		image_output(&dec->cur, dec->width, dec->height, dec->edged_width,
 					 frame->image, frame->stride, frame->colorspace);
-#ifdef BFRAMES
+#ifdef BFRAMES_DEC
 	} else {
 		if (dec->frames >= 1) {
 			start_timer();