--- global.h	2002/12/10 11:13:50	1.13.2.5
+++ global.h	2003/01/11 14:59:23	1.13.2.8
@@ -12,6 +12,7 @@
 #define	MODE_INTRA		3
 #define MODE_INTRA_Q	4
 #define MODE_NOT_CODED	16
+#define MODE_NOT_CODED_GMC	17
 
 /* --- bframe specific --- */
 
@@ -22,6 +23,55 @@
 #define MODE_DIRECT_NONE_MV	4
 #define MODE_DIRECT_NO4V	5
 
+typedef struct 
+{
+	VECTOR duv[3];
+}
+WARPPOINTS;
+
+/* 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 
+*/
+
+/*	we don't include WARPPOINTS wp	here, but in FRAMEINFO itself */
+
+typedef struct 
+{
+	int num_wp;		//	[input]: 0=none, 1=translation, 2,3 = warping
+							//  a value of -1 means: "structure not initialized!"
+	int s;					//  [input]: calc is done with 1/s pel resolution
+
+	int W;
+	int H;
+	
+	int ss;		
+	int smask;	
+	int sigma;     
+	
+	int r;		
+	int rho;	
+
+	int i0s;
+	int j0s;
+	int i1s;
+	int j1s;
+//	int i2s;
+//	int j2s;
+	
+	int i1ss; 
+	int j1ss; 
+//	int i2ss; 
+//	int j2ss; 
+
+	int alpha;
+//	int beta;
+	int Ws; 
+//	int Hs; 
+}
+GMC_DATA;
+
+
 typedef struct
 {
 	uint8_t *y;
@@ -98,6 +148,10 @@
 	int32_t i_sad8[4];	// SAD values for inter4v-VECTORs
 //	int32_t i_sad16;	// SAD value for inter-VECTOR
 
+	VECTOR amv; // average motion vectors from GMC 
+	int32_t mcsel;
+
+/* This structure has become way to big! What to do? Split it up?   */ 
 
 }
 MACROBLOCK;
@@ -130,6 +184,8 @@
 #define MAX(X, Y) ((X)>(Y)?(X):(Y))
 #define ABS(X)    (((X)>0)?(X):-(X))
 #define SIGN(X)   (((X)>0)?1:-1)
+#define CLIP(X,AMIN,AMAX)   (((X)<(AMIN)) ? (AMIN) : ((X)>(AMAX)) ? (AMAX) : (X))
+#define DIV_DIV(a,b)    (((a)>0) ? ((a)+((b)>>1))/(b) : ((a)-((b)>>1))/(b))
 
 
 #endif							/* _GLOBAL_H_ */