--- global.h	2003/06/09 01:16:46	1.21.2.5
+++ global.h	2010/11/28 15:18:21	1.27
@@ -1,3 +1,28 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Global definitions  -
+ *
+ *  Copyright(C) 2002-2010 Michael Militzer <michael@xvid.org>
+ *
+ *  This program is free software ; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation ; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program ; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ * $Id: global.h,v 1.27 2010/11/28 15:18:21 Isibaar Exp $
+ *
+ ****************************************************************************/
+
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
 
@@ -23,9 +48,8 @@
 #define MODE_DIRECT_NONE_MV	4
 #define MODE_DIRECT_NO4V	5
 
-
 /*
- * vop coding types 
+ * vop coding types
  * intra, prediction, backward, sprite, not_coded
  */
 #define I_VOP	0
@@ -48,7 +72,6 @@
 	return xvid_type - 1;
 }
 
-
 typedef struct
 {
 	int x;
@@ -56,22 +79,20 @@
 }
 VECTOR;
 
-
-
-typedef struct 
+typedef struct
 {
 	VECTOR duv[3];
 }
 WARPPOINTS;
 
-/* save all warping parameters for GMC once and for all, instead of 
+/* save all warping parameters for GMC once and for all, instead of
    recalculating for every block. This is needed for encoding&decoding
-   When switching to incremental calculations, this will get much shorter 
+   When switching to incremental calculations, this will get much shorter
 */
 
 /*	we don't include WARPPOINTS wp	here, but in FRAMEINFO itself */
 
-typedef struct 
+typedef struct
 {
 	int num_wp;		/* [input]: 0=none, 1=translation, 2,3 = warping */
 							/* a value of -1 means: "structure not initialized!" */
@@ -79,13 +100,13 @@
 
 	int W;
 	int H;
-	
-	int ss;		
-	int smask;	
-	int sigma;     
-	
-	int r;		
-	int rho;	
+
+	int ss;
+	int smask;
+	int sigma;
+
+	int r;
+	int rho;
 
 	int i0s;
 	int j0s;
@@ -93,23 +114,47 @@
 	int j1s;
 	int i2s;
 	int j2s;
-	
-	int i1ss; 
-	int j1ss; 
-	int i2ss; 
-	int j2ss; 
+
+	int i1ss;
+	int j1ss;
+	int i2ss;
+	int j2ss;
 
 	int alpha;
 	int beta;
-	int Ws; 
-	int Hs; 
-	
-	int dxF, dyF, dxG, dyG; 
+	int Ws;
+	int Hs;
+
+	int dxF, dyF, dxG, dyG;
 	int Fo, Go;
 	int cFo, cGo;
-}
-GMC_DATA;
+} GMC_DATA;
 
+typedef struct _NEW_GMC_DATA
+{
+   /*  0=none, 1=translation, 2,3 = warping
+	*  a value of -1 means: "structure not initialized!" */
+	int num_wp;
+
+	/* {0,1,2,3}  =>   {1/2,1/4,1/8,1/16} pel */
+	int accuracy;
+
+	/* sprite size * 16 */
+	int sW, sH;
+
+	/* gradient, calculated from warp points */
+	int dU[2], dV[2], Uo, Vo, Uco, Vco;
+
+	void (*predict_16x16)(const struct _NEW_GMC_DATA * const This,
+						  uint8_t *dst, const uint8_t *src,
+						  int dststride, int srcstride, int x, int y, int rounding);
+	void (*predict_8x8)  (const struct _NEW_GMC_DATA * const This,
+						  uint8_t *uDst, const uint8_t *uSrc,
+						  uint8_t *vDst, const uint8_t *vSrc,
+						  int dststride, int srcstride, int x, int y, int rounding);
+	void (*get_average_mv)(const struct _NEW_GMC_DATA * const Dsp, VECTOR * const mv,
+						   int x, int y, int qpel);
+} NEW_GMC_DATA;
 
 typedef struct
 {
@@ -119,7 +164,6 @@
 }
 IMAGE;
 
-
 typedef struct
 {
 	uint32_t bufa;
@@ -133,10 +177,8 @@
 }
 Bitstream;
 
-
 #define MBPRED_SIZE  15
 
-
 typedef struct
 {
 	/* decoder/encoder */
@@ -155,32 +197,32 @@
 
 	/* encoder specific */
 
-	VECTOR mv16;
 	VECTOR pmvs[4];
 	VECTOR qmvs[4];				/* mvs in quarter pixel resolution */
 
 	int32_t sad8[4];			/* SAD values for inter4v-VECTORs */
 	int32_t sad16;				/* SAD value for inter-VECTOR */
 
+	int32_t var16;				/* Variance of the 16x16 luma block */
+	int32_t rel_var8[6];		/* Relative variances of the 8x8 sub-blocks */
+
 	int dquant;
 	int cbp;
 
+	/* lambda for these blocks */
+	int lambda[6];
+
 	/* bframe stuff */
 
 	VECTOR b_mvs[4];
 	VECTOR b_qmvs[4];
 
-	int mb_type;
-
-	/*
-	 * stuff for block based ME (needed for Qpel ME)
-	 * backup of last integer ME vectors/sad
-	 */
-
 	VECTOR amv; /* average motion vectors from GMC  */
 	int32_t mcsel;
+	
+	VECTOR  mvs_avg;      //CK average of field motion vectors
 
-/* This structure has become way to big! What to do? Split it up?   */ 
+/* This structure has become way to big! What to do? Split it up?   */
 
 }
 MACROBLOCK;
@@ -217,5 +259,20 @@
 #define DIV_DIV(a,b)    (((a)>0) ? ((a)+((b)>>1))/(b) : ((a)-((b)>>1))/(b))
 #define SWAP(_T_,A,B)    { _T_ tmp = A; A = B; B = tmp; }
 
+static __inline uint32_t 
+isqrt(unsigned long n)
+{
+    uint32_t c = 0x8000;
+    uint32_t g = 0x8000;
+
+    for(;;) {
+        if(g*g > n)
+            g ^= c;
+        c >>= 1;
+        if(c == 0)
+            return g;
+        g |= c;
+    }
+}
 
 #endif							/* _GLOBAL_H_ */