--- encoder.h	2002/12/04 12:31:18	1.18.2.6
+++ encoder.h	2003/02/22 08:49:44	1.27.2.1
@@ -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.27.2.1 2003/02/22 08:49:44 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -46,7 +46,6 @@
 #include "xvid.h"
 #include "portab.h"
 #include "global.h"
-#include "image/image.h"
 #include "utils/ratecontrol.h"
 
 /*****************************************************************************
@@ -66,21 +65,13 @@
 
 typedef int bool;
 
-typedef enum
-{
-	I_VOP = 0,
-	P_VOP = 1,
-	B_VOP = 2,
-	S_VOP = 3
-}
-VOP_TYPE;
-
 /*****************************************************************************
  * Structures
  ****************************************************************************/
 
 typedef struct
 {
+    /* --- constants --- */
 	uint32_t width;
 	uint32_t height;
 
@@ -93,24 +84,29 @@
 	uint32_t fincr;
 	uint32_t fbase;
 
+	xvid_global_t global_flags;
+	int bquant_ratio;
+	int bquant_offset;
+	int frame_drop_ratio;
+
 #ifdef _SMP
 	int num_threads;
 #endif
 
+
+	int iMaxKeyInterval;
 	int max_bframes;
 
+/* --- inbetween vop stuff --- */
 	/* rounding type; alternate 0-1 after each interframe */
 	/* 1 <= fixed_code <= 4
 	   automatically adjusted using motion vector statistics inside
 	 */
 
 	/* vars that not "quite" frame independant */
-	uint32_t m_quant_type;
 	uint32_t m_rounding_type;
 	uint32_t m_fcode;
-	uint32_t m_quarterpel;
-
-	HINTINFO *hint;
+    xvid_vol_t vol_flags;
 
 	int64_t m_stamp;
 }
@@ -125,19 +121,30 @@
 	int kblks;
 	int mblks;
 	int ublks;
+	int gblks;
 }
 Statistics;
 
 
+/* encoding queue */
 typedef struct
 {
-	uint32_t quant;
-	uint32_t motion_flags;
-	uint32_t global_flags;
+	xvid_enc_frame_t frame;
+	unsigned char quant_intra_matrix[64];
+	unsigned char quant_inter_matrix[64];
+	IMAGE image;
+} QUEUEINFO;
+
 
-	VOP_TYPE coding_type;
+typedef struct
+{
+	xvid_vol_t vol_flags;
+    xvid_vop_t vop_flags;
+	xvid_motion_t motion_flags;
+
+	int coding_type;
+	uint32_t quant;
 	uint32_t rounding_type;
-	uint32_t quarterpel;
 	uint32_t fcode;
 	uint32_t bcode;
 
@@ -148,20 +155,22 @@
 	IMAGE image;
 
 	MACROBLOCK *mbs;
-	VECTOR GMC_MV;
 
+	WARPPOINTS warp;		// as in bitstream
+	GMC_DATA gmc_data;		// common data for all MBs
+
+    int length;         /* the encoded size of this frame */
+		
 	Statistics sStat;
 }
 FRAMEINFO;
 
 
-
 typedef struct
 {
 	MBParam mbParam;
 
 	int iFrameNum;
-	int iMaxKeyInterval;
 	int bitrate;
 
 	// images
@@ -169,26 +178,20 @@
 	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;
 	int queue_tail;
 	int queue_size;
-	IMAGE *queue;
+	QUEUEINFO *queue;
 
 	/* bframe buffer */
 	int bframenum_head;
@@ -199,7 +202,10 @@
 	IMAGE f_refh;
 	IMAGE f_refv;
 	IMAGE f_refhv;
-	int bframenum_dx50bvop;
+
+    /* closed_gop fixup temporary storage */
+	int closed_bframenum; /* == -1 if there is no fixup intended */
+    QUEUEINFO closed_qframe;	/* qFrame, only valid when >= 0 */
 
 	int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
 
@@ -248,14 +254,10 @@
 
 void init_encoder(uint32_t cpu_flags);
 
-int encoder_create(XVID_ENC_PARAM * pParam);
-int encoder_destroy(Encoder * pEnc);
-int encoder_encode(Encoder * pEnc,
-				   XVID_ENC_FRAME * pFrame,
-				   XVID_ENC_STATS * pResult);
-
-int encoder_encode_bframes(Encoder * pEnc,
-				   XVID_ENC_FRAME * pFrame,
-				   XVID_ENC_STATS * pResult);
+int enc_create(xvid_enc_create_t * create, xvid_enc_rc_t * rc);
+int enc_destroy(Encoder * pEnc);
+int enc_encode(Encoder * pEnc,
+				   xvid_enc_frame_t * pFrame,
+				   xvid_enc_stats_t * stats);
 
 #endif