--- decoder.c	2003/11/13 22:35:30	1.49.2.19
+++ decoder.c	2003/12/09 14:31:40	1.49.2.21
@@ -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.19 2003/11/13 22:35:30 edgomez Exp $
+ * $Id: decoder.c,v 1.49.2.21 2003/12/09 14:31:40 syskin Exp $
  *
  ****************************************************************************/
 
@@ -41,6 +41,7 @@
 #include "bitstream/mbcoding.h"
 
 #include "quant/quant.h"
+#include "quant/quant_matrix.h"
 #include "dct/idct.h"
 #include "dct/fdct.h"
 #include "utils/mem_transfer.h"
@@ -175,8 +176,15 @@
 	if (dec == NULL) {
 		return XVID_ERR_MEMORY;
 	}
+
 	memset(dec, 0, sizeof(DECODER));
 
+	dec->mpeg_quant_matrices = xvid_malloc(sizeof(uint16_t) * 64 * 8, CACHE_LINE);
+	if (dec->mpeg_quant_matrices == NULL) {
+		xvid_free(dec);
+		return XVID_ERR_MEMORY;
+	}
+
 	create->handle = dec;
 
 	dec->width = create->width;
@@ -196,6 +204,7 @@
 	dec->last_mbs = NULL;
 
 	init_timer();
+	init_mpeg_matrix(dec->mpeg_quant_matrices);
 
 	/* For B-frame support (used to save reference frame's time */
 	dec->frames = 0;
@@ -226,6 +235,7 @@
 	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->mpeg_quant_matrices);
 	xvid_free(dec);
 
 	write_timer();
@@ -321,9 +331,9 @@
 
 		start_timer();
 		if (dec->quant_type == 0) {
-			dequant_h263_intra(&data[i * 64], &block[i * 64], iQuant, iDcScaler);
+			dequant_h263_intra(&data[i * 64], &block[i * 64], iQuant, iDcScaler, dec->mpeg_quant_matrices);
 		} else {
-			dequant_mpeg_intra(&data[i * 64], &block[i * 64], iQuant, iDcScaler);
+			dequant_mpeg_intra(&data[i * 64], &block[i * 64], iQuant, iDcScaler, dec->mpeg_quant_matrices);
 		}
 		stop_iquant_timer();
 
@@ -392,7 +402,7 @@
 			stop_coding_timer();
 
 			start_timer();
-			dequant(&data[i * 64], block, iQuant);
+			dequant(&data[i * 64], block, iQuant, dec->mpeg_quant_matrices);
 			stop_iquant_timer();
 
 			start_timer();
@@ -1481,16 +1491,18 @@
 			/* 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;
 		} 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;
 		} 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);
 		output = 1;
 		dec->frames++;
 	}