--- decoder.c	2002/09/21 03:07:56	1.38
+++ decoder.c	2003/02/15 15:22:17	1.47
@@ -53,12 +53,13 @@
  *  26.03.2002  interlacing support - moved transfers outside decode loop
  *  26.12.2001  decoder_mbinter: dequant/idct moved within if(coded) block
  *  22.12.2001  lock based interpolation
- *  01.12.2001  inital version; (c)2001 peter ross <pross@xvid.org>
+ *  01.12.2001  inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
  *
- *  $Id: decoder.c,v 1.38 2002/09/21 03:07:56 suxen_drol Exp $
+ *  $Id: decoder.c,v 1.47 2003/02/15 15:22:17 edgomez Exp $
  *
  *************************************************************************/
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -68,6 +69,7 @@
 
 #include "xvid.h"
 #include "portab.h"
+#include "global.h"
 
 #include "decoder.h"
 #include "bitstream/bitstream.h"
@@ -79,36 +81,44 @@
 #include "dct/fdct.h"
 #include "utils/mem_transfer.h"
 #include "image/interpolate8x8.h"
+#include "image/reduced.h"
+#include "image/font.h"
 
 #include "bitstream/mbcoding.h"
 #include "prediction/mbprediction.h"
 #include "utils/timer.h"
 #include "utils/emms.h"
+#include "motion/motion.h"
 
 #include "image/image.h"
 #include "image/colorspace.h"
 #include "utils/mem_align.h"
 
 int
-decoder_create(XVID_DEC_PARAM * param)
+decoder_resize(DECODER * dec)
 {
-	DECODER *dec;
+	/* free existing */
 
-	dec = xvid_malloc(sizeof(DECODER), CACHE_LINE);
-	if (dec == NULL) {
-		return XVID_ERR_MEMORY;
-	}
-	param->handle = dec;
+	image_destroy(&dec->cur, dec->edged_width, dec->edged_height);
+	image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height);
+	image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height);
+	image_destroy(&dec->tmp, dec->edged_width, dec->edged_height);
+	image_destroy(&dec->qtmp, dec->edged_width, dec->edged_height);
 
-	dec->width = param->width;
-	dec->height = param->height;
+	image_destroy(&dec->gmc, dec->edged_width, dec->edged_height);
+
+	if (dec->last_mbs) 
+		xvid_free(dec->last_mbs);
+	if (dec->mbs)
+		xvid_free(dec->mbs);
+
+	/* realloc */
 
 	dec->mb_width = (dec->width + 15) / 16;
 	dec->mb_height = (dec->height + 15) / 16;
 
 	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);
@@ -120,6 +130,7 @@
 		xvid_free(dec);
 		return XVID_ERR_MEMORY;
 	}
+
 	// add by chenm001 <chenm001@163.com>
 	// for support B-frame to reference last 2 frame
 	if (image_create(&dec->refn[1], dec->edged_width, dec->edged_height)) {
@@ -128,10 +139,29 @@
 		xvid_free(dec);
 		return XVID_ERR_MEMORY;
 	}
-	if (image_create(&dec->refn[2], dec->edged_width, dec->edged_height)) {
+	if (image_create(&dec->tmp, dec->edged_width, dec->edged_height)) {
+		image_destroy(&dec->cur, dec->edged_width, dec->edged_height);
+		image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height);
+		image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height);
+		xvid_free(dec);
+		return XVID_ERR_MEMORY;
+	}
+
+	if (image_create(&dec->qtmp, dec->edged_width, dec->edged_height)) {
 		image_destroy(&dec->cur, dec->edged_width, dec->edged_height);
 		image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height);
 		image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height);
+		image_destroy(&dec->tmp, dec->edged_width, dec->edged_height);
+		xvid_free(dec);
+		return XVID_ERR_MEMORY;
+	}
+
+	if (image_create(&dec->gmc, dec->edged_width, dec->edged_height)) {
+		image_destroy(&dec->qtmp, dec->edged_width, dec->edged_height);
+		image_destroy(&dec->cur, dec->edged_width, dec->edged_height);
+		image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height);
+		image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height);
+		image_destroy(&dec->tmp, dec->edged_width, dec->edged_height);
 		xvid_free(dec);
 		return XVID_ERR_MEMORY;
 	}
@@ -143,11 +173,11 @@
 		image_destroy(&dec->cur, dec->edged_width, dec->edged_height);
 		image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height);
 		image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height);
-		image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height);
+		image_destroy(&dec->tmp, dec->edged_width, dec->edged_height);
+		image_destroy(&dec->qtmp, dec->edged_width, dec->edged_height);
 		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>
@@ -160,21 +190,62 @@
 		image_destroy(&dec->cur, dec->edged_width, dec->edged_height);
 		image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height);
 		image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height);
-		image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height);
+		image_destroy(&dec->tmp, dec->edged_width, dec->edged_height);
+		image_destroy(&dec->qtmp, dec->edged_width, dec->edged_height);
 		xvid_free(dec);
 		return XVID_ERR_MEMORY;
 	}
 
 	memset(dec->last_mbs, 0, sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height);
 
+	return XVID_ERR_OK;
+}
+
+
+int
+decoder_create(XVID_DEC_PARAM * param)
+{
+	DECODER *dec;
+
+	dec = xvid_malloc(sizeof(DECODER), CACHE_LINE);
+	if (dec == NULL) {
+		return XVID_ERR_MEMORY;
+	}
+	memset(dec, 0, sizeof(DECODER));
+
+	param->handle = dec;
+
+	dec->width = param->width;
+	dec->height = param->height;
+
+	image_null(&dec->cur);
+	image_null(&dec->refn[0]);
+	image_null(&dec->refn[1]);
+	image_null(&dec->tmp);
+	image_null(&dec->qtmp);
+
+/* image based GMC */
+	image_null(&dec->gmc);
+
+
+	dec->mbs = NULL;
+	dec->last_mbs = NULL;
+
 	init_timer();
 
 	// add by chenm001 <chenm001@163.com>
 	// for support B-frame to save reference frame's time
-	dec->frames = -1;
+	dec->frames = 0;
 	dec->time = dec->time_base = dec->last_time_base = 0;
+	dec->low_delay = 0;
+	dec->packed_mode = 0;
 
-	return XVID_ERR_OK;
+	dec->fixed_dimensions = (dec->width > 0 && dec->height > 0);
+
+	if (dec->fixed_dimensions)
+		return decoder_resize(dec);
+	else
+		return XVID_ERR_OK;		
 }
 
 
@@ -183,9 +254,13 @@
 {
 	xvid_free(dec->last_mbs);
 	xvid_free(dec->mbs);
+
+	image_destroy(&dec->gmc, dec->edged_width, dec->edged_height);		/* image based GMC */
+
 	image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height);
 	image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height);
-	image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height);
+	image_destroy(&dec->tmp, dec->edged_width, dec->edged_height);
+	image_destroy(&dec->qtmp, dec->edged_width, dec->edged_height);
 	image_destroy(&dec->cur, dec->edged_width, dec->edged_height);
 	xvid_free(dec);
 
@@ -214,7 +289,8 @@
 				Bitstream * bs,
 				const uint32_t quant,
 				const uint32_t intra_dc_threshold,
-				const unsigned int bound)
+				const unsigned int bound,
+				const int reduced_resolution)
 {
 
 	DECLARE_ALIGNED_MATRIX(block, 6, 64, int16_t, CACHE_LINE);
@@ -227,9 +303,15 @@
 	uint32_t iQuant = pMB->quant;
 	uint8_t *pY_Cur, *pU_Cur, *pV_Cur;
 
-	pY_Cur = dec->cur.y + (y_pos << 4) * stride + (x_pos << 4);
-	pU_Cur = dec->cur.u + (y_pos << 3) * stride2 + (x_pos << 3);
-	pV_Cur = dec->cur.v + (y_pos << 3) * stride2 + (x_pos << 3);
+	if (reduced_resolution) {
+		pY_Cur = dec->cur.y + (y_pos << 5) * stride + (x_pos << 5);
+		pU_Cur = dec->cur.u + (y_pos << 4) * stride2 + (x_pos << 4);
+		pV_Cur = dec->cur.v + (y_pos << 4) * stride2 + (x_pos << 4);
+	}else{
+		pY_Cur = dec->cur.y + (y_pos << 4) * stride + (x_pos << 4);
+		pU_Cur = dec->cur.u + (y_pos << 3) * stride2 + (x_pos << 3);
+		pV_Cur = dec->cur.v + (y_pos << 3) * stride2 + (x_pos << 3);
+	}
 
 	memset(block, 0, 6 * 64 * sizeof(int16_t));	// clear
 
@@ -268,8 +350,10 @@
 		start_timer();
 		if (cbp & (1 << (5 - i)))	// coded
 		{
-			get_intra_block(bs, &block[i * 64], pMB->acpred_directions[i],
-							start_coeff);
+			int direction = dec->alternate_vertical_scan ?
+				2 : pMB->acpred_directions[i];
+
+			get_intra_block(bs, &block[i * 64], direction, start_coeff);
 		}
 		stop_coding_timer();
 
@@ -288,6 +372,7 @@
 		start_timer();
 		idct(&data[i * 64]);
 		stop_idct_timer();
+
 	}
 
 	if (dec->interlacing && pMB->field_dct) {
@@ -296,25 +381,30 @@
 	}
 
 	start_timer();
-	transfer_16to8copy(pY_Cur, &data[0 * 64], stride);
-	transfer_16to8copy(pY_Cur + 8, &data[1 * 64], stride);
-	transfer_16to8copy(pY_Cur + next_block, &data[2 * 64], stride);
-	transfer_16to8copy(pY_Cur + 8 + next_block, &data[3 * 64], stride);
-	transfer_16to8copy(pU_Cur, &data[4 * 64], stride2);
-	transfer_16to8copy(pV_Cur, &data[5 * 64], stride2);
+
+	if (reduced_resolution)
+	{
+		next_block*=2;
+		copy_upsampled_8x8_16to8(pY_Cur, &data[0 * 64], stride);
+		copy_upsampled_8x8_16to8(pY_Cur + 16, &data[1 * 64], stride);
+		copy_upsampled_8x8_16to8(pY_Cur + next_block, &data[2 * 64], stride);
+		copy_upsampled_8x8_16to8(pY_Cur + 16 + next_block, &data[3 * 64], stride);
+		copy_upsampled_8x8_16to8(pU_Cur, &data[4 * 64], stride2);
+		copy_upsampled_8x8_16to8(pV_Cur, &data[5 * 64], stride2);
+	}else{
+		transfer_16to8copy(pY_Cur, &data[0 * 64], stride);
+		transfer_16to8copy(pY_Cur + 8, &data[1 * 64], stride);
+		transfer_16to8copy(pY_Cur + next_block, &data[2 * 64], stride);
+		transfer_16to8copy(pY_Cur + 8 + next_block, &data[3 * 64], stride);
+		transfer_16to8copy(pU_Cur, &data[4 * 64], stride2);
+		transfer_16to8copy(pV_Cur, &data[5 * 64], stride2);
+	}
 	stop_transfer_timer();
 }
 
 
 
 
-
-#define SIGN(X) (((X)>0)?1:-1)
-#define ABS(X) (((X)>0)?(X):-(X))
-static const uint32_t roundtab[16] =
-	{ 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2 };
-
-
 // decode an inter macroblock
 
 void
@@ -322,11 +412,12 @@
 				const MACROBLOCK * pMB,
 				const uint32_t x_pos,
 				const uint32_t y_pos,
-				const uint32_t acpred_flag,
+				const uint32_t fcode,
 				const uint32_t cbp,
 				Bitstream * bs,
 				const uint32_t quant,
-				const uint32_t rounding)
+				const uint32_t rounding,
+				const int reduced_resolution)
 {
 
 	DECLARE_ALIGNED_MATRIX(block, 6, 64, int16_t, CACHE_LINE);
@@ -334,85 +425,275 @@
 
 	uint32_t stride = dec->edged_width;
 	uint32_t stride2 = stride / 2;
-	uint32_t next_block = stride * 8;
+	uint32_t next_block = stride * (reduced_resolution ? 16 : 8);
 	uint32_t i;
 	uint32_t iQuant = pMB->quant;
 	uint8_t *pY_Cur, *pU_Cur, *pV_Cur;
-	int uv_dx, uv_dy;
 
-	pY_Cur = dec->cur.y + (y_pos << 4) * stride + (x_pos << 4);
-	pU_Cur = dec->cur.u + (y_pos << 3) * stride2 + (x_pos << 3);
-	pV_Cur = dec->cur.v + (y_pos << 3) * stride2 + (x_pos << 3);
+	int uv_dx, uv_dy;
+	VECTOR mv[4];	/* local copy of mvs */
 
+	if (reduced_resolution) {
+		pY_Cur = dec->cur.y + (y_pos << 5) * stride + (x_pos << 5);
+		pU_Cur = dec->cur.u + (y_pos << 4) * stride2 + (x_pos << 4);
+		pV_Cur = dec->cur.v + (y_pos << 4) * stride2 + (x_pos << 4);
+		for (i = 0; i < 4; i++)	{
+			mv[i].x = RRV_MV_SCALEUP(pMB->mvs[i].x);
+			mv[i].y = RRV_MV_SCALEUP(pMB->mvs[i].y);
+		}
+	} else {
+		pY_Cur = dec->cur.y + (y_pos << 4) * stride + (x_pos << 4);
+		pU_Cur = dec->cur.u + (y_pos << 3) * stride2 + (x_pos << 3);
+		pV_Cur = dec->cur.v + (y_pos << 3) * stride2 + (x_pos << 3);
+		for (i = 0; i < 4; i++)
+			mv[i] = pMB->mvs[i];
+	}
+	
 	if (pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q) {
-		uv_dx = pMB->mvs[0].x;
-		uv_dy = pMB->mvs[0].y;
 
-		if (dec->quarterpel)
+		uv_dx = mv[0].x / (1 + dec->quarterpel);
+		uv_dy = mv[0].y / (1 + dec->quarterpel);
+		
+		uv_dx = (uv_dx >> 1) + roundtab_79[uv_dx & 0x3];
+		uv_dy = (uv_dy >> 1) + roundtab_79[uv_dy & 0x3];
+
+		start_timer();
+		if (reduced_resolution)
 		{
-			uv_dx = (uv_dx >> 1) | (uv_dx & 1);
-			uv_dy = (uv_dy >> 1) | (uv_dy & 1);
+			interpolate32x32_switch(dec->cur.y, dec->refn[0].y, 32*x_pos, 32*y_pos,
+								  mv[0].x, mv[0].y, stride,  rounding);
+			interpolate16x16_switch(dec->cur.u, dec->refn[0].u, 16 * x_pos, 16 * y_pos,
+								  uv_dx, uv_dy, stride2, rounding);
+			interpolate16x16_switch(dec->cur.v, dec->refn[0].v, 16 * x_pos, 16 * y_pos,
+								  uv_dx, uv_dy, stride2, rounding);
+
 		}
+		else
+		{
+			if(dec->quarterpel) {
+				interpolate16x16_quarterpel(dec->cur.y, dec->refn[0].y, dec->qtmp.y, dec->qtmp.y + 64,
+	 										dec->qtmp.y + 128, 16*x_pos, 16*y_pos,
+											mv[0].x, mv[0].y, stride, rounding);
+			}
+			else {
+				interpolate16x16_switch(dec->cur.y, dec->refn[0].y, 16*x_pos, 16*y_pos,
+									  mv[0].x, mv[0].y, stride, rounding);
+			}
 
-		uv_dx = (uv_dx & 3) ? (uv_dx >> 1) | 1 : uv_dx / 2;
-		uv_dy = (uv_dy & 3) ? (uv_dy >> 1) | 1 : uv_dy / 2;
-	} else {
+			interpolate8x8_switch(dec->cur.u, dec->refn[0].u, 8 * x_pos, 8 * y_pos,
+								  uv_dx, uv_dy, stride2, rounding);
+			interpolate8x8_switch(dec->cur.v, dec->refn[0].v, 8 * x_pos, 8 * y_pos,
+								  uv_dx, uv_dy, stride2, rounding);
+		}
+		stop_comp_timer();
+
+	} else {	/* MODE_INTER4V */
 		int sum;
-		sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x;
+		
+		if(dec->quarterpel)
+			sum = (mv[0].x / 2) + (mv[1].x / 2) + (mv[2].x / 2) + (mv[3].x / 2);
+		else
+			sum = mv[0].x + mv[1].x + mv[2].x + mv[3].x;
+
+		uv_dx = (sum >> 3) + roundtab_76[sum & 0xf];
+
+		if(dec->quarterpel)
+			sum = (mv[0].y / 2) + (mv[1].y / 2) + (mv[2].y / 2) + (mv[3].y / 2);
+		else
+			sum = mv[0].y + mv[1].y + mv[2].y + mv[3].y;
 
-		if (dec->quarterpel)
+		uv_dy = (sum >> 3) + roundtab_76[sum & 0xf];
+
+		start_timer();
+		if (reduced_resolution)
 		{
-			sum /= 2;
-		}
+			interpolate16x16_switch(dec->cur.y, dec->refn[0].y, 32*x_pos, 32*y_pos,
+								  mv[0].x, mv[0].y, stride,  rounding);
+			interpolate16x16_switch(dec->cur.y, dec->refn[0].y , 32*x_pos + 16, 32*y_pos,
+								  mv[1].x, mv[1].y, stride,  rounding);
+			interpolate16x16_switch(dec->cur.y, dec->refn[0].y , 32*x_pos, 32*y_pos + 16,
+								  mv[2].x, mv[2].y, stride,  rounding);
+			interpolate16x16_switch(dec->cur.y, dec->refn[0].y , 32*x_pos + 16, 32*y_pos + 16, 
+								  mv[3].x, mv[3].y, stride,  rounding);
+			interpolate16x16_switch(dec->cur.u, dec->refn[0].u , 16 * x_pos, 16 * y_pos,
+								  uv_dx, uv_dy, stride2, rounding);
+			interpolate16x16_switch(dec->cur.v, dec->refn[0].v , 16 * x_pos, 16 * y_pos,
+								  uv_dx, uv_dy, stride2, rounding);
+
+			// set_block(pY_Cur, stride, 32, 32, 127);
+		} 
+		else
+		{
+			if(dec->quarterpel) {
+				interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y , dec->qtmp.y, dec->qtmp.y + 64,
+										  dec->qtmp.y + 128, 16*x_pos, 16*y_pos,
+										  mv[0].x, mv[0].y, stride,  rounding);
+				interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y , dec->qtmp.y, dec->qtmp.y + 64,
+										  dec->qtmp.y + 128, 16*x_pos + 8, 16*y_pos,
+										  mv[1].x, mv[1].y, stride,  rounding);
+				interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y , dec->qtmp.y, dec->qtmp.y + 64,
+										  dec->qtmp.y + 128, 16*x_pos, 16*y_pos + 8,
+										  mv[2].x, mv[2].y, stride,  rounding);
+				interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y , dec->qtmp.y, dec->qtmp.y + 64,
+										  dec->qtmp.y + 128, 16*x_pos + 8, 16*y_pos + 8,
+										  mv[3].x, mv[3].y, stride,  rounding);
+			}
+			else {
+				interpolate8x8_switch(dec->cur.y, dec->refn[0].y , 16*x_pos, 16*y_pos,
+									  mv[0].x, mv[0].y, stride,  rounding);
+				interpolate8x8_switch(dec->cur.y, dec->refn[0].y , 16*x_pos + 8, 16*y_pos,
+									  mv[1].x, mv[1].y, stride,  rounding);
+				interpolate8x8_switch(dec->cur.y, dec->refn[0].y , 16*x_pos, 16*y_pos + 8,
+									  mv[2].x, mv[2].y, stride,  rounding);
+				interpolate8x8_switch(dec->cur.y, dec->refn[0].y , 16*x_pos + 8, 16*y_pos + 8, 
+									  mv[3].x, mv[3].y, stride,  rounding);
+			}
 
-		uv_dx = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2));
+			interpolate8x8_switch(dec->cur.u, dec->refn[0].u , 8 * x_pos, 8 * y_pos,
+								  uv_dx, uv_dy, stride2, rounding);
+			interpolate8x8_switch(dec->cur.v, dec->refn[0].v , 8 * x_pos, 8 * y_pos,
+								  uv_dx, uv_dy, stride2, rounding);
+		}
+		stop_comp_timer();
+	}
 
-		sum = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y;
+	for (i = 0; i < 6; i++) {
+		int direction = dec->alternate_vertical_scan ? 2 : 0;
 
-		if (dec->quarterpel)
+		if (cbp & (1 << (5 - i)))	// coded
 		{
-			sum /= 2;
+			memset(&block[i * 64], 0, 64 * sizeof(int16_t));	// clear
+
+			start_timer();
+			get_inter_block(bs, &block[i * 64], direction);
+			stop_coding_timer();
+
+			start_timer();
+			if (dec->quant_type == 0) {
+				dequant_inter(&data[i * 64], &block[i * 64], iQuant);
+			} else {
+				dequant4_inter(&data[i * 64], &block[i * 64], iQuant);
+			}
+			stop_iquant_timer();
+
+			start_timer();
+			idct(&data[i * 64]);
+			stop_idct_timer();
 		}
+	}
 
-		uv_dy = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2));
+	if (dec->interlacing && pMB->field_dct) {
+		next_block = stride;
+		stride *= 2;
 	}
 
 	start_timer();
-	if(dec->quarterpel) {
-		DEBUG("QUARTERPEL");
-		interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, 16*x_pos, 16*y_pos,
-								  pMB->mvs[0].x, pMB->mvs[0].y, stride,  rounding);
-		interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, 16*x_pos + 8, 16*y_pos,
-								  pMB->mvs[1].x, pMB->mvs[1].y, stride,  rounding);
-		interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, 16*x_pos, 16*y_pos + 8,
-								  pMB->mvs[2].x, pMB->mvs[2].y, stride,  rounding);
-		interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, 16*x_pos + 8, 16*y_pos + 8,
-								  pMB->mvs[3].x, pMB->mvs[3].y, stride,  rounding);
+	if (reduced_resolution)
+	{
+		if (cbp & 32)
+			add_upsampled_8x8_16to8(pY_Cur, &data[0 * 64], stride);
+		if (cbp & 16)
+			add_upsampled_8x8_16to8(pY_Cur + 16, &data[1 * 64], stride);
+		if (cbp & 8)
+			add_upsampled_8x8_16to8(pY_Cur + next_block, &data[2 * 64], stride);
+		if (cbp & 4)
+			add_upsampled_8x8_16to8(pY_Cur + 16 + next_block, &data[3 * 64], stride);
+		if (cbp & 2)
+			add_upsampled_8x8_16to8(pU_Cur, &data[4 * 64], stride2);
+		if (cbp & 1)
+			add_upsampled_8x8_16to8(pV_Cur, &data[5 * 64], stride2);
 	}
-	else {
-		interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos, 16*y_pos,
-							  pMB->mvs[0].x, pMB->mvs[0].y, stride,  rounding);
-		interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos + 8, 16*y_pos,
-							  pMB->mvs[1].x, pMB->mvs[1].y, stride,  rounding);
-		interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos, 16*y_pos + 8,
-							  pMB->mvs[2].x, pMB->mvs[2].y, stride,  rounding);
-		interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos + 8, 16*y_pos + 8, 
-							  pMB->mvs[3].x, pMB->mvs[3].y, stride,  rounding);
+	else
+	{
+		if (cbp & 32)
+			transfer_16to8add(pY_Cur, &data[0 * 64], stride);
+		if (cbp & 16)
+			transfer_16to8add(pY_Cur + 8, &data[1 * 64], stride);
+		if (cbp & 8)
+			transfer_16to8add(pY_Cur + next_block, &data[2 * 64], stride);
+		if (cbp & 4)
+			transfer_16to8add(pY_Cur + 8 + next_block, &data[3 * 64], stride);
+		if (cbp & 2)
+			transfer_16to8add(pU_Cur, &data[4 * 64], stride2);
+		if (cbp & 1)
+			transfer_16to8add(pV_Cur, &data[5 * 64], stride2);
 	}
+	stop_transfer_timer();
+}
 
-	interpolate8x8_switch(dec->cur.u, dec->refn[0].u, 8 * x_pos, 8 * y_pos,
-						  uv_dx, uv_dy, stride2, rounding);
-	interpolate8x8_switch(dec->cur.v, dec->refn[0].v, 8 * x_pos, 8 * y_pos,
-						  uv_dx, uv_dy, stride2, rounding);
-	stop_comp_timer();
+static __inline int gmc_sanitize(int value, int quarterpel, int fcode)
+{
+	int length = 1 << (fcode+4);
+
+//	if (quarterpel) value *= 2;
+
+	if (value < -length) 
+		return -length;
+	else if (value >= length) 
+		return length-1;
+	else return value;
+}
+
+
+static void
+decoder_mbgmc(DECODER * dec,
+				MACROBLOCK * const pMB,
+				const uint32_t x_pos,
+				const uint32_t y_pos,
+				const uint32_t fcode,
+				const uint32_t cbp,
+				Bitstream * bs,
+				const uint32_t quant,
+				const uint32_t rounding,
+				const int reduced_resolution)	/* no reduced res support */
+{
+
+	DECLARE_ALIGNED_MATRIX(block, 6, 64, int16_t, CACHE_LINE);
+	DECLARE_ALIGNED_MATRIX(data, 6, 64, int16_t, CACHE_LINE);
+
+	const uint32_t stride = dec->edged_width;
+	const uint32_t stride2 = stride / 2;
+	const uint32_t next_block = stride * (reduced_resolution ? 16 : 8);
+	uint32_t i;
+	const uint32_t iQuant = pMB->quant;
+	uint8_t *const pY_Cur=dec->cur.y + (y_pos << 4) * stride + (x_pos << 4);
+	uint8_t *const pU_Cur=dec->cur.u + (y_pos << 3) * stride2 + (x_pos << 3);
+	uint8_t *const pV_Cur=dec->cur.v + (y_pos << 3) * stride2 + (x_pos << 3);
+
+	pMB->mvs[0] = pMB->mvs[1] = pMB->mvs[2] = pMB->mvs[3] = pMB->amv;
+
+	start_timer();
+	
+/* this is where the calculations are done */
+	
+	{
+		pMB->amv = generate_GMCimageMB(&dec->gmc_data, &dec->refn[0], x_pos, y_pos, 
+					stride, stride2, dec->quarterpel, rounding, &dec->cur);
+
+		pMB->amv.x = gmc_sanitize(pMB->amv.x, dec->quarterpel, fcode);
+		pMB->amv.y = gmc_sanitize(pMB->amv.y, dec->quarterpel, fcode);
+	}
+	pMB->mvs[0] = pMB->mvs[1] = pMB->mvs[2] = pMB->mvs[3] = pMB->amv;
+	
+/*	transfer16x16_copy(pY_Cur, dec->gmc.y + (y_pos << 4)*stride + (x_pos  << 4), stride);
+	transfer8x8_copy(pU_Cur, dec->gmc.u + (y_pos << 3)*stride2 + (x_pos  << 3), stride2);
+	transfer8x8_copy(pV_Cur, dec->gmc.v + (y_pos << 3)*stride2 + (x_pos << 3), stride2);
+*/
+
+
+	stop_transfer_timer();
+	
+	if (!cbp) return;
 
 	for (i = 0; i < 6; i++) {
+		int direction = dec->alternate_vertical_scan ? 2 : 0;
+
 		if (cbp & (1 << (5 - i)))	// coded
 		{
 			memset(&block[i * 64], 0, 64 * sizeof(int16_t));	// clear
 
 			start_timer();
-			get_inter_block(bs, &block[i * 64]);
+			get_inter_block(bs, &block[i * 64], direction);
 			stop_coding_timer();
 
 			start_timer();
@@ -429,11 +710,12 @@
 		}
 	}
 
-	if (dec->interlacing && pMB->field_dct) {
+/* interlace + GMC is this possible ??? */
+/*	if (dec->interlacing && pMB->field_dct) {
 		next_block = stride;
 		stride *= 2;
 	}
-
+*/
 	start_timer();
 	if (cbp & 32)
 		transfer_16to8add(pY_Cur, &data[0 * 64], stride);
@@ -454,16 +736,25 @@
 void
 decoder_iframe(DECODER * dec,
 			   Bitstream * bs,
+			   int reduced_resolution,
 			   int quant,
 			   int intra_dc_threshold)
 {
 	uint32_t bound;
 	uint32_t x, y;
+	uint32_t mb_width = dec->mb_width;
+	uint32_t mb_height = dec->mb_height;
+	
+	if (reduced_resolution)
+	{
+		mb_width = (dec->width + 31) / 32;
+		mb_height = (dec->height + 31) / 32;
+	}
 
 	bound = 0;
 
-	for (y = 0; y < dec->mb_height; y++) {
-		for (x = 0; x < dec->mb_width; x++) {
+	for (y = 0; y < mb_height; y++) {
+		for (x = 0; x < mb_width; x++) {
 			MACROBLOCK *mb;
 			uint32_t mcbpc;
 			uint32_t cbpc;
@@ -476,9 +767,10 @@
 
 			if (check_resync_marker(bs, 0))
 			{
-				bound = read_video_packet_header(bs, 0, &quant);
-				x = bound % dec->mb_width;
-				y = bound / dec->mb_width;
+				bound = read_video_packet_header(bs, dec, 0, 
+							&quant, NULL, NULL, &intra_dc_threshold);
+				x = bound % mb_width;
+				y = bound / mb_width;
 			}
 			mb = &dec->mbs[y * dec->mb_width + x];
 
@@ -509,15 +801,15 @@
 
 			if (dec->interlacing) {
 				mb->field_dct = BitstreamGetBit(bs);
-				DEBUG1("deci: field_dct: ", mb->field_dct);
+				DPRINTF(DPRINTF_MB,"deci: field_dct: %i", mb->field_dct);
 			}
 
 			decoder_mbintra(dec, mb, x, y, acpred_flag, cbp, bs, quant,
-							intra_dc_threshold, bound);
+							intra_dc_threshold, bound, reduced_resolution);
+
 		}
 		if(dec->out_frm)
-		  output_slice(&dec->cur, dec->edged_width,dec->width,dec->out_frm,0,y,dec->mb_width);
-
+		  output_slice(&dec->cur, dec->edged_width,dec->width,dec->out_frm,0,y,mb_width);
 	}
 
 }
@@ -529,7 +821,7 @@
 				  int x,
 				  int y,
 				  int k,
-				  VECTOR * mv,
+				  VECTOR * ret_mv,
 				  int fcode,
 				  const int bound)
 {
@@ -540,59 +832,97 @@
 	int range = (64 * scale_fac);
 
 	VECTOR pmv;
-	int mv_x, mv_y;
+	VECTOR mv;
 
 	pmv = get_pmv2(dec->mbs, dec->mb_width, bound, x, y, k);
 
-	mv_x = get_mv(bs, fcode);
-	mv_y = get_mv(bs, fcode);
+	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);
+	DPRINTF(DPRINTF_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)", mv.x, mv.y, pmv.x, pmv.y, mv.x+pmv.x, mv.y+pmv.y);
 
-	mv_x += pmv.x;
-	mv_y += pmv.y;
+	mv.x += pmv.x;
+	mv.y += pmv.y;
 
-	if (mv_x < low) {
-		mv_x += range;
-	} else if (mv_x > high) {
-		mv_x -= range;
+	if (mv.x < low) {
+		mv.x += range;
+	} else if (mv.x > high) {
+		mv.x -= range;
 	}
 
-	if (mv_y < low) {
-		mv_y += range;
-	} else if (mv_y > high) {
-		mv_y -= range;
+	if (mv.y < low) {
+		mv.y += range;
+	} else if (mv.y > high) {
+		mv.y -= range;
 	}
 
-	mv->x = mv_x;
-	mv->y = mv_y;
-
+	ret_mv->x = mv.x;
+	ret_mv->y = mv.y;
 }
 
 
+
+
+
+/* for P_VOP set gmc_warp to NULL */
 void
 decoder_pframe(DECODER * dec,
 			   Bitstream * bs,
 			   int rounding,
+			   int reduced_resolution,
 			   int quant,
 			   int fcode,
-			   int intra_dc_threshold)
+			   int intra_dc_threshold,
+			   const WARPPOINTS *const gmc_warp)
 {
 
 	uint32_t x, y;
 	uint32_t bound;
 	int cp_mb, st_mb;
+	uint32_t mb_width = dec->mb_width;
+	uint32_t mb_height = dec->mb_height;
+	
+	if (reduced_resolution)
+	{
+		mb_width = (dec->width + 31) / 32;
+		mb_height = (dec->height + 31) / 32;
+	}
 
 	start_timer();
 	image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,
-				   dec->width, dec->height, dec->interlacing);
+				   dec->width, dec->height);
 	stop_edges_timer();
 
+	if (gmc_warp)
+	{	
+
+		// accuracy:  0==1/2, 1=1/4, 2=1/8, 3=1/16
+		if ( (dec->sprite_warping_accuracy != 3) || (dec->sprite_warping_points != 2) )
+		{	
+			fprintf(stderr,"Wrong GMC parameters acc=%d(-> 1/%d), %d!!!\n",
+				dec->sprite_warping_accuracy,(2<<dec->sprite_warping_accuracy),
+				dec->sprite_warping_points);
+		}
+		
+		generate_GMCparameters(	dec->sprite_warping_points, 
+				(2 << dec->sprite_warping_accuracy), gmc_warp, 
+				dec->width, dec->height, &dec->gmc_data);
+
+/* image warping is done block-based  in decoder_mbgmc(), now */	
+/*
+	generate_GMCimage(&dec->gmc_data, &dec->refn[0], 
+					mb_width, mb_height, 
+					dec->edged_width, dec->edged_width/2,
+					fcode, dec->quarterpel, 0, 
+					rounding, dec->mbs, &dec->gmc);
+*/
+	}
+
 	bound = 0;
 
-	for (y = 0; y < dec->mb_height; y++) {
+	for (y = 0; y < mb_height; y++) {
 		cp_mb = st_mb = 0;
-		for (x = 0; x < dec->mb_width; x++) {
+		for (x = 0; x < mb_width; x++) {
 			MACROBLOCK *mb;
 
 			// skip stuffing
@@ -601,16 +931,17 @@
 
 			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;
+				bound = read_video_packet_header(bs, dec, fcode - 1, 
+					&quant, &fcode, NULL, &intra_dc_threshold);
+				x = bound % mb_width;
+				y = bound / 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
+			if (!(BitstreamGetBit(bs)))	// block _is_ coded
 			{
 				uint32_t mcbpc;
 				uint32_t cbpc;
@@ -618,6 +949,7 @@
 				uint32_t cbpy;
 				uint32_t cbp;
 				uint32_t intra;
+				int mcsel = 0;		// mcsel: '0'=local motion, '1'=GMC
 
 				cp_mb++;
 				mcbpc = get_mcbpc_inter(bs);
@@ -634,8 +966,13 @@
 					acpred_flag = BitstreamGetBit(bs);
 				}
 
+				if (gmc_warp && (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q))
+				{
+					mcsel = BitstreamGetBit(bs);
+				}
+
 				cbpy = get_cbpy(bs, intra);
-				DPRINTF(DPRINTF_MB, "cbpy %i", cbpy);
+				DPRINTF(DPRINTF_MB, "cbpy %i  mcsel %i ", cbpy,mcsel);
 
 				cbp = (cbpy << 2) | cbpc;
 
@@ -655,23 +992,29 @@
 				if (dec->interlacing) {
 					if (cbp || intra) {
 						mb->field_dct = BitstreamGetBit(bs);
-						DEBUG1("decp: field_dct: ", mb->field_dct);
+						DPRINTF(DPRINTF_MB,"decp: field_dct: %i", mb->field_dct);
 					}
 
 					if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) {
 						mb->field_pred = BitstreamGetBit(bs);
-						DEBUG1("decp: field_pred: ", mb->field_pred);
+						DPRINTF(DPRINTF_MB, "decp: field_pred: %i", mb->field_pred);
 
 						if (mb->field_pred) {
 							mb->field_for_top = BitstreamGetBit(bs);
-							DEBUG1("decp: field_for_top: ", mb->field_for_top);
+							DPRINTF(DPRINTF_MB,"decp: field_for_top: %i", mb->field_for_top);
 							mb->field_for_bot = BitstreamGetBit(bs);
-							DEBUG1("decp: field_for_bot: ", mb->field_for_bot);
+							DPRINTF(DPRINTF_MB,"decp: field_for_bot: %i", mb->field_for_bot);
 						}
 					}
 				}
+				
+				if (mcsel) {
+					decoder_mbgmc(dec, mb, x, y, fcode, cbp, bs, quant,
+								rounding, reduced_resolution);
+					continue;
+
+				} else if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) {
 
-				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, bound);
@@ -680,10 +1023,7 @@
 					} else {
 						get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0],
 										  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 =
-							mb->mvs[0].y;
+						mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = mb->mvs[0];
 					}
 				} else if (mb->mode == MODE_INTER4V ) {
 
@@ -698,57 +1038,72 @@
 					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, bound);
+									intra_dc_threshold, bound, reduced_resolution);
 					continue;
 				}
 
-				decoder_mbinter(dec, mb, x, y, acpred_flag, cbp, bs, quant,
-								rounding);
-			} else				// not coded
+				decoder_mbinter(dec, mb, x, y, fcode, cbp, bs, quant,
+								rounding, reduced_resolution);
+
+			}
+			else if (gmc_warp)	/* a not coded S(GMC)-VOP macroblock */
+			{
+				mb->mode = MODE_NOT_CODED_GMC;
+
+				start_timer();
+
+				decoder_mbgmc(dec, mb, x, y, fcode, 0x00, bs, quant,
+								rounding, reduced_resolution);
+
+				stop_transfer_timer();
+
+				if(dec->out_frm && cp_mb > 0) {
+				  output_slice(&dec->cur, dec->edged_width,dec->width,dec->out_frm,st_mb,y,cp_mb);
+				  cp_mb = 0;
+				}
+				st_mb = x+1;
+			}
+			else	/* not coded P_VOP macroblock */
 			{
-				DEBUG2("P-frame MB at (X,Y)=",x,y);
 				mb->mode = MODE_NOT_CODED;
+
 				mb->mvs[0].x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = 0;
 				mb->mvs[0].y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = 0;
-
 				// copy macroblock directly from ref to cur
 
 				start_timer();
 
-				transfer8x8_copy(dec->cur.y + (16 * y) * dec->edged_width +
-								 (16 * x),
-								 dec->refn[0].y + (16 * y) * dec->edged_width +
-								 (16 * x), dec->edged_width);
-
-				transfer8x8_copy(dec->cur.y + (16 * y) * dec->edged_width +
-								 (16 * x + 8),
-								 dec->refn[0].y + (16 * y) * dec->edged_width +
-								 (16 * x + 8), dec->edged_width);
-
-				transfer8x8_copy(dec->cur.y + (16 * y + 8) * dec->edged_width +
-								 (16 * x),
-								 dec->refn[0].y + (16 * y +
-												   8) * dec->edged_width +
-								 (16 * x), dec->edged_width);
-
-				transfer8x8_copy(dec->cur.y + (16 * y + 8) * dec->edged_width +
-								 (16 * x + 8),
-								 dec->refn[0].y + (16 * y +
-												   8) * dec->edged_width +
-								 (16 * x + 8), dec->edged_width);
-
-				transfer8x8_copy(dec->cur.u + (8 * y) * dec->edged_width / 2 +
-								 (8 * x),
-								 dec->refn[0].u +
-								 (8 * y) * dec->edged_width / 2 + (8 * x),
-								 dec->edged_width / 2);
-
-				transfer8x8_copy(dec->cur.v + (8 * y) * dec->edged_width / 2 +
-								 (8 * x),
-								 dec->refn[0].v +
-								 (8 * y) * dec->edged_width / 2 + (8 * x),
-								 dec->edged_width / 2);
+				if (reduced_resolution)
+				{
+					transfer32x32_copy(dec->cur.y + (32*y)*dec->edged_width + (32*x),
+									 dec->refn[0].y + (32*y)*dec->edged_width + (32*x), 
+									 dec->edged_width);
+
+					transfer16x16_copy(dec->cur.u + (16*y)*dec->edged_width/2 + (16*x),
+									dec->refn[0].u + (16*y)*dec->edged_width/2 + (16*x),
+									dec->edged_width/2);
+
+					transfer16x16_copy(dec->cur.v + (16*y)*dec->edged_width/2 + (16*x),
+									 dec->refn[0].v + (16*y)*dec->edged_width/2 + (16*x),
+									 dec->edged_width/2);
+				}
+				else
+				{
+					transfer16x16_copy(dec->cur.y + (16*y)*dec->edged_width + (16*x),
+									 dec->refn[0].y + (16*y)*dec->edged_width + (16*x), 
+									 dec->edged_width);
+
+					transfer8x8_copy(dec->cur.u + (8*y)*dec->edged_width/2 + (8*x),
+									dec->refn[0].u + (8*y)*dec->edged_width/2 + (8*x),
+									dec->edged_width/2);
+
+					transfer8x8_copy(dec->cur.v + (8*y)*dec->edged_width/2 + (8*x),
+									 dec->refn[0].v + (8*y)*dec->edged_width/2 + (8*x),
+									 dec->edged_width/2);
+				}
+				
 				stop_transfer_timer();
+
 				if(dec->out_frm && cp_mb > 0) {
 				  output_slice(&dec->cur, dec->edged_width,dec->width,dec->out_frm,st_mb,y,cp_mb);
 				  cp_mb = 0;
@@ -840,35 +1195,49 @@
 		uv_dx = pMB->mvs[0].x;
 		uv_dy = pMB->mvs[0].y;
 
-		uv_dx = (uv_dx & 3) ? (uv_dx >> 1) | 1 : uv_dx / 2;
-		uv_dy = (uv_dy & 3) ? (uv_dy >> 1) | 1 : uv_dy / 2;
+		if (dec->quarterpel)
+		{
+			uv_dx /= 2;
+			uv_dy /= 2;
+		}
+
+		uv_dx = (uv_dx >> 1) + roundtab_79[uv_dx & 0x3];
+		uv_dy = (uv_dy >> 1) + roundtab_79[uv_dy & 0x3];
 	} else {
 		int sum;
 
-		sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x;
-		uv_dx =
-			(sum ==
-			 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] +
-								  (ABS(sum) / 16) * 2));
-
-		sum = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y;
-		uv_dy =
-			(sum ==
-			 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] +
-								  (ABS(sum) / 16) * 2));
+		if(dec->quarterpel)
+			sum = (pMB->mvs[0].x / 2) + (pMB->mvs[1].x / 2) + (pMB->mvs[2].x / 2) + (pMB->mvs[3].x / 2);
+		else
+			sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x;
+
+		uv_dx = (sum >> 3) + roundtab_76[sum & 0xf];
+
+		if(dec->quarterpel)
+			sum = (pMB->mvs[0].y / 2) + (pMB->mvs[1].y / 2) + (pMB->mvs[2].y / 2) + (pMB->mvs[3].y / 2);
+		else
+			sum = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y;
+
+		uv_dy = (sum >> 3) + roundtab_76[sum & 0xf];
 	}
 
 	start_timer();
-	interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16 * x_pos, 16 * y_pos,
-						  pMB->mvs[0].x, pMB->mvs[0].y, stride, 0);
-	interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16 * x_pos + 8,
-						  16 * y_pos, pMB->mvs[1].x, pMB->mvs[1].y, stride, 0);
-	interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16 * x_pos,
-						  16 * y_pos + 8, pMB->mvs[2].x, pMB->mvs[2].y, stride,
-						  0);
-	interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16 * x_pos + 8,
-						  16 * y_pos + 8, pMB->mvs[3].x, pMB->mvs[3].y, stride,
-						  0);
+	if(dec->quarterpel) {
+		interpolate16x16_quarterpel(dec->cur.y, dec->refn[ref].y, dec->qtmp.y, dec->qtmp.y + 64,
+ 								    dec->qtmp.y + 128, 16*x_pos, 16*y_pos,
+								    pMB->mvs[0].x, pMB->mvs[0].y, stride, 0);
+	}
+	else {
+		interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16*x_pos, 16*y_pos,
+							  pMB->mvs[0].x, pMB->mvs[0].y, stride, 0);
+		interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16*x_pos + 8, 16*y_pos,
+						      pMB->mvs[1].x, pMB->mvs[1].y, stride, 0);
+		interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16*x_pos, 16*y_pos + 8,
+							  pMB->mvs[2].x, pMB->mvs[2].y, stride, 0);
+		interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16*x_pos + 8, 16*y_pos + 8, 
+							  pMB->mvs[3].x, pMB->mvs[3].y, stride, 0);
+	}
+
 	interpolate8x8_switch(dec->cur.u, dec->refn[ref].u, 8 * x_pos, 8 * y_pos,
 						  uv_dx, uv_dy, stride2, 0);
 	interpolate8x8_switch(dec->cur.v, dec->refn[ref].v, 8 * x_pos, 8 * y_pos,
@@ -876,12 +1245,14 @@
 	stop_comp_timer();
 
 	for (i = 0; i < 6; i++) {
+		int direction = dec->alternate_vertical_scan ? 2 : 0;
+
 		if (cbp & (1 << (5 - i)))	// coded
 		{
 			memset(&block[i * 64], 0, 64 * sizeof(int16_t));	// clear
 
 			start_timer();
-			get_inter_block(bs, &block[i * 64]);
+			get_inter_block(bs, &block[i * 64], direction);
 			stop_coding_timer();
 
 			start_timer();
@@ -919,7 +1290,6 @@
 	stop_transfer_timer();
 }
 
-
 // add by MinChen <chenm001@163.com>
 // decode an B-frame direct &  inter macroblock
 void
@@ -954,100 +1324,176 @@
 		uv_dx = pMB->mvs[0].x;
 		uv_dy = pMB->mvs[0].y;
 
-		uv_dx = (uv_dx & 3) ? (uv_dx >> 1) | 1 : uv_dx / 2;
-		uv_dy = (uv_dy & 3) ? (uv_dy >> 1) | 1 : uv_dy / 2;
-
 		b_uv_dx = pMB->b_mvs[0].x;
 		b_uv_dy = pMB->b_mvs[0].y;
 
-		b_uv_dx = (uv_dx & 3) ? (uv_dx >> 1) | 1 : uv_dx / 2;
-		b_uv_dy = (uv_dy & 3) ? (uv_dy >> 1) | 1 : uv_dy / 2;
+		if (dec->quarterpel)
+		{
+			uv_dx /= 2;
+			uv_dy /= 2;
+
+			b_uv_dx /= 2;
+			b_uv_dy /= 2;
+		}
+
+		uv_dx = (uv_dx >> 1) + roundtab_79[uv_dx & 0x3];
+		uv_dy = (uv_dy >> 1) + roundtab_79[uv_dy & 0x3];
+
+		b_uv_dx = (b_uv_dx >> 1) + roundtab_79[b_uv_dx & 0x3];
+		b_uv_dy = (b_uv_dy >> 1) + roundtab_79[b_uv_dy & 0x3];
 	} else {
 		int sum;
 
-		sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x;
-		uv_dx =
-			(sum ==
-			 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] +
-								  (ABS(sum) / 16) * 2));
-
-		sum = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y;
-		uv_dy =
-			(sum ==
-			 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] +
-								  (ABS(sum) / 16) * 2));
-
-		sum =
-			pMB->b_mvs[0].x + pMB->b_mvs[1].x + pMB->b_mvs[2].x +
-			pMB->b_mvs[3].x;
-		b_uv_dx =
-			(sum ==
-			 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] +
-								  (ABS(sum) / 16) * 2));
-
-		sum =
-			pMB->b_mvs[0].y + pMB->b_mvs[1].y + pMB->b_mvs[2].y +
-			pMB->b_mvs[3].y;
-		b_uv_dy =
-			(sum ==
-			 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] +
-								  (ABS(sum) / 16) * 2));
+		if(dec->quarterpel)
+			sum = (pMB->mvs[0].x / 2) + (pMB->mvs[1].x / 2) + (pMB->mvs[2].x / 2) + (pMB->mvs[3].x / 2);
+		else
+			sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x;
+
+		uv_dx = (sum >> 3) + roundtab_76[sum & 0xf];
+
+		if(dec->quarterpel)
+			sum = (pMB->mvs[0].y / 2) + (pMB->mvs[1].y / 2) + (pMB->mvs[2].y / 2) + (pMB->mvs[3].y / 2);
+		else
+			sum = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y;
+
+		uv_dy = (sum >> 3) + roundtab_76[sum & 0xf];
+
+
+		if(dec->quarterpel)
+			sum = (pMB->b_mvs[0].x / 2) + (pMB->b_mvs[1].x / 2) + (pMB->b_mvs[2].x / 2) + (pMB->b_mvs[3].x / 2);
+		else
+			sum = pMB->b_mvs[0].x + pMB->b_mvs[1].x + pMB->b_mvs[2].x + pMB->b_mvs[3].x;
+
+		b_uv_dx = (sum >> 3) + roundtab_76[sum & 0xf];
+
+		if(dec->quarterpel)
+			sum = (pMB->b_mvs[0].y / 2) + (pMB->b_mvs[1].y / 2) + (pMB->b_mvs[2].y / 2) + (pMB->b_mvs[3].y / 2);
+		else
+			sum = pMB->b_mvs[0].y + pMB->b_mvs[1].y + pMB->b_mvs[2].y + pMB->b_mvs[3].y;
+
+		b_uv_dy = (sum >> 3) + roundtab_76[sum & 0xf];
 	}
 
 
 	start_timer();
-	interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos, 16 * y_pos,
-						  pMB->mvs[0].x, pMB->mvs[0].y, stride, 0);
-	interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos + 8, 16 * y_pos,
-						  pMB->mvs[1].x, pMB->mvs[1].y, stride, 0);
-	interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos, 16 * y_pos + 8,
-						  pMB->mvs[2].x, pMB->mvs[2].y, stride, 0);
-	interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos + 8,
-						  16 * y_pos + 8, pMB->mvs[3].x, pMB->mvs[3].y, stride,
-						  0);
+	if(dec->quarterpel) {
+		if((pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q))
+			interpolate16x16_quarterpel(dec->cur.y, forward.y, dec->qtmp.y, dec->qtmp.y + 64,
+ 									    dec->qtmp.y + 128, 16*x_pos, 16*y_pos,
+									    pMB->mvs[0].x, pMB->mvs[0].y, stride, 0);
+		else {
+			interpolate8x8_quarterpel(dec->cur.y, forward.y, dec->qtmp.y, dec->qtmp.y + 64,
+ 									    dec->qtmp.y + 128, 16*x_pos, 16*y_pos,
+									    pMB->mvs[0].x, pMB->mvs[0].y, stride, 0);
+			interpolate8x8_quarterpel(dec->cur.y, forward.y, dec->qtmp.y, dec->qtmp.y + 64,
+ 									    dec->qtmp.y + 128, 16*x_pos + 8, 16*y_pos,
+									    pMB->mvs[1].x, pMB->mvs[1].y, stride, 0);
+			interpolate8x8_quarterpel(dec->cur.y, forward.y, dec->qtmp.y, dec->qtmp.y + 64,
+ 									    dec->qtmp.y + 128, 16*x_pos, 16*y_pos + 8,
+									    pMB->mvs[2].x, pMB->mvs[2].y, stride, 0);
+			interpolate8x8_quarterpel(dec->cur.y, forward.y, dec->qtmp.y, dec->qtmp.y + 64,
+ 									    dec->qtmp.y + 128, 16*x_pos + 8, 16*y_pos + 8,
+									    pMB->mvs[3].x, pMB->mvs[3].y, stride, 0);
+		}
+	}
+	else {
+		interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos, 16 * y_pos,
+							  pMB->mvs[0].x, pMB->mvs[0].y, stride, 0);
+		interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos + 8, 16 * y_pos,
+							  pMB->mvs[1].x, pMB->mvs[1].y, stride, 0);
+		interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos, 16 * y_pos + 8,
+							  pMB->mvs[2].x, pMB->mvs[2].y, stride, 0);
+		interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos + 8,
+							  16 * y_pos + 8, pMB->mvs[3].x, pMB->mvs[3].y, stride,
+							  0);
+	}
+
 	interpolate8x8_switch(dec->cur.u, forward.u, 8 * x_pos, 8 * y_pos, uv_dx,
 						  uv_dy, stride2, 0);
 	interpolate8x8_switch(dec->cur.v, forward.v, 8 * x_pos, 8 * y_pos, uv_dx,
 						  uv_dy, stride2, 0);
 
 
-	interpolate8x8_switch(dec->refn[2].y, backward.y, 16 * x_pos, 16 * y_pos,
-						  pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0);
-	interpolate8x8_switch(dec->refn[2].y, backward.y, 16 * x_pos + 8,
-						  16 * y_pos, pMB->b_mvs[1].x, pMB->b_mvs[1].y, stride,
-						  0);
-	interpolate8x8_switch(dec->refn[2].y, backward.y, 16 * x_pos,
-						  16 * y_pos + 8, pMB->b_mvs[2].x, pMB->b_mvs[2].y,
-						  stride, 0);
-	interpolate8x8_switch(dec->refn[2].y, backward.y, 16 * x_pos + 8,
-						  16 * y_pos + 8, pMB->b_mvs[3].x, pMB->b_mvs[3].y,
-						  stride, 0);
-	interpolate8x8_switch(dec->refn[2].u, backward.u, 8 * x_pos, 8 * y_pos,
+	if(dec->quarterpel) {
+		if((pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q))
+			interpolate16x16_quarterpel(dec->tmp.y, backward.y, dec->qtmp.y, dec->qtmp.y + 64,
+ 									    dec->qtmp.y + 128, 16*x_pos, 16*y_pos,
+									    pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0);
+		else {
+			interpolate8x8_quarterpel(dec->tmp.y, backward.y, dec->qtmp.y, dec->qtmp.y + 64,
+ 									    dec->qtmp.y + 128, 16*x_pos, 16*y_pos,
+									    pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0);
+			interpolate8x8_quarterpel(dec->tmp.y, backward.y, dec->qtmp.y, dec->qtmp.y + 64,
+ 									    dec->qtmp.y + 128, 16*x_pos + 8, 16*y_pos,
+									    pMB->b_mvs[1].x, pMB->b_mvs[1].y, stride, 0);
+			interpolate8x8_quarterpel(dec->tmp.y, backward.y, dec->qtmp.y, dec->qtmp.y + 64,
+ 									    dec->qtmp.y + 128, 16*x_pos, 16*y_pos + 8,
+									    pMB->b_mvs[2].x, pMB->b_mvs[2].y, stride, 0);
+			interpolate8x8_quarterpel(dec->tmp.y, backward.y, dec->qtmp.y, dec->qtmp.y + 64,
+ 									    dec->qtmp.y + 128, 16*x_pos + 8, 16*y_pos + 8,
+									    pMB->b_mvs[3].x, pMB->b_mvs[3].y, stride, 0);
+		}
+	}
+	else {
+		interpolate8x8_switch(dec->tmp.y, backward.y, 16 * x_pos, 16 * y_pos,
+							  pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0);
+		interpolate8x8_switch(dec->tmp.y, backward.y, 16 * x_pos + 8,
+							  16 * y_pos, pMB->b_mvs[1].x, pMB->b_mvs[1].y, stride,
+							  0);
+		interpolate8x8_switch(dec->tmp.y, backward.y, 16 * x_pos,
+							  16 * y_pos + 8, pMB->b_mvs[2].x, pMB->b_mvs[2].y,
+							  stride, 0);
+		interpolate8x8_switch(dec->tmp.y, backward.y, 16 * x_pos + 8,
+							  16 * y_pos + 8, pMB->b_mvs[3].x, pMB->b_mvs[3].y,
+							  stride, 0);
+	}
+
+	interpolate8x8_switch(dec->tmp.u, backward.u, 8 * x_pos, 8 * y_pos,
 						  b_uv_dx, b_uv_dy, stride2, 0);
-	interpolate8x8_switch(dec->refn[2].v, backward.v, 8 * x_pos, 8 * y_pos,
+	interpolate8x8_switch(dec->tmp.v, backward.v, 8 * x_pos, 8 * y_pos,
 						  b_uv_dx, b_uv_dy, stride2, 0);
 
-	interpolate8x8_c(dec->cur.y, dec->refn[2].y, 16 * x_pos, 16 * y_pos,
-					 stride);
-	interpolate8x8_c(dec->cur.y, dec->refn[2].y, 16 * x_pos + 8, 16 * y_pos,
-					 stride);
-	interpolate8x8_c(dec->cur.y, dec->refn[2].y, 16 * x_pos, 16 * y_pos + 8,
-					 stride);
-	interpolate8x8_c(dec->cur.y, dec->refn[2].y, 16 * x_pos + 8,
-					 16 * y_pos + 8, stride);
-	interpolate8x8_c(dec->cur.u, dec->refn[2].u, 8 * x_pos, 8 * y_pos,
-					 stride2);
-	interpolate8x8_c(dec->cur.v, dec->refn[2].v, 8 * x_pos, 8 * y_pos,
-					 stride2);
+	interpolate8x8_avg2(dec->cur.y + (16 * y_pos * stride) + 16 * x_pos,
+						dec->cur.y + (16 * y_pos * stride) + 16 * x_pos,
+						dec->tmp.y + (16 * y_pos * stride) + 16 * x_pos,
+						stride, 1, 8);
+
+	interpolate8x8_avg2(dec->cur.y + (16 * y_pos * stride) + 16 * x_pos + 8,
+						dec->cur.y + (16 * y_pos * stride) + 16 * x_pos + 8,
+						dec->tmp.y + (16 * y_pos * stride) + 16 * x_pos + 8,
+						stride, 1, 8);
+
+	interpolate8x8_avg2(dec->cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos,
+						dec->cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos,
+						dec->tmp.y + ((16 * y_pos + 8) * stride) + 16 * x_pos,
+						stride, 1, 8);
+
+	interpolate8x8_avg2(dec->cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos + 8,
+						dec->cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos + 8,
+						dec->tmp.y + ((16 * y_pos + 8) * stride) + 16 * x_pos + 8,
+						stride, 1, 8);
+
+	interpolate8x8_avg2(dec->cur.u + (8 * y_pos * stride2) + 8 * x_pos,
+						dec->cur.u + (8 * y_pos * stride2) + 8 * x_pos,
+						dec->tmp.u + (8 * y_pos * stride2) + 8 * x_pos,
+						stride2, 1, 8);
+
+	interpolate8x8_avg2(dec->cur.v + (8 * y_pos * stride2) + 8 * x_pos,
+						dec->cur.v + (8 * y_pos * stride2) + 8 * x_pos,
+						dec->tmp.v + (8 * y_pos * stride2) + 8 * x_pos,
+						stride2, 1, 8);
+
 	stop_comp_timer();
 
 	for (i = 0; i < 6; i++) {
+		int direction = dec->alternate_vertical_scan ? 2 : 0;
+
 		if (cbp & (1 << (5 - i)))	// coded
 		{
 			memset(&block[i * 64], 0, 64 * sizeof(int16_t));	// clear
 
 			start_timer();
-			get_inter_block(bs, &block[i * 64]);
+			get_inter_block(bs, &block[i * 64], direction);
 			stop_coding_timer();
 
 			start_timer();
@@ -1142,9 +1588,9 @@
 
 	start_timer();
 	image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height,
-				   dec->width, dec->height, dec->interlacing);
+				   dec->width, dec->height);
 	image_setedges(&dec->refn[1], dec->edged_width, dec->edged_height,
-				   dec->width, dec->height, dec->interlacing);
+				   dec->width, dec->height);
 	stop_edges_timer();
 
 #ifdef BFRAMES_DEC_DEBUG
@@ -1164,7 +1610,9 @@
 			mb->b_mvs[0] = mb->b_mvs[1] = mb->b_mvs[2] = mb->b_mvs[3] =
 			mb->mvs[0] = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = zeromv;
 
-			// the last P_VOP is skip macroblock ?
+			// skip if the co-located P_VOP macroblock is not coded 
+			// if not codec in co-located S_VOP macroblock is _not_ automatically skipped
+
 			if (last_mb->mode == MODE_NOT_CODED) {
 				//DEBUG2("Skip MB in B-frame at (X,Y)=!",x,y);
 				mb->cbp = 0;
@@ -1278,7 +1726,7 @@
 				break;
 
 			default:
-				DEBUG1("Not support B-frame mb_type =", mb->mb_type);
+				DPRINTF(DPRINTF_ERROR,"Not support B-frame mb_type = %i", mb->mb_type);
 			}
 
 		}						// end of FOR
@@ -1303,121 +1751,263 @@
 	*mb2 = temp;
 }
 
+
+/* perform post processing if necessary, and output the image */
+void decoder_output(DECODER * dec, IMAGE * img, MACROBLOCK * mbs, 
+					const XVID_DEC_FRAME * frame, int pp_disable)
+{
+
+	if ((frame->general & (XVID_DEC_DEBLOCKY|XVID_DEC_DEBLOCKUV)) && !pp_disable)	/* post process */
+	{
+		/* note: image is stored to tmp */
+		image_copy(&dec->tmp, img, dec->edged_width, dec->height);
+		image_deblock_rrv(&dec->tmp, dec->edged_width, 
+						mbs, dec->mb_width, dec->mb_height, dec->mb_width,
+						8, frame->general);
+		img = &dec->tmp;
+	}
+
+	image_output(img, dec->width, dec->height,
+				 dec->edged_width, frame->image, frame->stride,
+				 frame->colorspace, dec->interlacing);
+}
+
+
 int
 decoder_decode(DECODER * dec,
-			   XVID_DEC_FRAME * frame)
+			   XVID_DEC_FRAME * frame, XVID_DEC_STATS * stats)
 {
 
 	Bitstream bs;
 	uint32_t rounding;
+	uint32_t reduced_resolution;
 	uint32_t quant;
 	uint32_t fcode_forward;
 	uint32_t fcode_backward;
 	uint32_t intra_dc_threshold;
+	WARPPOINTS gmc_warp;
 	uint32_t vop_type;
+	int success = 0;
+	int output = 0;
+	int seen_something = 0;
 
 	start_global_timer();
 
+	dec->low_delay_default = (frame->general & XVID_DEC_LOWDELAY);
 	dec->out_frm = (frame->colorspace == XVID_CSP_EXTERN) ? frame->image : NULL;
 
+	if ((frame->general & XVID_DEC_DISCONTINUITY))
+		dec->frames = 0;
+
+	if (frame->length < 0)	/* decoder flush */
+	{
+		/* if  not decoding "low_delay/packed", and this isn't low_delay and
+		    we have a reference frame, then outout the reference frame */
+		if (!(dec->low_delay_default && dec->packed_mode) && !dec->low_delay && dec->frames>0)
+		{
+			decoder_output(dec, &dec->refn[0], dec->mbs, frame, dec->last_reduced_resolution);
+			output = 1;
+		}
+
+		frame->length = 0;
+		if (stats)
+		{
+			stats->notify = output ? XVID_DEC_VOP : XVID_DEC_NOTHING;
+			stats->data.vop.time_base = (int)dec->time_base;
+			stats->data.vop.time_increment = 0;	//XXX: todo
+		}
+
+		emms();
+
+		stop_global_timer();
+		return XVID_ERR_OK;
+	}
+
 	BitstreamInit(&bs, frame->bitstream, frame->length);
 
-	// add by chenm001 <chenm001@163.com>
-	// for support B-frame to reference last 2 frame
-	dec->frames++;
-	vop_type =
-		BitstreamReadHeaders(&bs, dec, &rounding, &quant, &fcode_forward,
-							 &fcode_backward, &intra_dc_threshold);
+	// XXX: 0x7f is only valid whilst decoding vfw xvid/divx5 avi's
+	if(dec->low_delay_default && frame->length == 1 && BitstreamShowBits(&bs, 8) == 0x7f)
+	{
+		if (stats)
+			stats->notify = XVID_DEC_VOP;
+		frame->length = 1;
+		image_output(&dec->refn[0], dec->width, dec->height, dec->edged_width,
+					 frame->image, frame->stride, frame->colorspace, dec->interlacing);
+		emms();
+		return XVID_ERR_OK;
+	}
+
+repeat:
+
+	vop_type =	BitstreamReadHeaders(&bs, dec, &rounding, &reduced_resolution, 
+			&quant, &fcode_forward, &fcode_backward, &intra_dc_threshold, &gmc_warp);
+
+	DPRINTF(DPRINTF_HEADER, "vop_type=%i,  packed=%i,  time=%lli,  time_pp=%i,  time_bp=%i", 
+							vop_type,	dec->packed_mode, dec->time, dec->time_pp, dec->time_bp);
+
+	if (vop_type == - 1)
+	{
+		if (success) goto done;
+		emms();
+		return XVID_ERR_FAIL;
+	}
+
+	if (vop_type == -2 || vop_type == -3)
+	{
+		if (vop_type == -3)
+			decoder_resize(dec);
+			
+		if (stats)
+		{
+			stats->notify = XVID_DEC_VOL;
+			stats->data.vol.general = 0;
+			if (dec->interlacing)
+				stats->data.vol.general |= XVID_INTERLACING;
+			stats->data.vol.width = dec->width;
+			stats->data.vol.height = dec->height;
+			stats->data.vol.aspect_ratio = dec->aspect_ratio;
+			stats->data.vol.par_width = dec->par_width;
+			stats->data.vol.par_height = dec->par_height;
+			frame->length = BitstreamPos(&bs) / 8;
+			emms();
+			return XVID_ERR_OK;
+		}
+		goto repeat;
+	} 
 
 	dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0;	// init pred vector to 0
 
-	switch (vop_type) {
-	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;
+	/* packed_mode: special-N_VOP treament */
+	if (dec->packed_mode && vop_type == N_VOP)
+	{
+		if (dec->low_delay_default && dec->frames > 0)
+		{
+			decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, dec->last_reduced_resolution);
+			output = 1;
+		}
+		/* ignore otherwise */
+	}
+	else if (vop_type != B_VOP)
+	{
+		switch(vop_type)
+		{
+		case I_VOP :
+			decoder_iframe(dec, &bs, reduced_resolution, quant, intra_dc_threshold);
+			break;
+		case P_VOP :
+			decoder_pframe(dec, &bs, rounding, reduced_resolution, quant, 
+						fcode_forward, intra_dc_threshold, NULL);
+			break;
+		case S_VOP :
+			decoder_pframe(dec, &bs, rounding, reduced_resolution, quant, 
+						fcode_forward, intra_dc_threshold, &gmc_warp);
+			break;
+		case N_VOP :
+			image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height);
+			break;
+		}
 
-	case B_VOP:
-#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!");
+		if (reduced_resolution)
+		{
+			image_deblock_rrv(&dec->cur, dec->edged_width, dec->mbs,
+				(dec->width + 31) / 32, (dec->height + 31) / 32, dec->mb_width,
+				16, XVID_DEC_DEBLOCKY|XVID_DEC_DEBLOCKUV);
 		}
-#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;
+		/* note: for packed_mode, output is performed when the special-N_VOP is decoded */
+		if (!(dec->low_delay_default && dec->packed_mode))
+		{
+			if (dec->low_delay)
+			{
+				decoder_output(dec, &dec->cur, dec->mbs, frame, reduced_resolution);
+				output = 1;
+			}
+			else if (dec->frames > 0)	/* is the reference frame valid? */
+			{
+				/* output the reference frame */
+				decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, dec->last_reduced_resolution);
+				output = 1;
+			}
+		}
 
-	default:
-		return XVID_ERR_FAIL;
+		image_swap(&dec->refn[0], &dec->refn[1]);
+		image_swap(&dec->cur, &dec->refn[0]);
+		mb_swap(&dec->mbs, &dec->last_mbs);
+		dec->last_reduced_resolution = reduced_resolution;
+
+		dec->frames++;
+		seen_something = 1;
+
+	}else{	/* B_VOP */
+
+		if (dec->low_delay)
+		{
+			DPRINTF(DPRINTF_ERROR, "warning: bvop found in low_delay==1 stream");
+			dec->low_delay = 1;
+		}
+
+		if (dec->frames < 2)
+		{
+			/* attemping to decode a bvop without atleast 2 reference frames */
+			image_printf(&dec->cur, dec->edged_width, dec->height, 16, 16,
+						"broken b-frame, mising ref frames");
+		}else if (dec->time_pp <= dec->time_bp) {
+			/* this occurs when dx50_bvop_compatibility==0 sequences are 
+			decoded in vfw. */
+			image_printf(&dec->cur, dec->edged_width, dec->height, 16, 16,
+						"broken b-frame, tpp=%i tbp=%i", dec->time_pp, dec->time_bp);
+		}else{
+			decoder_bframe(dec, &bs, quant, fcode_forward, fcode_backward);
+		}
+
+		decoder_output(dec, &dec->cur, dec->mbs, frame, reduced_resolution);
+		output = 1;
+		dec->frames++;
 	}
 
-#ifdef BFRAMES_DEC_DEBUG
-	if (frame->length != BitstreamPos(&bs) / 8){
-		DEBUG2("InLen/UseLen",frame->length, BitstreamPos(&bs) / 8);
+	BitstreamByteAlign(&bs);
+
+	/* low_delay_default mode: repeat in packed_mode */
+	if (dec->low_delay_default && dec->packed_mode && output == 0 && success == 0)
+	{
+		success = 1;
+		goto repeat;
 	}
-#endif
-	frame->length = BitstreamPos(&bs) / 8;
 
+done :
 
-#ifdef BFRAMES_DEC
-	// test if no B_VOP
-        if (dec->low_delay || dec->frames == 0) {
-#endif
-	image_output(&dec->cur, dec->width, dec->height, dec->edged_width,
-					 frame->image, frame->stride, frame->colorspace);
+	/* low_delay_default mode: if we've gotten here without outputting anything,
+	   then output the recently decoded frame, or print an error message  */
+	if (dec->low_delay_default && output == 0)
+	{
+		if (dec->packed_mode && seen_something)
+		{
+			/* output the recently decoded frame */
+			decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, dec->last_reduced_resolution);
+			output = 1;
+		}
+		else
+		{
+			image_clear(&dec->cur, dec->width, dec->height, dec->edged_width, 0, 128, 128);
+			image_printf(&dec->cur, dec->edged_width, dec->height, 16, 16,
+				"warning: nothing to output");
+			image_printf(&dec->cur, dec->edged_width, dec->height, 16, 64,
+				"bframe decoder lag");
 
-#ifdef BFRAMES_DEC
-	} else {
-                if (dec->frames >= 1) {
-			start_timer();
-			if ((vop_type == I_VOP || vop_type == P_VOP)) {
-				image_output(&dec->refn[0], dec->width, dec->height,
-							 dec->edged_width, frame->image, frame->stride,
-							 frame->colorspace);
-			} else if (vop_type == B_VOP) {
-				image_output(&dec->cur, dec->width, dec->height,
-							 dec->edged_width, frame->image, frame->stride,
-							 frame->colorspace);
-			}
-			stop_conv_timer();
+			decoder_output(dec, &dec->cur, NULL, frame, 1 /*disable pp*/);	
 		}
 	}
-#endif
 
-	if (vop_type == I_VOP || vop_type == P_VOP) {
-		image_swap(&dec->refn[0], &dec->refn[1]);
-		image_swap(&dec->cur, &dec->refn[0]);
+	frame->length = BitstreamPos(&bs) / 8;
 
-		// swap MACROBLOCK
-                // the Divx will not set the low_delay flage some times
-                // so follow code will wrong to not swap at that time
-                // this will broken bitstream! so I'm change it,
-                // But that is not the best way! can anyone tell me how
-                // to do another way?
-                // 18-07-2002   MinChen<chenm001@163.com>
-                //if (!dec->low_delay && vop_type == P_VOP)
-                if (vop_type == P_VOP)
-			mb_swap(&dec->mbs, &dec->last_mbs);
+	if (stats)
+	{
+		stats->notify = output ? XVID_DEC_VOP : XVID_DEC_NOTHING;
+		stats->data.vop.time_base = (int)dec->time_base;
+		stats->data.vop.time_increment = 0;	//XXX: todo
 	}
-
+	
 	emms();
 
 	stop_global_timer();