--- xvid.c 2002/10/10 12:15:48 1.33.2.8 +++ xvid.c 2002/10/09 14:35:57 1.38 @@ -3,6 +3,8 @@ * XVID MPEG-4 VIDEO CODEC * - Native API implementation - * + * Copyright(C) 2001-2002 Peter Ross + * * This program is an implementation of a part of one or more MPEG-4 * Video tools as specified in ISO/IEC 14496-2 standard. Those intending * to use this software module in hardware or software products are @@ -26,18 +28,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ****************************************************************************/ - -/***************************************************************************** - * - * History - * - * - 23.06.2002 added XVID_CPU_CHKONLY - * - 17.03.2002 Added interpolate8x8_halfpel_hv_xmm - * - 22.12.2001 API change: added xvid_init() - Isibaar - * - 16.12.2001 inital version; (c)2001 peter ross - * - * $Id: xvid.c,v 1.33.2.8 2002/10/10 12:15:48 Isibaar Exp $ + * $Id: xvid.c,v 1.38 2002/10/09 14:35:57 ia64p Exp $ * ****************************************************************************/ @@ -50,7 +41,6 @@ #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" @@ -82,12 +72,12 @@ /* -calls the funcptr, and returns whether SIGILL (illegal instruction) was signalled -return values: --1 : could not determine -0 : SIGILL was *not* signalled -1 : SIGILL was signalled -*/ + * Calls the funcptr, and returns whether SIGILL (illegal instruction) was signalled + * Return values: + * -1 : could not determine + * 0 : SIGILL was *not* signalled + * 1 : SIGILL was signalled + */ int sigill_check(void (*func)()) @@ -217,28 +207,11 @@ 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; interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_c; - interpolate16x16_lowpass_h = interpolate16x16_lowpass_h_c; - interpolate16x16_lowpass_v = interpolate16x16_lowpass_v_c; - interpolate16x16_lowpass_hv = interpolate16x16_lowpass_hv_c; - - interpolate8x8_lowpass_h = interpolate8x8_lowpass_h_c; - interpolate8x8_lowpass_v = interpolate8x8_lowpass_v_c; - interpolate8x8_lowpass_hv = interpolate8x8_lowpass_hv_c; - - interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_c; - interpolate8x8_6tap_lowpass_v = interpolate8x8_6tap_lowpass_v_c; - - interpolate8x8_avg2 = interpolate8x8_avg2_c; - interpolate8x8_avg4 = interpolate8x8_avg4_c; - /* Initialize internal colorspace transformation tables */ colorspace_init(); @@ -256,8 +229,6 @@ yv12_to_rgb565 = yv12_to_rgb565_c; yv12_to_rgb24 = yv12_to_rgb24_c; yv12_to_rgb32 = yv12_to_rgb32_c; - yv12_to_abgr = yv12_to_abgr_c; - yv12_to_rgba = yv12_to_rgba_c; yv12_to_yuv = yv12_to_yuv_c; yv12_to_yuyv = yv12_to_yuyv_c; yv12_to_uyvy = yv12_to_uyvy_c; @@ -269,9 +240,8 @@ 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) { @@ -302,20 +272,12 @@ 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; interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_mmx; interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_mmx; - interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_mmx; - interpolate8x8_6tap_lowpass_v = interpolate8x8_6tap_lowpass_v_mmx; - - interpolate8x8_avg2 = interpolate8x8_avg2_mmx; - interpolate8x8_avg4 = interpolate8x8_avg4_mmx; - /* Image RGB->YV12 related functions */ rgb24_to_yv12 = rgb24_to_yv12_mmx; rgb32_to_yv12 = rgb32_to_yv12_mmx; @@ -336,7 +298,6 @@ sad16bi = sad16bi_mmx; sad8bi = sad8bi_mmx; dev16 = dev16_mmx; - sad16v = sad16v_mmx; } @@ -375,8 +336,6 @@ sad16bi = sad16bi_xmm; sad8bi = sad8bi_xmm; dev16 = dev16_xmm; - sad16v = sad16v_xmm; - fprintf(stderr,"sad16v=XMM\n"); } @@ -415,7 +374,7 @@ if ((cpu_flags & XVID_CPU_IA64) > 0) { //use assembler routines? idct_ia64_init(); fdct = fdct_ia64; - idct = idct_ia64; //not yet working, crashes + idct = idct_ia64; interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_ia64; interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_ia64; interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_ia64; @@ -423,7 +382,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; @@ -434,7 +393,7 @@ transfer_8to16sub2 = transfer_8to16sub2_ia64; transfer_16to8add = transfer_16to8add_ia64; transfer8x8_copy = transfer8x8_copy_ia64; - DEBUG("Using IA-64 assembler routines.\n"); +// DEBUG("Using IA-64 assembler routines.\n"); } #endif @@ -505,12 +464,6 @@ { switch (opt) { case XVID_ENC_ENCODE: -#ifdef BFRAMES - if (((Encoder *) handle)->mbParam.max_bframes >= 0) - return encoder_encode_bframes((Encoder *) handle, (XVID_ENC_FRAME *) param1, - (XVID_ENC_STATS *) param2); - else -#endif return encoder_encode((Encoder *) handle, (XVID_ENC_FRAME *) param1, (XVID_ENC_STATS *) param2);