--- xvid.c 2002/07/23 12:59:57 1.33 +++ xvid.c 2002/09/25 16:51:05 1.33.2.3 @@ -37,7 +37,7 @@ * - 22.12.2001 API change: added xvid_init() - Isibaar * - 16.12.2001 inital version; (c)2001 peter ross * - * $Id: xvid.c,v 1.33 2002/07/23 12:59:57 suxen_drol Exp $ + * $Id: xvid.c,v 1.33.2.3 2002/09/25 16:51:05 h Exp $ * ****************************************************************************/ @@ -50,6 +50,7 @@ #include "image/colorspace.h" #include "image/interpolate8x8.h" #include "utils/mem_transfer.h" +#include "utils/mbfunctions.h" #include "quant/quant_h263.h" #include "quant/quant_mpeg4.h" #include "motion/motion.h" @@ -216,6 +217,9 @@ transfer_16to8add = transfer_16to8add_c; transfer8x8_copy = transfer8x8_copy_c; + /* Interlacing functions */ + MBFieldTest = MBFieldTest_c; + /* Image interpolation related functions */ interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_c; interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_c; @@ -249,8 +253,9 @@ sad16bi = sad16bi_c; sad8bi = sad8bi_c; dev16 = dev16_c; + sad16v = sad16v_c; - Halfpel8_Refine = Halfpel8_Refine_c; +// Halfpel8_Refine = Halfpel8_Refine_c; #ifdef ARCH_X86 if ((cpu_flags & XVID_CPU_MMX) > 0) { @@ -281,6 +286,8 @@ transfer_16to8add = transfer_16to8add_mmx; transfer8x8_copy = transfer8x8_copy_mmx; + /* Interlacing functions */ + MBFieldTest = MBFieldTest_mmx; /* Image Interpolation related functions */ interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_mmx; @@ -307,6 +314,7 @@ sad16bi = sad16bi_mmx; sad8bi = sad8bi_mmx; dev16 = dev16_mmx; + sad16v = sad16v_mmx; } @@ -345,6 +353,8 @@ sad16bi = sad16bi_xmm; sad8bi = sad8bi_xmm; dev16 = dev16_xmm; + sad16v = sad16v_xmm; + fprintf(stderr,"sad16v=XMM\n"); } @@ -391,7 +401,7 @@ sad16bi = sad16bi_ia64; sad8 = sad8_ia64; dev16 = dev16_ia64; - Halfpel8_Refine = Halfpel8_Refine_ia64; +// Halfpel8_Refine = Halfpel8_Refine_ia64; quant_intra = quant_intra_ia64; dequant_intra = dequant_intra_ia64; quant_inter = quant_inter_ia64;