--- encoder.h	2003/11/30 16:13:15	1.27.2.17
+++ encoder.h	2010/12/18 16:02:00	1.34
@@ -3,7 +3,7 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Encoder related header  -
  *
- *  Copyright(C) 2002-2003 Michael Militzer <isibaar@xvid.org>
+ *  Copyright(C) 2002-2010 Michael Militzer <isibaar@xvid.org>
  *               2002-2003 Peter Ross <pross@xvid.org>
  *
  *  This program is free software ; you can redistribute it and/or modify
@@ -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.17 2003/11/30 16:13:15 edgomez Exp $
+ * $Id: encoder.h,v 1.34 2010/12/18 16:02:00 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -35,6 +35,9 @@
  * Constants
  ****************************************************************************/
 
+/* lambda base exponential. 1<<LAMBDA_EXP is the neutral lambda */
+#define LAMBDA_EXP		6
+
 /*****************************************************************************
  * Types
  ****************************************************************************/
@@ -76,11 +79,6 @@
 	int par_width;
 	int par_height;
 
-#ifdef _SMP
-	int num_threads;
-#endif
-
-
 	int iMaxKeyInterval;
 	int max_bframes;
 
@@ -98,9 +96,9 @@
 	int64_t m_stamp;
 
 	uint16_t *mpeg_quant_matrices;
+	uint32_t last_quant_initialized_intra; /* needed for mpeg matrices initialization */
 } MBParam;
 
-
 typedef struct
 {
 	int iTextBits;
@@ -110,9 +108,9 @@
 	int mblks;
 	int ublks;
 	int gblks;
+	int iMVBits;
 } Statistics;
 
-
 /* encoding queue */
 typedef struct
 {
@@ -122,7 +120,6 @@
 	IMAGE image;
 } QUEUEINFO;
 
-
 typedef struct
 {
     int frame_num;
@@ -155,6 +152,7 @@
 	int is_edged, is_interpolated;
 } FRAMEINFO;
 
+#include "motion/motion_smp.h"
 
 typedef struct
 {
@@ -175,6 +173,10 @@
 
     int * temp_dquants;
 
+    /* lambda */
+
+    float * temp_lambda;
+
 	/* images */
 
 	FRAMEINFO *current;
@@ -210,9 +212,15 @@
 	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 encoder threads */
+	SMPData * smpData;			/* 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;
+
+	int num_slices;			/* number of slices to code */
 } Encoder;
 
 /*****************************************************************************
@@ -247,7 +255,6 @@
 		return 0;
 }
 
-
 /*****************************************************************************
  * Prototypes
  ****************************************************************************/