--- global.h	2002/03/08 02:44:32	1.1
+++ global.h	2003/04/04 22:16:15	1.22
@@ -1,23 +1,102 @@
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
 
+#include "xvid.h"
 #include "portab.h"
 
-/* --- macroblock stuff --- */
+/* --- macroblock modes --- */
 
 #define MODE_INTER		0
 #define MODE_INTER_Q	1
 #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 --- */
+
+#define MODE_DIRECT			0
+#define MODE_INTERPOLATE	1
+#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
 {
-	int x;
-	int y;
-} VECTOR;
+	uint32_t bufa;
+	uint32_t bufb;
+	uint32_t buf;
+	uint32_t pos;
+	uint32_t *tail;
+	uint32_t *start;
+	uint32_t length;
+	uint32_t initpos;
+}
+Bitstream;
 
 
 #define MBPRED_SIZE  15
@@ -27,53 +106,78 @@
 {
 	// decoder/encoder 
 	VECTOR mvs[4];
-	uint32_t sad8[4];		// SAD values for inter4v-VECTORs
-	uint32_t sad16;			// SAD value for inter-VECTOR
 
-    short int pred_values[6][MBPRED_SIZE];
-    int acpred_directions[6];
-    
+	short int pred_values[6][MBPRED_SIZE];
+	int acpred_directions[6];
+
 	int mode;
-	int quant;		// absolute quant
+	int quant;					// absolute quant
+
+	int field_dct;
+	int field_pred;
+	int field_for_top;
+	int field_for_bot;
 
 	// 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
+
 	int dquant;
 	int cbp;
 
-} MACROBLOCK;
+	// 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;
+
+/* This structure has become way to big! What to do? Split it up?   */ 
 
-static __inline int8_t get_dc_scaler(int32_t quant, uint32_t lum)
+}
+MACROBLOCK;
+
+static __inline uint32_t
+get_dc_scaler(uint32_t quant,
+			  uint32_t lum)
 {
-    int8_t dc_scaler;
+	if (quant < 5)
+		return 8;
 
-	if(quant > 0 && quant < 5) {
-        dc_scaler = 8;
-		return dc_scaler;
-	}
-
-	if(quant < 25 && !lum) {
-        dc_scaler = (quant + 13) >> 1;
-		return dc_scaler;
-	}
-
-	if(quant < 9) {
-        dc_scaler = quant << 1;
-		return dc_scaler;
-	}
-
-    if(quant < 25) {
-        dc_scaler = quant + 8;
-		return dc_scaler;
-	}
+	if (quant < 25 && !lum)
+		return (quant + 13) / 2;
 
-	if(lum)
-		dc_scaler = (quant << 1) - 16;
-	else
-        dc_scaler = quant - 6;
+	if (quant < 9)
+		return 2 * quant;
+
+	if (quant < 25)
+		return quant + 8;
 
-    return dc_scaler;
+	if (lum)
+		return 2 * quant - 16;
+	else
+		return quant - 6;
 }
 
-#endif /* _GLOBAL_H_ */
\ No newline at end of file
+// useful macros
+
+#define MIN(X, Y) ((X)<(Y)?(X):(Y))
+#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_ */