--- decoder.c	2002/09/04 03:23:23	1.37
+++ decoder.c	2002/09/25 23:37:08	1.41
@@ -53,9 +53,9 @@
  *  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@cs.rmit.edu.au>
+ *  01.12.2001  inital version; (c)2001 peter ross <pross@xvid.org>
  *
- *  $Id: decoder.c,v 1.37 2002/09/04 03:23:23 h Exp $
+ *  $Id: decoder.c,v 1.41 2002/09/25 23:37:08 h Exp $
  *
  *************************************************************************/
 
@@ -379,7 +379,7 @@
 
 	start_timer();
 	if(dec->quarterpel) {
-		DEBUG("QUARTERPEL");
+		DPRINTF(DPRINTF_DEBUG, "QUARTERPEL\n");
 		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,
@@ -509,7 +509,7 @@
 
 			if (dec->interlacing) {
 				mb->field_dct = BitstreamGetBit(bs);
-				DEBUG1("deci: field_dct: ", mb->field_dct);
+				DPRINTF(DPRINTF_DEBUG, "deci: field_dct: %d", mb->field_dct);
 			}
 
 			decoder_mbintra(dec, mb, x, y, acpred_flag, cbp, bs, quant,
@@ -585,7 +585,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;
@@ -655,18 +655,18 @@
 				if (dec->interlacing) {
 					if (cbp || intra) {
 						mb->field_dct = BitstreamGetBit(bs);
-						DEBUG1("decp: field_dct: ", mb->field_dct);
+						DPRINTF(DPRINTF_DEBUG, "decp: field_dct: %d", 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_DEBUG, "decp: field_pred: %d", mb->field_pred);
 
 						if (mb->field_pred) {
 							mb->field_for_top = BitstreamGetBit(bs);
-							DEBUG1("decp: field_for_top: ", mb->field_for_top);
+							DPRINTF(DPRINTF_DEBUG, "decp: field_for_top: %d", mb->field_for_top);
 							mb->field_for_bot = BitstreamGetBit(bs);
-							DEBUG1("decp: field_for_bot: ", mb->field_for_bot);
+							DPRINTF(DPRINTF_DEBUG, "decp: field_for_bot: %d", mb->field_for_bot);
 						}
 					}
 				}
@@ -706,7 +706,8 @@
 								rounding);
 			} else				// not coded
 			{
-				DEBUG2("P-frame MB at (X,Y)=",x,y);
+				DPRINTF(DPRINTF_DEBUG, "P-frame MB at (X,Y)=(%d,%d)", 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;
@@ -1142,9 +1143,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
@@ -1278,7 +1279,7 @@
 				break;
 
 			default:
-				DEBUG1("Not support B-frame mb_type =", mb->mb_type);
+				DPRINTF(DPRINTF_ERROR, "Not support B-frame mb_type = %d", mb->mb_type);
 			}
 
 		}						// end of FOR
@@ -1336,24 +1337,24 @@
 		decoder_pframe(dec, &bs, rounding, quant, fcode_forward,
 					   intra_dc_threshold);
 #ifdef BFRAMES_DEC
-		DEBUG1("P_VOP  Time=", dec->time);
+		DPRINTF(DPRINTF_DEBUG, "P_VOP  Time=%d", dec->time);
 #endif
 		break;
 
 	case I_VOP:
 		decoder_iframe(dec, &bs, quant, intra_dc_threshold);
 #ifdef BFRAMES_DEC
-		DEBUG1("I_VOP  Time=", dec->time);
+		DPRINTF(DPRINTF_DEBUG, "I_VOP  Time=%d", dec->time);
 #endif
 		break;
 
 	case B_VOP:
 #ifdef BFRAMES_DEC
 		if (dec->time_pp > dec->time_bp) {
-			DEBUG1("B_VOP  Time=", dec->time);
+			DPRINTF(DPRINTF_DEBUG, "B_VOP  Time=%d", dec->time);
 			decoder_bframe(dec, &bs, quant, fcode_forward, fcode_backward);
 		} else {
-			DEBUG("broken B-frame!");
+			DPRINTF(DPRINTF_DEBUG, "Broken B_VOP");
 		}
 #else
 		image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height);
@@ -1371,7 +1372,7 @@
 
 #ifdef BFRAMES_DEC_DEBUG
 	if (frame->length != BitstreamPos(&bs) / 8){
-		DEBUG2("InLen/UseLen",frame->length, BitstreamPos(&bs) / 8);
+		DPRINTF(DPRINTF_DEBUG, "InLen: %d / UseLen: %d", frame->length, BitstreamPos(&bs) / 8);
 	}
 #endif
 	frame->length = BitstreamPos(&bs) / 8;