--- global.h	2003/02/21 14:49:28	1.21
+++ global.h	2003/06/09 01:16:46	1.21.2.5
@@ -23,6 +23,41 @@
 #define MODE_DIRECT_NONE_MV	4
 #define MODE_DIRECT_NO4V	5
 
+
+/*
+ * vop coding types 
+ * intra, prediction, backward, sprite, not_coded
+ */
+#define I_VOP	0
+#define P_VOP	1
+#define B_VOP	2
+#define S_VOP	3
+#define N_VOP	4
+
+/* convert mpeg-4 coding type i/p/b/s_VOP to XVID_TYPE_xxx */
+static __inline int
+coding2type(int coding_type)
+{
+	return coding_type + 1;
+}
+
+/* convert XVID_TYPE_xxx to bitstream coding type i/p/b/s_VOP */
+static __inline int
+type2coding(int xvid_type)
+{
+	return xvid_type - 1;
+}
+
+
+typedef struct
+{
+	int x;
+	int y;
+}
+VECTOR;
+
+
+
 typedef struct 
 {
 	VECTOR duv[3];
@@ -38,9 +73,9 @@
 
 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 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;
@@ -94,6 +129,7 @@
 	uint32_t *tail;
 	uint32_t *start;
 	uint32_t length;
+	uint32_t initpos;
 }
 Bitstream;
 
@@ -103,43 +139,45 @@
 
 typedef struct
 {
-	// decoder/encoder 
+	/* decoder/encoder */
 	VECTOR mvs[4];
 
 	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
+	/* encoder specific */
 
 	VECTOR mv16;
 	VECTOR pmvs[4];
-	VECTOR qmvs[4];				// mvs in quarter pixel resolution
+	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 sad8[4];			/* SAD values for inter4v-VECTORs */
+	int32_t sad16;				/* SAD value for inter-VECTOR */
 
 	int dquant;
 	int cbp;
 
-	// bframe stuff
+	/* 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
+	/*
+	 * stuff for block based ME (needed for Qpel ME)
+	 * backup of last integer ME vectors/sad
+	 */
 
-	VECTOR amv; // average motion vectors from GMC 
+	VECTOR amv; /* average motion vectors from GMC  */
 	int32_t mcsel;
 
 /* This structure has become way to big! What to do? Split it up?   */ 
@@ -169,14 +207,15 @@
 		return quant - 6;
 }
 
-// useful macros
+/* 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 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))
+#define SWAP(_T_,A,B)    { _T_ tmp = A; A = B; B = tmp; }
 
 
 #endif							/* _GLOBAL_H_ */