--- global.h	2002/10/19 11:41:11	1.15
+++ global.h	2003/02/21 14:44:57	1.20
@@ -1,37 +1,3 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Global structures, constants -
- *
- *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
- *
- *  This program is an implementation of a part of one or more MPEG-4
- *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
- *  to use this software module in hardware or software products are
- *  advised that its use may infringe existing patents or copyrights, and
- *  any such use would be at such party's own risk.  The original
- *  developer of this software module and his/her company, and subsequent
- *  editors and their companies, will have no liability for use of this
- *  software or modifications or derivatives thereof.
- *
- *  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.15 2002/10/19 11:41:11 edgomez Exp $
- *
- ****************************************************************************/
-
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
 
@@ -45,8 +11,8 @@
 #define MODE_INTER4V	2
 #define	MODE_INTRA		3
 #define MODE_INTRA_Q	4
-#define MODE_STUFFING	7
 #define MODE_NOT_CODED	16
+#define MODE_NOT_CODED_GMC	17
 
 /* --- bframe specific --- */
 
@@ -55,6 +21,68 @@
 #define MODE_BACKWARD		2
 #define MODE_FORWARD		3
 #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; 
+	
+	int dxF, dyF, dxG, dyG; 
+	int Fo, Go;
+	int cFo, cGo;
+}
+GMC_DATA;
+
+
+typedef struct
+{
+	uint8_t *y;
+	uint8_t *u;
+	uint8_t *v;
+}
+IMAGE;
 
 
 typedef struct
@@ -93,6 +121,7 @@
 
 	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
@@ -103,29 +132,23 @@
 	// bframe stuff
 
 	VECTOR b_mvs[4];
-	VECTOR b_pmvs[4];
-
-	// bframe direct mode
-
-	VECTOR directmv[4];
-	VECTOR deltamv;
+	VECTOR b_qmvs[4];
 
 	int mb_type;
 	int dbquant;
 
 	// stuff for block based ME (needed for Qpel ME)
 	// backup of last integer ME vectors/sad
-	
-	VECTOR i_mv16;
-	VECTOR i_mvs[4];
 
-	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;
 
-static __inline int8_t
+static __inline uint32_t
 get_dc_scaler(uint32_t quant,
 			  uint32_t lum)
 {
@@ -153,6 +176,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_ */
+#endif							/* _GLOBAL_H_ */