--- encoder.h	2002/11/19 13:21:25	1.18.2.5
+++ encoder.h	2003/01/11 14:59:23	1.18.2.9
@@ -36,7 +36,7 @@
  *               support for EXTENDED API
  *  - 22.08.2001 fixed bug in iDQtab
  *
- *  $Id: encoder.h,v 1.18.2.5 2002/11/19 13:21:25 suxen_drol Exp $
+ *  $Id: encoder.h,v 1.18.2.9 2003/01/11 14:59:23 chl Exp $
  *
  ****************************************************************************/
 
@@ -46,7 +46,6 @@
 #include "xvid.h"
 #include "portab.h"
 #include "global.h"
-#include "image/image.h"
 #include "utils/ratecontrol.h"
 
 /*****************************************************************************
@@ -93,10 +92,13 @@
 	uint32_t fincr;
 	uint32_t fbase;
 
-#ifdef _SMP
-	int num_threads;
-#endif
+	/* constants */
+	int global;
+	int bquant_ratio;
+	int bquant_offset;
+	int frame_drop_ratio;
 
+	int iMaxKeyInterval;
 	int max_bframes;
 
 	/* rounding type; alternate 0-1 after each interframe */
@@ -109,6 +111,7 @@
 	uint32_t m_rounding_type;
 	uint32_t m_fcode;
 	uint32_t m_quarterpel;
+	int m_reduced_resolution;	/* reduced_resolution_enable */
 
 	HINTINFO *hint;
 
@@ -119,6 +122,19 @@
 
 typedef struct
 {
+	int iTextBits;
+	int iMvSum;
+	int iMvCount;
+	int kblks;
+	int mblks;
+	int ublks;
+	int gblks;
+}
+Statistics;
+
+
+typedef struct
+{
 	uint32_t quant;
 	uint32_t motion_flags;
 	uint32_t global_flags;
@@ -136,22 +152,13 @@
 	IMAGE image;
 
 	MACROBLOCK *mbs;
-	VECTOR GMC_MV;
-}
-FRAMEINFO;
 
-typedef struct
-{
-	int iTextBits;
-	float fMvPrevSigma;
-	int iMvSum;
-	int iMvCount;
-	int kblks;
-	int mblks;
-	int ublks;
+	WARPPOINTS warp;		// as in bitstream
+	GMC_DATA gmc_data;		// common data for all MBs
+		
+	Statistics sStat;
 }
-Statistics;
-
+FRAMEINFO;
 
 
 typedef struct
@@ -159,7 +166,6 @@
 	MBParam mbParam;
 
 	int iFrameNum;
-	int iMaxKeyInterval;
 	int bitrate;
 
 	// images
@@ -176,11 +182,7 @@
 	IMAGE vInterHV;
 	IMAGE vInterHVf;
 
-	/* constants */
-	int global;
-	int bquant_ratio;
-	int bquant_offset;
-	int frame_drop_ratio;
+	IMAGE vGMC;
 
 	/* image queue */
 	int queue_head;
@@ -201,8 +203,9 @@
 
 	int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
 
-	Statistics sStat;
 	RateControl rate_control;
+
+	float fMvPrevSigma;
 }
 Encoder;