--- mbfunctions.h	2002/07/06 17:04:57	1.7
+++ mbfunctions.h	2003/02/15 15:22:19	1.17
@@ -42,20 +42,24 @@
 
 
 /** MBMotionCompensation **/
-void MBMotionCompensation(MACROBLOCK * const pMB,
-						  const uint32_t j,
-						  const uint32_t i,
-						  const IMAGE * const pRef,
-						  const IMAGE * const pRefH,
-						  const IMAGE * const pRefV,
-						  const IMAGE * const pRefHV,
-						  IMAGE * const pCurrent,
-						  int16_t dct_codes[6 * 64],
-						  const uint32_t width,
-						  const uint32_t height,
-						  const uint32_t edged_width,
-						  const uint32_t rounding);
 
+void
+MBMotionCompensation(MACROBLOCK * const mb,
+					 const uint32_t i,
+					 const uint32_t j,
+					 const IMAGE * const ref,
+					 const IMAGE * const refh,
+					 const IMAGE * const refv,
+					 const IMAGE * const refhv,
+					 const IMAGE * const refGMC,
+					 IMAGE * const cur,
+					 int16_t * dct_codes,
+					 const uint32_t width,
+					 const uint32_t height,
+					 const uint32_t edged_width,
+					 const int32_t quarterpel,
+					 const int reduced_resolution,
+					 const int32_t rounding);
 
 /** MBTransQuant.c **/
 
@@ -73,18 +77,95 @@
 	);
 
 
-uint8_t MBTransQuantInter(const MBParam * pParam,	/* <-- the parameter for DCT transformation and Quantization */
+void MBTransQuantIntra2(const MBParam * pParam,
+					   FRAMEINFO * frame,
+					   MACROBLOCK * pMB,
+					   const uint32_t x_pos,	/* <-- The x position of the MB to be searched */
+
+					   const uint32_t y_pos,	/* <-- The y position of the MB to be searched */
+
+					   int16_t data[6 * 64],	/* <-> the data of the MB to be coded */
 
+					   int16_t qcoeff[6 * 64]	/* <-> the quantized DCT coefficients */
+	);
+
+
+uint8_t MBTransQuantInter(const MBParam * pParam,
 						  FRAMEINFO * frame,
 						  MACROBLOCK * pMB,
-						  const uint32_t x_pos,	/* <-- The x position of the MB to be searched */
+						  const uint32_t x_pos,
+						  const uint32_t y_pos,
+						  int16_t data[6 * 64],
+						  int16_t qcoeff[6 * 64]);
 
-						  const uint32_t y_pos,	/* <-- The y position of the MB to be searched */
 
-						  int16_t data[6 * 64],	/* <-> the data of the MB to be coded */
+uint8_t MBTransQuantInter2(const MBParam * pParam,
+						  FRAMEINFO * frame,
+						  MACROBLOCK * pMB,
+						  const uint32_t x_pos,
+						  const uint32_t y_pos,	
+						  int16_t data[6 * 64],
+						  int16_t qcoeff[6 * 64]);
+
+uint8_t MBTransQuantInterBVOP(const MBParam * pParam,
+						  FRAMEINFO * frame,
+						  MACROBLOCK * pMB,
+						  int16_t data[6 * 64],
+						  int16_t qcoeff[6 * 64]);
+
+void MBTrans(const MBParam * pParam,
+						  FRAMEINFO * frame,
+						  MACROBLOCK * pMB,
+						  const uint32_t x_pos,
+						  const uint32_t y_pos,
+						  int16_t data[6 * 64]);
+
+void MBfDCT(const MBParam * pParam,
+			FRAMEINFO * frame,
+			MACROBLOCK * pMB,
+			int16_t data[6 * 64]);
+
+uint8_t MBQuantInter(	 const MBParam * pParam,
+						 const int iQuant,
+						 int16_t data[6 * 64],
+						 int16_t qcoeff[6 * 64]);
+
+void MBQuantDeQuantIntra(const MBParam * pParam,
+					  	 FRAMEINFO * frame,
+						 MACROBLOCK *pMB,
+				  		 int16_t qcoeff[6 * 64],
+  				  		 int16_t data[6*64]);
+
+void MBQuantIntra(		 const MBParam * pParam,
+					  	 FRAMEINFO * frame,
+						 MACROBLOCK *pMB,
+				  		 int16_t qcoeff[6 * 64],
+				  		 int16_t data[6*64]);
+
+void MBDeQuantIntra(const MBParam * pParam,
+			   		const int iQuant,
+				  	int16_t qcoeff[6 * 64],
+				  	int16_t data[6*64]);
+
+void MBDeQuantInter(const MBParam * pParam,
+					const int iQuant,
+					int16_t data[6 * 64],
+					int16_t qcoeff[6 * 64],
+				  	const uint8_t cbp);
+
+
+void MBiDCT(		int16_t data[6 * 64], 
+					const uint8_t cbp);
+
+
+void MBTransAdd(	const MBParam * pParam,
+					FRAMEINFO * frame,
+					MACROBLOCK * pMB,
+					const uint32_t x_pos,
+					const uint32_t y_pos,
+					int16_t data[6 * 64],
+					const uint8_t cbp);
 
-						  int16_t qcoeff[6 * 64]	/* <-> the quantized DCT coefficients */
-	);
 
 
 /** interlacing **/
@@ -92,12 +173,25 @@
 uint32_t MBDecideFieldDCT(int16_t data[6 * 64]);	/* <- decide whether to use field-based DCT
 													   for interlacing */
 
+typedef uint32_t (MBFIELDTEST) (int16_t data[6 * 64]);	/* function pointer for field test */
+typedef MBFIELDTEST *MBFIELDTEST_PTR;
+
+/* global field test pointer for xvid.c */
+extern MBFIELDTEST_PTR MBFieldTest;
+
+/* field test implementations */
+MBFIELDTEST MBFieldTest_c;
+MBFIELDTEST MBFieldTest_mmx;
+
 void MBFrameToField(int16_t data[6 * 64]);	/* de-interlace vertical Y blocks */
 
 
 /** MBCoding.c **/
 
-void MBCoding(const FRAMEINFO * frame,	/* <-- the parameter for coding of the bitstream */
+/* void MBSkip(Bitstream * bs);  just the bitstream. Since MB is skipped, no info is needed */
+
+
+void MBCoding(const FRAMEINFO * const frame,	/* <-- the parameter for coding of the bitstream */
 
 			  MACROBLOCK * pMB,	/* <-- Info of the MB to be coded */