--- decoder.h	2002/12/12 10:37:44	1.10.2.4
+++ decoder.h	2003/06/09 17:05:51	1.14
@@ -33,7 +33,7 @@
  *
  *  - 13.06.2002 Added legal header - Cosmetic
  *
- *  $Id: decoder.h,v 1.10.2.4 2002/12/12 10:37:44 suxen_drol Exp $
+ *  $Id: decoder.h,v 1.14 2003/06/09 17:05:51 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -64,6 +64,7 @@
 	int intra_blocks;
 	int inter_blocks;
 	int inter4v_blocks;
+	int gmc_blocks;
 	int not_coded_blocks;
 
 	int dct_coefs;
@@ -94,7 +95,7 @@
 	uint32_t shape;
 	uint32_t quant_bits;
 	uint32_t quant_type;
-	uint32_t quarterpel;
+	int32_t quarterpel;
 	int complexity_estimation_disable;
 	ESTIMATION estimation;
 
@@ -114,6 +115,8 @@
 	int newpred_enable;
 	int reduced_resolution_enable;
 
+	int bs_version;
+
 	// image
 
 	int fixed_dimensions;
@@ -123,12 +126,10 @@
 	uint32_t edged_height;
 
 	IMAGE cur;
-	IMAGE refn[3];				// 0   -- last I or P VOP
-	// 1   -- first I or P
-	// 2   -- for interpolate mode B-frame
-	IMAGE refh;
-	IMAGE refv;
-	IMAGE refhv;
+	IMAGE refn[2];				// 0   -- last I or P VOP
+								// 1   -- first I or P
+	IMAGE tmp;		/* bframe interpolation, and post processing tmp buffer */
+	IMAGE qtmp;		/* quarter pel tmp buffer */
 
 	// macroblock
 
@@ -136,12 +137,14 @@
 	uint32_t mb_height;
 	MACROBLOCK *mbs;
 
-	// for B-frame
+	// for B-frame & low_delay==0
+	// XXX: should move frame based stuff into a DECODER_FRAMEINFO struct */
+	MACROBLOCK *last_mbs;			// last MB
+	int last_reduced_resolution;	// last reduced_resolution value
 	int32_t frames;				// total frame number
 	int32_t packed_mode;		// bframes packed bitstream? (1 = yes)
 	int8_t scalability;
 	VECTOR p_fmv, p_bmv;		// pred forward & backward motion vector
-	MACROBLOCK *last_mbs;		// last MB
 	int64_t time;				// for record time
 	int64_t time_base;
 	int64_t last_time_base;
@@ -151,6 +154,11 @@
 	uint32_t low_delay;			// low_delay flage (1 means no B_VOP)
 	uint32_t low_delay_default;	// default value for low_delay flag
 
+	// for GMC: central place for all parameters
+	
+	IMAGE gmc;		/* gmc tmp buffer, remove for blockbased compensation */
+	GMC_DATA gmc_data;
+	
 	XVID_DEC_PICTURE* out_frm;                // This is used for slice rendering
 }
 DECODER;