--- global.h	2002/05/03 00:45:10	1.6
+++ global.h	2002/11/16 23:38:16	1.16
@@ -1,3 +1,59 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Global structures, constants -
+ *
+ *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
+ *
+ *  This file is part of XviD, a free MPEG-4 video encoder/decoder
+ *
+ *  XviD is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ *  Under section 8 of the GNU General Public License, the copyright
+ *  holders of XVID explicitly forbid distribution in the following
+ *  countries:
+ *
+ *    - Japan
+ *    - United States of America
+ *
+ *  Linking XviD statically or dynamically with other modules is making a
+ *  combined work based on XviD.  Thus, the terms and conditions of the
+ *  GNU General Public License cover the whole combination.
+ *
+ *  As a special exception, the copyright holders of XviD give you
+ *  permission to link XviD with independent modules that communicate with
+ *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
+ *  license terms of these independent modules, and to copy and distribute
+ *  the resulting combined work under terms of your choice, provided that
+ *  every copy of the combined work is accompanied by a complete copy of
+ *  the source code of XviD (the version of XviD used to produce the
+ *  combined work), being distributed under the terms of the GNU General
+ *  Public License plus this exception.  An independent module is a module
+ *  which is not derived from or based on XviD.
+ *
+ *  Note that people who make modified versions of XviD are not obligated
+ *  to grant this special exception for their modified versions; it is
+ *  their choice whether to do so.  The GNU General Public License gives
+ *  permission to release a modified version without this exception; this
+ *  exception also makes it possible to release a modified version which
+ *  carries forward this exception.
+ *
+ * $Id: global.h,v 1.16 2002/11/16 23:38:16 edgomez Exp $
+ *
+ ****************************************************************************/
+
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
 
@@ -32,7 +88,7 @@
 	uint32_t *tail;
 	uint32_t *start;
 	uint32_t length;
-} 
+}
 Bitstream;
 
 
@@ -43,14 +99,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,7 +113,12 @@
 
 	// 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;
 
@@ -68,43 +127,47 @@
 	VECTOR b_mvs[4];
 	VECTOR b_pmvs[4];
 
+	// 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];
 
-static __inline int8_t get_dc_scaler(int32_t quant, uint32_t lum)
+	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)
 {
-    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;
 
-    return dc_scaler;
-}
+	if (quant < 25)
+		return quant + 8;
 
+	if (lum)
+		return 2 * quant - 16;
+	else
+		return quant - 6;
+}
 
 // useful macros