--- decoder.c	2002/07/24 00:49:04	1.34
+++ decoder.c	2002/09/26 01:54:54	1.37.2.1
@@ -55,7 +55,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.34 2002/07/24 00:49:04 Isibaar Exp $
+ *  $Id: decoder.c,v 1.37.2.1 2002/09/26 01:54:54 h Exp $
  *
  *************************************************************************/
 
@@ -268,8 +268,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();
 
@@ -407,12 +409,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();
@@ -585,7 +589,7 @@
 
 	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();
 
 	bound = 0;
@@ -653,8 +657,10 @@
 				mb->quant = quant;
 
 				if (dec->interlacing) {
-					mb->field_dct = BitstreamGetBit(bs);
-					DEBUG1("decp: field_dct: ", mb->field_dct);
+					if (cbp || intra) {
+						mb->field_dct = BitstreamGetBit(bs);
+						DEBUG1("decp: field_dct: ", mb->field_dct);
+					}
 
 					if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) {
 						mb->field_pred = BitstreamGetBit(bs);
@@ -683,8 +689,8 @@
 						mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y =
 							mb->mvs[0].y;
 					}
-				} else if (mb->mode ==
-						   MODE_INTER4V /* || mb->mode == MODE_INTER4V_Q */ ) {
+				} else if (mb->mode == MODE_INTER4V ) {
+
 					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);
@@ -704,7 +710,7 @@
 								rounding);
 			} else				// not coded
 			{
-				//DEBUG2("P-frame MB at (X,Y)=",x,y);
+				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;
@@ -874,12 +880,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();
@@ -1040,12 +1048,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();
@@ -1140,9 +1150,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
@@ -1277,17 +1287,8 @@
 
 			default:
 				DEBUG1("Not support B-frame mb_type =", mb->mb_type);
-				;
 			}
 
-			if ( (x==19) && (y==8) ) 
-			{
-				fprintf(stderr,"D %d   %d    %d %d   %d %d  \n",0, mb->mb_type, 
-						mb->mvs[0].x, mb->mvs[0].y,mb->b_mvs[0].x, mb->b_mvs[0].y );
-			}
-
-
-
 		}						// end of FOR
 	}
 #ifdef BFRAMES_DEC_DEBUG
@@ -1386,14 +1387,14 @@
 
 #ifdef BFRAMES_DEC
 	// test if no B_VOP
-	if (dec->low_delay) {
+        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);
 
 #ifdef BFRAMES_DEC
 	} else {
-		if (dec->frames >= 0) {
+                if (dec->frames >= 1) {
 			start_timer();
 			if ((vop_type == I_VOP || vop_type == P_VOP)) {
 				image_output(&dec->refn[0], dec->width, dec->height,