--- trunk/xvidcore/src/global.h	2002/04/13 16:30:02	118
+++ trunk/xvidcore/src/global.h	2002/10/19 11:41:12	603
@@ -1,3 +1,37 @@
+/*****************************************************************************
+ *
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Global structures, constants -
+ *
+ *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
+ *
+ *  This program is an implementation of a part of one or more MPEG-4
+ *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
+ *  to use this software module in hardware or software products are
+ *  advised that its use may infringe existing patents or copyrights, and
+ *  any such use would be at such party's own risk.  The original
+ *  developer of this software module and his/her company, and subsequent
+ *  editors and their companies, will have no liability for use of this
+ *  software or modifications or derivatives thereof.
+ *
+ *  This program 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
+ *
+ * $Id: global.h,v 1.15 2002-10-19 11:41:11 edgomez Exp $
+ *
+ ****************************************************************************/
+
 #ifndef _GLOBAL_H_
 #define _GLOBAL_H_
 
@@ -20,6 +54,7 @@
 #define MODE_INTERPOLATE	1
 #define MODE_BACKWARD		2
 #define MODE_FORWARD		3
+#define MODE_DIRECT_NONE_MV	4
 
 
 typedef struct
@@ -31,7 +66,7 @@
 	uint32_t *tail;
 	uint32_t *start;
 	uint32_t length;
-} 
+}
 Bitstream;
 
 
@@ -42,14 +77,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;
@@ -58,7 +91,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;
 
@@ -67,40 +105,47 @@
 	VECTOR b_mvs[4];
 	VECTOR b_pmvs[4];
 
-} MACROBLOCK;
+	// bframe direct mode
 
-static __inline int8_t get_dc_scaler(int32_t quant, uint32_t lum)
-{
-    int8_t dc_scaler;
+	VECTOR directmv[4];
+	VECTOR deltamv;
 
-	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;
-	}
+	int mb_type;
+	int dbquant;
 
-	if(lum)
-		dc_scaler = (quant << 1) - 16;
-	else
-        dc_scaler = quant - 6;
+	// 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
 
-    return dc_scaler;
 }
+MACROBLOCK;
 
+static __inline int8_t
+get_dc_scaler(uint32_t quant,
+			  uint32_t lum)
+{
+	if (quant < 5)
+		return 8;
+
+	if (quant < 25 && !lum)
+		return (quant + 13) / 2;
+
+	if (quant < 9)
+		return 2 * quant;
+
+	if (quant < 25)
+		return quant + 8;
+
+	if (lum)
+		return 2 * quant - 16;
+	else
+		return quant - 6;
+}
 
 // useful macros