--- trunk/xvidcore/src/decoder.h	2002/06/13 21:53:08	203
+++ trunk/xvidcore/src/decoder.h	2003/02/15 15:22:19	851
@@ -33,7 +33,7 @@
  *
  *  - 13.06.2002 Added legal header - Cosmetic
  *
- *  $Id: decoder.h,v 1.7 2002-06-13 21:53:08 edgomez Exp $
+ *  $Id: decoder.h,v 1.13 2003-02-15 15:22:17 edgomez Exp $
  *
  ****************************************************************************/
 
@@ -49,34 +49,85 @@
  * Structures
  ****************************************************************************/
 
+/* complexity estimation toggles */
 typedef struct
 {
-	// bitstream
+	int method;
 
-	uint32_t shape;
+	int opaque;
+	int transparent;
+	int intra_cae;
+	int inter_cae;
+	int no_update;
+	int upsampling;
+
+	int intra_blocks;
+	int inter_blocks;
+	int inter4v_blocks;
+	int gmc_blocks;
+	int not_coded_blocks;
+
+	int dct_coefs;
+	int dct_lines;
+	int vlc_symbols;
+	int vlc_bits;
+
+	int apm;
+	int npm;
+	int interpolate_mc_q;
+	int forw_back_mc_q;
+	int halfpel2;
+	int halfpel4;
+
+	int sadct;
+	int quarterpel;
+} ESTIMATION;
+
+
+typedef struct
+{
+	// vol bitstream
+
+	int time_inc_resolution;
+	int fixed_time_inc;
 	uint32_t time_inc_bits;
+
+	uint32_t shape;
 	uint32_t quant_bits;
 	uint32_t quant_type;
-	uint32_t quarterpel;
+	int32_t quarterpel;
+	int complexity_estimation_disable;
+	ESTIMATION estimation;
 
-	uint32_t interlacing;
+	int interlacing;
 	uint32_t top_field_first;
 	uint32_t alternate_vertical_scan;
 
+	int aspect_ratio;
+	int par_width;
+	int par_height;
+
+	int sprite_enable;
+	int sprite_warping_points;
+	int sprite_warping_accuracy;
+	int sprite_brightness_change;
+
+	int newpred_enable;
+	int reduced_resolution_enable;
+
 	// image
 
+	int fixed_dimensions;
 	uint32_t width;
 	uint32_t height;
 	uint32_t edged_width;
 	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
 
@@ -84,18 +135,29 @@
 	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;
 	int64_t last_non_b_time;
 	uint32_t time_pp;
 	uint32_t time_bp;
-	uint8_t low_delay;			// low_delay flage (1 means no B_VOP)
+	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;
 
@@ -108,7 +170,7 @@
 int decoder_create(XVID_DEC_PARAM * param);
 int decoder_destroy(DECODER * dec);
 int decoder_decode(DECODER * dec,
-				   XVID_DEC_FRAME * frame);
+				   XVID_DEC_FRAME * frame, XVID_DEC_STATS * stats);
 
 
 #endif