--- encoder.h	2003/08/26 14:07:11	1.27.2.14
+++ encoder.h	2010/09/13 07:38:09	1.33
@@ -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.14 2003/08/26 14:07:11 edgomez Exp $
+ * $Id: encoder.h,v 1.33 2010/09/13 07:38:09 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;
 
@@ -96,9 +94,10 @@
     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
 {
@@ -109,9 +108,8 @@
 	int mblks;
 	int ublks;
 	int gblks;
-}
-Statistics;
-
+	int iMVBits;
+} Statistics;
 
 /* encoding queue */
 typedef struct
@@ -122,7 +120,6 @@
 	IMAGE image;
 } QUEUEINFO;
 
-
 typedef struct
 {
     int frame_num;
@@ -150,11 +147,12 @@
 	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
 {
@@ -175,6 +173,10 @@
 
     int * temp_dquants;
 
+    /* lambda */
+
+    float * temp_lambda;
+
 	/* images */
 
 	FRAMEINFO *current;
@@ -210,11 +212,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
@@ -248,7 +253,6 @@
 		return 0;
 }
 
-
 /*****************************************************************************
  * Prototypes
  ****************************************************************************/