--- trunk/xvidcore/src/global.h	2002/05/03 08:37:55	157
+++ branches/dev-api-3/xvidcore/src/global.h	2002/12/08 05:38:56	695
@@ -11,7 +11,6 @@
 #define MODE_INTER4V	2
 #define	MODE_INTRA		3
 #define MODE_INTRA_Q	4
-#define MODE_STUFFING	7
 #define MODE_NOT_CODED	16
 
 /* --- bframe specific --- */
@@ -21,6 +20,7 @@
 #define MODE_BACKWARD		2
 #define MODE_FORWARD		3
 #define MODE_DIRECT_NONE_MV	4
+#define MODE_DIRECT_NO4V	5
 
 
 typedef struct
@@ -32,7 +32,7 @@
 	uint32_t *tail;
 	uint32_t *start;
 	uint32_t length;
-} 
+}
 Bitstream;
 
 
@@ -43,14 +43,12 @@
 {
 	// 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;
@@ -59,38 +57,63 @@
 
 	// 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;
 
 	// bframe stuff
 
 	VECTOR b_mvs[4];
-	VECTOR b_pmvs[4];
+	VECTOR b_qmvs[4];
+//	VECTOR b_pmvs[1];
+
+	// bframe direct mode
+
+//	VECTOR directmv[4];
+//	VECTOR deltamv;
 
 	int mb_type;
 	int dbquant;
 
-} MACROBLOCK;
+	// 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
+
+
+}
+MACROBLOCK;
 
-static __inline int8_t get_dc_scaler(uint32_t quant, uint32_t lum)
+static __inline int8_t
+get_dc_scaler(uint32_t quant,
+			  uint32_t lum)
 {
-	if(quant < 5)
-        return 8;
+	if (quant < 5)
+		return 8;
 
-	if(quant < 25 && !lum)
-        return (quant + 13) / 2;
+	if (quant < 25 && !lum)
+		return (quant + 13) / 2;
 
-	if(quant < 9)
-        return 2 * quant;
+	if (quant < 9)
+		return 2 * quant;
 
-    if(quant < 25)
-        return quant + 8;
+	if (quant < 25)
+		return quant + 8;
 
-	if(lum)
+	if (lum)
 		return 2 * quant - 16;
 	else
-        return quant - 6;
+		return quant - 6;
 }
 
 // useful macros
@@ -101,4 +124,4 @@
 #define SIGN(X)   (((X)>0)?1:-1)
 
 
-#endif /* _GLOBAL_H_ */
+#endif							/* _GLOBAL_H_ */