--- global.h	2002/04/05 14:40:36	1.4
+++ global.h	2002/06/12 20:38:40	1.10
@@ -4,7 +4,7 @@
 #include "xvid.h"
 #include "portab.h"
 
-/* --- macroblock stuff --- */
+/* --- macroblock modes --- */
 
 #define MODE_INTER		0
 #define MODE_INTER_Q	1
@@ -14,6 +14,15 @@
 #define MODE_STUFFING	7
 #define MODE_NOT_CODED	16
 
+/* --- bframe specific --- */
+
+#define MODE_DIRECT			0
+#define MODE_INTERPOLATE	1
+#define MODE_BACKWARD		2
+#define MODE_FORWARD		3
+#define MODE_DIRECT_NONE_MV	4
+
+
 typedef struct
 {
 	uint32_t bufa;
@@ -23,7 +32,7 @@
 	uint32_t *tail;
 	uint32_t *start;
 	uint32_t length;
-} 
+}
 Bitstream;
 
 
@@ -34,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;
@@ -50,42 +57,54 @@
 
 	// encoder specific
 
+	VECTOR mv16;
 	VECTOR pmvs[4];
+
+	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_pmvs[4];
+
+	int mb_type;
+	int dbquant;
 
-static __inline int8_t get_dc_scaler(int32_t quant, uint32_t lum)
+}
+MACROBLOCK;
+
+static __inline int8_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_ */
+// 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)
+
+
+#endif							/* _GLOBAL_H_ */