--- encoder.h	2002/06/24 09:53:17	1.13
+++ 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.13 2002/06/24 09:53:17 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"
 
 /*****************************************************************************
@@ -70,7 +69,8 @@
 {
 	I_VOP = 0,
 	P_VOP = 1,
-	B_VOP = 2
+	B_VOP = 2,
+	S_VOP = 3
 }
 VOP_TYPE;
 
@@ -92,9 +92,14 @@
 	uint32_t fincr;
 	uint32_t fbase;
 
-#ifdef BFRAMES
+	/* constants */
+	int global;
+	int bquant_ratio;
+	int bquant_offset;
+	int frame_drop_ratio;
+
+	int iMaxKeyInterval;
 	int max_bframes;
-#endif
 
 	/* rounding type; alternate 0-1 after each interframe */
 	/* 1 <= fixed_code <= 4
@@ -105,61 +110,62 @@
 	uint32_t m_quant_type;
 	uint32_t m_rounding_type;
 	uint32_t m_fcode;
+	uint32_t m_quarterpel;
+	int m_reduced_resolution;	/* reduced_resolution_enable */
 
 	HINTINFO *hint;
 
-#ifdef BFRAMES
-	uint32_t m_seconds;
-	uint32_t m_ticks;
-#endif
-
+	int64_t m_stamp;
 }
 MBParam;
 
 
 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;
 
 	VOP_TYPE coding_type;
 	uint32_t rounding_type;
+	uint32_t quarterpel;
 	uint32_t fcode;
 	uint32_t bcode;
 
-#ifdef BFRAMES
 	uint32_t seconds;
 	uint32_t ticks;
-#endif
+	int64_t stamp;
 
 	IMAGE image;
 
 	MACROBLOCK *mbs;
 
+	WARPPOINTS warp;		// as in bitstream
+	GMC_DATA gmc_data;		// common data for all MBs
+		
+	Statistics sStat;
 }
 FRAMEINFO;
 
-typedef struct
-{
-	int iTextBits;
-	float fMvPrevSigma;
-	int iMvSum;
-	int iMvCount;
-	int kblks;
-	int mblks;
-	int ublks;
-}
-Statistics;
-
-
 
 typedef struct
 {
 	MBParam mbParam;
 
 	int iFrameNum;
-	int iMaxKeyInterval;
 	int bitrate;
 
 	// images
@@ -167,19 +173,14 @@
 	FRAMEINFO *current;
 	FRAMEINFO *reference;
 
-#ifdef _DEBUG_PSNR
 	IMAGE sOriginal;
-#endif
 	IMAGE vInterH;
 	IMAGE vInterV;
 	IMAGE vInterVf;
 	IMAGE vInterHV;
 	IMAGE vInterHVf;
 
-#ifdef BFRAMES
-	/* constants */
-	int global;
-	int bquant_ratio;
+	IMAGE vGMC;
 
 	/* image queue */
 	int queue_head;
@@ -197,12 +198,12 @@
 	IMAGE f_refv;
 	IMAGE f_refhv;
 	int bframenum_dx50bvop;
-	
+
 	int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
-#endif
 
-	Statistics sStat;
 	RateControl rate_control;
+
+	float fMvPrevSigma;
 }
 Encoder;