--- decoder.c	2003/12/13 13:52:25	1.49.2.25
+++ decoder.c	2004/02/03 02:56:57	1.49.2.31
@@ -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.49.2.25 2003/12/13 13:52:25 syskin Exp $
+ * $Id: decoder.c,v 1.49.2.31 2004/02/03 02:56:57 syskin Exp $
  *
  ****************************************************************************/
 
@@ -205,6 +205,7 @@
 	dec->last_mbs = NULL;
 
 	init_timer();
+	init_postproc(&dec->postproc);
 	init_mpeg_matrix(dec->mpeg_quant_matrices);
 
 	/* For B-frame support (used to save reference frame's time */
@@ -850,12 +851,12 @@
 				mb->quant = quant;
 
 				if (dec->interlacing) {
-					if ((cbp || intra) && !mcsel) {
+					if (cbp || intra) {
 						mb->field_dct = BitstreamGetBit(bs);
 						DPRINTF(XVID_DEBUG_MB,"decp: field_dct: %i\n", mb->field_dct);
 					}
 
-					if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) {
+					if ((mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) && !mcsel) {
 						mb->field_pred = BitstreamGetBit(bs);
 						DPRINTF(XVID_DEBUG_MB, "decp: field_pred: %i\n", mb->field_pred);
 
@@ -899,6 +900,7 @@
 
 			} else if (gmc_warp) {	/* a not coded S(GMC)-VOP macroblock */
 				mb->mode = MODE_NOT_CODED_GMC;
+				mb->quant = quant;
 				decoder_mbgmc(dec, mb, x, y, fcode, 0x00, bs, rounding);
 
 				if(dec->out_frm && cp_mb > 0) {
@@ -908,6 +910,7 @@
 				st_mb = x+1;
 			} else {	/* not coded P_VOP macroblock */
 				mb->mode = MODE_NOT_CODED;
+				mb->quant = quant;
 
 				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;
@@ -1315,15 +1318,19 @@
 
 /* perform post processing if necessary, and output the image */
 void decoder_output(DECODER * dec, IMAGE * img, MACROBLOCK * mbs,
-					xvid_dec_frame_t * frame, xvid_dec_stats_t * stats, int coding_type)
+					xvid_dec_frame_t * frame, xvid_dec_stats_t * stats,
+					int coding_type, int quant)
 {
-	if (frame->general & (XVID_DEBLOCKY|XVID_DEBLOCKUV) && mbs != NULL)	/* post process */
+	if (dec->cartoon_mode)
+		frame->general &= ~XVID_FILMEFFECT;
+
+	if (frame->general & (XVID_DEBLOCKY|XVID_DEBLOCKUV|XVID_FILMEFFECT) && mbs != NULL)	/* post process */
 	{
 		/* note: image is stored to tmp */
 		image_copy(&dec->tmp, img, dec->edged_width, dec->height);
-		image_deblock(&dec->tmp, dec->edged_width, 
-					  mbs, dec->mb_width, dec->mb_height, dec->mb_width,
-					  frame->general);
+		image_postproc(&dec->postproc, &dec->tmp, dec->edged_width, 
+					   mbs, dec->mb_width, dec->mb_height, dec->mb_width,
+					   frame->general, dec->frames, (coding_type == B_VOP));
 		img = &dec->tmp;
 	}
 
@@ -1370,7 +1377,7 @@
 		/* 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->last_mbs, frame, stats, dec->last_coding_type);
+			decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, stats, dec->last_coding_type, quant);
 			dec->frames = 0;
 			ret = 0;
 		} else {
@@ -1440,7 +1447,7 @@
 	/* packed_mode: special-N_VOP treament */
 	if (dec->packed_mode && coding_type == N_VOP) {
 		if (dec->low_delay_default && dec->frames > 0) {
-			decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, stats, dec->last_coding_type);
+			decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, stats, dec->last_coding_type, quant);
 			output = 1;
 		}
 		/* ignore otherwise */
@@ -1474,11 +1481,11 @@
 		/* 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, stats, coding_type);
+				decoder_output(dec, &dec->cur, dec->mbs, frame, stats, coding_type, quant);
 				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, stats, dec->last_coding_type);
+				decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, stats, dec->last_coding_type, quant);
 				output = 1;
 			}
 		}
@@ -1503,16 +1510,16 @@
 			/* 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");
-			stats->type = XVID_TYPE_NOTHING;
+			if (stats) stats->type = XVID_TYPE_NOTHING;
 		} 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);
-			stats->type = XVID_TYPE_NOTHING;
+			if (stats) stats->type = XVID_TYPE_NOTHING;
 		} else {
 			decoder_bframe(dec, &bs, quant, fcode_forward, fcode_backward);
-			decoder_output(dec, &dec->cur, dec->mbs, frame, stats, coding_type);
+			decoder_output(dec, &dec->cur, dec->mbs, frame, stats, coding_type, quant);
 		}
 
 		output = 1;
@@ -1534,7 +1541,7 @@
 	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, stats, dec->last_coding_type);
+			decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, stats, dec->last_coding_type, quant);
 		} 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,
@@ -1542,7 +1549,7 @@
 			image_printf(&dec->cur, dec->edged_width, dec->height, 16, 64,
 				"bframe decoder lag");
 
-			decoder_output(dec, &dec->cur, NULL, frame, stats, P_VOP);
+			decoder_output(dec, &dec->cur, NULL, frame, stats, P_VOP, quant);
 			if (stats) stats->type = XVID_TYPE_NOTHING;
 		}
 	}