--- encoder.h	2002/12/04 12:31:18	1.18.2.6
+++ encoder.h	2003/01/25 22:44:50	1.18.2.10
@@ -36,7 +36,7 @@
  *               support for EXTENDED API
  *  - 22.08.2001 fixed bug in iDQtab
  *
- *  $Id: encoder.h,v 1.18.2.6 2002/12/04 12:31:18 suxen_drol Exp $
+ *  $Id: encoder.h,v 1.18.2.10 2003/01/25 22:44:50 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;
 
@@ -125,6 +128,7 @@
 	int kblks;
 	int mblks;
 	int ublks;
+	int gblks;
 }
 Statistics;
 
@@ -148,20 +152,20 @@
 	IMAGE image;
 
 	MACROBLOCK *mbs;
-	VECTOR GMC_MV;
 
+	WARPPOINTS warp;		// as in bitstream
+	GMC_DATA gmc_data;		// common data for all MBs
+		
 	Statistics sStat;
 }
 FRAMEINFO;
 
 
-
 typedef struct
 {
 	MBParam mbParam;
 
 	int iFrameNum;
-	int iMaxKeyInterval;
 	int bitrate;
 
 	// images
@@ -169,20 +173,14 @@
 	FRAMEINFO *current;
 	FRAMEINFO *reference;
 
-#ifdef _DEBUG_PSNR
 	IMAGE sOriginal;
-#endif
 	IMAGE vInterH;
 	IMAGE vInterV;
 	IMAGE vInterVf;
 	IMAGE vInterHV;
 	IMAGE vInterHVf;
 
-	/* constants */
-	int global;
-	int bquant_ratio;
-	int bquant_offset;
-	int frame_drop_ratio;
+	IMAGE vGMC;
 
 	/* image queue */
 	int queue_head;