--- encoder.h	2003/06/28 15:49:11	1.27.2.11
+++ encoder.h	2006/07/10 08:09:59	1.32
@@ -20,7 +20,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: encoder.h,v 1.27.2.11 2003/06/28 15:49:11 chl Exp $
+ * $Id: encoder.h,v 1.32 2006/07/10 08:09:59 syskin Exp $
  *
  ****************************************************************************/
 
@@ -35,6 +35,9 @@
  * Constants
  ****************************************************************************/
 
+/* lambda base exponential. 1<<LAMBDA_EXP is the neutral lambda */
+#define LAMBDA_EXP		6
+
 /*****************************************************************************
  * Types
  ****************************************************************************/
@@ -59,12 +62,12 @@
     int plugin_flags;
 
 	/* frame rate increment & base */
-	uint32_t fincr;
+	int32_t fincr;
 	uint32_t fbase;
 
     int profile;
 
-	xvid_global_t global_flags;
+	int global_flags;
 	int bquant_ratio;
 	int bquant_offset;
 	int frame_drop_ratio;
@@ -72,10 +75,9 @@
     int min_quant[3];
     int max_quant[3];
 
-#ifdef _SMP
-	int num_threads;
-#endif
-
+	int par;
+	int par_width;
+	int par_height;
 
 	int iMaxKeyInterval;
 	int max_bframes;
@@ -89,11 +91,13 @@
 	/* vars that not "quite" frame independant */
 	uint32_t m_rounding_type;
 	uint32_t m_fcode;
-    xvid_vol_t vol_flags;
+    int vol_flags;
 
 	int64_t m_stamp;
-}
-MBParam;
+
+	uint16_t *mpeg_quant_matrices;
+	uint32_t last_quant_initialized_intra; /* needed for mpeg matrices initialization */
+} MBParam;
 
 
 typedef struct
@@ -105,8 +109,8 @@
 	int mblks;
 	int ublks;
 	int gblks;
-}
-Statistics;
+	int iMVBits;
+} Statistics;
 
 
 /* encoding queue */
@@ -123,9 +127,9 @@
 {
     int frame_num;
     int fincr;
-	xvid_vol_t vol_flags;
-    xvid_vop_t vop_flags;
-	xvid_motion_t motion_flags;
+	int vol_flags;
+    int vop_flags;
+	int motion_flags;
 
 	int coding_type;
 	uint32_t quant;
@@ -146,11 +150,13 @@
 	NEW_GMC_DATA new_gmc_data;		/* common data for all MBs */
 
     int length;         /* the encoded size of this frame */
-		
+
 	Statistics sStat;
-}
-FRAMEINFO;
+	int is_edged, is_interpolated;
+} FRAMEINFO;
+
 
+#include "motion/motion_smp.h"
 
 typedef struct
 {
@@ -164,13 +170,17 @@
     xvid_enc_zone_t * zones;
 
     /* plugins */
-    unsigned int num_plugins;    /* note: we store plugin flags in MBPARAM */
+    int num_plugins;    /* note: we store plugin flags in MBPARAM */
     xvid_enc_plugin_t * plugins;
 
     /* dquant */
 
     int * temp_dquants;
 
+    /* lambda */
+
+    float * temp_lambda;
+
 	/* images */
 
 	FRAMEINFO *current;
@@ -206,11 +216,14 @@
 	int closed_bframenum; /* == -1 if there is no fixup intended */
     QUEUEINFO closed_qframe;	/* qFrame, only valid when >= 0 */
 
+	/* multithreaded stuff */
+	int num_threads;			/* number of additional threads */
+	SMPmotionData * motionData;	/* data structures used to pass all thread-specific data */
+
 	int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
 
 	float fMvPrevSigma;
-}
-Encoder;
+} Encoder;
 
 /*****************************************************************************
  * Inline functions