--- mbfunctions.h 2003/06/28 15:48:08 1.17.2.5 +++ mbfunctions.h 2005/01/05 23:02:15 1.20 @@ -3,7 +3,7 @@ * XVID MPEG-4 VIDEO CODEC * - MB related header - * - * Copyright(C) 2001 Michael Militzer + * Copyright(C) 2001 Michael Militzer * * 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 @@ -19,7 +19,7 @@ * 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.5 2003/06/28 15:48:08 chl Exp $ + * $Id: mbfunctions.h,v 1.20 2005/01/05 23:02:15 edgomez Exp $ * ****************************************************************************/ @@ -29,80 +29,6 @@ #include "../encoder.h" #include "../bitstream/bitstream.h" -/** MotionEstimation **/ - -bool MotionEstimation(MBParam * const pParam, - FRAMEINFO * const current, - FRAMEINFO * const reference, - const IMAGE * const pRefH, - const IMAGE * const pRefV, - const IMAGE * const pRefHV, - const IMAGE * const pGMC, - const uint32_t iLimit); - - - -void -GMEanalysis(const MBParam * const pParam, - const FRAMEINFO * const current, - const FRAMEINFO * const reference, - const IMAGE * const pRefH, - const IMAGE * const pRefV, - const IMAGE * const pRefHV); - -WARPPOINTS -GlobalMotionEst(MACROBLOCK * const pMBs, - const MBParam * const pParam, - const FRAMEINFO * const current, - const FRAMEINFO * const reference, - const IMAGE * const pRefH, - const IMAGE * const pRefV, - const IMAGE * const pRefHV); - -int -GlobalMotionEstRefine( - WARPPOINTS *const startwp, - MACROBLOCK * const pMBs, - const MBParam * const pParam, - const FRAMEINFO * const current, - const FRAMEINFO * const reference, - const IMAGE * const pCurr, - const IMAGE * const pRef, - const IMAGE * const pRefH, - const IMAGE * const pRefV, - const IMAGE * const pRefHV); - -int -globalSAD(const WARPPOINTS *const wp, - const MBParam * const pParam, - const MACROBLOCK * const pMBs, - const FRAMEINFO * const current, - const IMAGE * const pRef, - const IMAGE * const pCurr, - uint8_t *const GMCblock); - - - - -/** MBMotionCompensation **/ - -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 **/ @@ -140,7 +66,14 @@ /* field test implementations */ MBFIELDTEST MBFieldTest_c; + +#ifdef ARCH_IS_IA32 MBFIELDTEST MBFieldTest_mmx; +#endif + +#ifdef ARCH_IS_X86_64 +MBFIELDTEST MBFieldTest_x86_64; +#endif void MBFrameToField(int16_t data[6 * 64]); /* de-interlace vertical Y blocks */