--- mbfunctions.h	2002/03/08 02:44:58	1.1
+++ mbfunctions.h	2003/09/10 22:19:00	1.17.2.6
@@ -1,14 +1,27 @@
-/**************************************************************************
+/*****************************************************************************
  *
- *  Modifications:
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - MB related header  -
  *
- *  02.12.2001 motion estimation/compensation split
- *  16.11.2001 const/uint32_t changes to MBMotionEstComp()
- *  26.08.2001 added inter4v_mode parameter to MBMotionEstComp()
+ *  Copyright(C) 2001 Michael Militzer <isibaar@xvid.org>
  *
- *  Michael Militzer <isibaar@videocoding.de>
+ *  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: mbfunctions.h,v 1.17.2.6 2003/09/10 22:19:00 edgomez Exp $
+ *
+ ****************************************************************************/
 
 #ifndef _ENCORE_BLOCK_H
 #define _ENCORE_BLOCK_H
@@ -17,68 +30,53 @@
 #include "../bitstream/bitstream.h"
 
 
-
-/** MotionEstimation **/
-
-bool MotionEstimation(
-			MACROBLOCK * const pMBs,
-			MBParam * const pParam,
-		    const IMAGE * const pRef,
-			const IMAGE * const pRefH,
-		    const IMAGE * const pRefV,
-			const IMAGE * const pRefHV,
-		    IMAGE * const pCurrent, 
-			const uint32_t iLimit);
-
-
-/** 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[][64],
-			const uint32_t width, 
-			const uint32_t height,
-			const uint32_t edged_width,
-			const uint32_t rounding);
-
-
 /** MBTransQuant.c **/
 
 
-void MBTransQuantIntra(const MBParam *pParam,	 
-		       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[][64],	 /* <-> the data of the MB to be coded */ 
-		       int16_t qcoeff[][64], 	 /* <-> the quantized DCT coefficients */ 
-		       IMAGE * const pCurrent         /* <-> the reconstructed image ( function will update one
-   	         							    MB in it with data from data[] ) */
-);
-
-
-uint8_t MBTransQuantInter(const MBParam *pParam, /* <-- the parameter for DCT transformation 
-						 						   and Quantization */ 
-			   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[][64], 	 /* <-> the data of the MB to be coded */ 
-			   int16_t qcoeff[][64], /* <-> the quantized DCT coefficients */ 
-			   IMAGE * const pCurrent		 /* <-> the reconstructed image ( function will
-								    update one MB in it with data from data[] ) */
-);
+void MBTransQuantIntra(const MBParam * const pParam,
+					const FRAMEINFO * const frame,
+					MACROBLOCK * const 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 * const pParam,
+						const FRAMEINFO * const frame,
+						MACROBLOCK * const 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,
+						  const uint32_t x_pos,
+						  const uint32_t y_pos,
+						  int16_t data[6 * 64],
+						  int16_t qcoeff[6 * 64]);
+
+
+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 MBParam *pParam,	 	 /* <-- the parameter for coding of the bitstream */
-	      MACROBLOCK *pMB, 		 /* <-- Info of the MB to be coded */ 
-	      int16_t qcoeff[][64], 		 /* <-- the quantized DCT coefficients */ 
-	      Bitstream * bs, 			 /* <-> the bitstream */ 
-	      Statistics * pStat		 /* <-> statistical data collected for current frame */
-    );
+void MBCoding(const FRAMEINFO * const frame,	/* <-- the parameter for coding of the bitstream */
+			MACROBLOCK * pMB,	/* <-- Info of the MB to be coded */
+			int16_t qcoeff[6 * 64],	/* <-- the quantized DCT coefficients */
+			Bitstream * bs,	/* <-> the bitstream */
+			Statistics * pStat);	/* <-> statistical data collected for current frame */
 
 #endif