--- decoder.h	2002/07/19 11:15:21	1.10
+++ decoder.h	2002/12/12 10:37:44	1.10.2.4
@@ -33,7 +33,7 @@
  *
  *  - 13.06.2002 Added legal header - Cosmetic
  *
- *  $Id: decoder.h,v 1.10 2002/07/19 11:15:21 albeu Exp $
+ *  $Id: decoder.h,v 1.10.2.4 2002/12/12 10:37:44 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -49,22 +49,74 @@
  * 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 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;
+	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;
@@ -86,6 +138,7 @@
 
 	// for B-frame
 	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
@@ -95,7 +148,8 @@
 	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
 
 	XVID_DEC_PICTURE* out_frm;                // This is used for slice rendering
 }
@@ -110,7 +164,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