--- mbfunctions.h	2002/03/26 11:16:08	1.2
+++ mbfunctions.h	2002/08/09 19:58:42	1.9
@@ -2,6 +2,7 @@
  *
  *  Modifications:
  *
+ *  29.03.2002 removed MBFieldToFrame - no longer used (transfers instead)
  *  26.03.2002 interlacing support
  *  02.12.2001 motion estimation/compensation split
  *  16.11.2001 const/uint32_t changes to MBMotionEstComp()
@@ -21,77 +22,172 @@
 
 /** 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);
+bool MotionEstimation(MBParam * const pParam,
+					  FRAMEINFO * const current,
+					  FRAMEINFO * const reference,
+					  const IMAGE * const pRefH,
+					  const IMAGE * const pRefV,
+					  const IMAGE * const pRefHV,
+					  const uint32_t iLimit);
+
+
+bool SMP_MotionEstimation(MBParam * const pParam,
+                                          FRAMEINFO * const current,
+                                          FRAMEINFO * const reference,
+                                          const IMAGE * const pRefH,
+                                          const IMAGE * const pRefV,
+                                          const IMAGE * const pRefHV,
+                                          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);
+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);
 
 
 /** MBTransQuant.c **/
 
 
-void MBTransQuantIntra(const MBParam *pParam,	 
-			   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[][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 */ 
-			   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[][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 * 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 */
+	);
+
+
+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,
+						  const uint32_t y_pos,
+						  int16_t data[6 * 64],
+						  int16_t qcoeff[6 * 64]);
+
+
+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,
+						  const uint32_t x_pos,
+						  const uint32_t y_pos,	
+						  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);
 
 
-/** interlacing **/
 
-uint32_t MBDecideFieldDCT(int16_t data[][64]);	/* <- decide whether to use field-based DCT
-													for interlacing */
+/** interlacing **/
 
-void MBFrameToField(int16_t data[][64]);	/* de-interlace vertical Y blocks */
+uint32_t MBDecideFieldDCT(int16_t data[6 * 64]);	/* <- decide whether to use field-based DCT
+													   for interlacing */
 
-void MBFieldToFrame(int16_t data[][64]);	/* re-interlace vertical Y blocks */
+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 MBSkip(Bitstream * bs);  /* just the bitstream. Since MB is skipped, no info is needed */
+
+
+void MBCoding(const FRAMEINFO * 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