--- global.h	2002/03/26 11:16:08	1.2
+++ global.h	2002/05/03 08:37:48	1.7
@@ -1,9 +1,10 @@
 #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
@@ -13,11 +14,26 @@
 #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
 {
-	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;
+} 
+Bitstream;
 
 
 #define MBPRED_SIZE  15
@@ -47,38 +63,42 @@
 	int dquant;
 	int cbp;
 
+	// bframe stuff
+
+	VECTOR b_mvs[4];
+	VECTOR b_pmvs[4];
+
+	int mb_type;
+	int dbquant;
+
 } MACROBLOCK;
 
-static __inline int8_t get_dc_scaler(int32_t quant, uint32_t lum)
+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(quant < 9)
+        return 2 * quant;
+
+    if(quant < 25)
+        return quant + 8;
 
 	if(lum)
-		dc_scaler = (quant << 1) - 16;
+		return 2 * quant - 16;
 	else
-        dc_scaler = quant - 6;
-
-    return dc_scaler;
+        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)
+
+
+#endif /* _GLOBAL_H_ */