--- xvid.c 2002/06/16 19:53:44 1.19 +++ xvid.c 2002/10/05 21:33:39 1.33.2.6 @@ -27,15 +27,17 @@ * 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.19 2002/06/16 19:53:44 edgomez Exp $ + * $Id: xvid.c,v 1.33.2.6 2002/10/05 21:33:39 Isibaar Exp $ * ****************************************************************************/ @@ -48,13 +50,82 @@ #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" #include "motion/sad.h" #include "utils/emms.h" #include "utils/timer.h" #include "bitstream/mbcoding.h" +#if defined(ARCH_X86) && defined(EXPERIMENTAL_SSE2_CODE) + +#ifdef WIN32 +#include +#else +#include +#include +#endif + + +#ifndef WIN32 + +static jmp_buf mark; + +static void +sigill_handler(int signal) +{ + longjmp(mark, 1); +} +#endif + + +/* +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)()) +{ +#ifdef WIN32 + _try { + func(); + } + _except(EXCEPTION_EXECUTE_HANDLER) { + + if (_exception_code() == STATUS_ILLEGAL_INSTRUCTION) + return 1; + } + return 0; +#else + void * old_handler; + int jmpret; + + + old_handler = signal(SIGILL, sigill_handler); + if (old_handler == SIG_ERR) + { + return -1; + } + + jmpret = setjmp(mark); + if (jmpret == 0) + { + func(); + } + + signal(SIGILL, old_handler); + + return jmpret; +#endif +} +#endif + /***************************************************************************** * XviD Init Entry point * @@ -80,19 +151,39 @@ init_param = (XVID_INIT_PARAM *) param1; + /* Inform the client the API version */ + init_param->api_version = API_VERSION; + + /* Inform the client the core build - unused because we're still alpha */ + init_param->core_build = 1000; + /* Do we have to force CPU features ? */ - if ((init_param->cpu_flags & XVID_CPU_FORCE) > 0) { + if ((init_param->cpu_flags & XVID_CPU_FORCE)) { + cpu_flags = init_param->cpu_flags; + } else { -#ifdef ARCH_X86 cpu_flags = check_cpu_features(); -#else - cpu_flags = 0; + +#if defined(ARCH_X86) && defined(EXPERIMENTAL_SSE2_CODE) + if ((cpu_flags & XVID_CPU_SSE) && sigill_check(sse_os_trigger)) + cpu_flags &= ~XVID_CPU_SSE; + + if ((cpu_flags & XVID_CPU_SSE2) && sigill_check(sse2_os_trigger)) + cpu_flags &= ~XVID_CPU_SSE2; #endif + } + + if ((init_param->cpu_flags & XVID_CPU_CHKONLY)) + { init_param->cpu_flags = cpu_flags; + return XVID_ERR_OK; } + init_param->cpu_flags = cpu_flags; + + /* Initialize the function pointers */ idct_int32_init(); init_vlc_tables(); @@ -126,11 +217,24 @@ 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; + 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(); @@ -155,9 +259,13 @@ /* Functions used in motion estimation algorithms */ calc_cbp = calc_cbp_c; sad16 = sad16_c; - sad16bi = sad16bi_c; sad8 = sad8_c; + sad16bi = sad16bi_c; + sad8bi = sad8bi_c; dev16 = dev16_c; + sad16v = sad16v_c; + +// Halfpel8_Refine = Halfpel8_Refine_c; #ifdef ARCH_X86 if ((cpu_flags & XVID_CPU_MMX) > 0) { @@ -184,14 +292,24 @@ transfer_8to16copy = transfer_8to16copy_mmx; transfer_16to8copy = transfer_16to8copy_mmx; transfer_8to16sub = transfer_8to16sub_mmx; + transfer_8to16sub2 = transfer_8to16sub2_mmx; 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; @@ -209,10 +327,22 @@ calc_cbp = calc_cbp_mmx; sad16 = sad16_mmx; sad8 = sad8_mmx; + sad16bi = sad16bi_mmx; + sad8bi = sad8bi_mmx; dev16 = dev16_mmx; + sad16v = sad16v_mmx; + + } + + /* these 3dnow functions are faster than mmx, but slower than xmm. */ + if ((cpu_flags & XVID_CPU_3DNOW) > 0) { + /* ME functions */ + sad16bi = sad16bi_3dn; + sad8bi = sad8bi_3dn; } + if ((cpu_flags & XVID_CPU_MMXEXT) > 0) { /* Inverse DCT */ @@ -223,6 +353,10 @@ interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_xmm; interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm; + /* Quantization */ + dequant_intra = dequant_intra_xmm; + dequant_inter = dequant_inter_xmm; + /* Buffer transfer */ transfer_8to16sub2 = transfer_8to16sub2_xmm; @@ -232,7 +366,11 @@ /* ME functions */ sad16 = sad16_xmm; sad8 = sad8_xmm; + sad16bi = sad16bi_xmm; + sad8bi = sad8bi_xmm; dev16 = dev16_xmm; + sad16v = sad16v_xmm; + fprintf(stderr,"sad16v=XMM\n"); } @@ -247,6 +385,8 @@ if ((cpu_flags & XVID_CPU_SSE2) > 0) { #ifdef EXPERIMENTAL_SSE2_CODE + calc_cbp = calc_cbp_sse2; + /* Quantization */ quant_intra = quant_intra_sse2; dequant_intra = dequant_intra_sse2; @@ -254,7 +394,6 @@ dequant_inter = dequant_inter_sse2; /* ME */ - calc_cbp = calc_cbp_sse2; sad16 = sad16_sse2; dev16 = dev16_sse2; @@ -278,6 +417,7 @@ sad16bi = sad16bi_ia64; sad8 = sad8_ia64; dev16 = dev16_ia64; +// Halfpel8_Refine = Halfpel8_Refine_ia64; quant_intra = quant_intra_ia64; dequant_intra = dequant_intra_ia64; quant_inter = quant_inter_ia64; @@ -306,12 +446,6 @@ #endif #endif - /* Inform the client the API version */ - init_param->api_version = API_VERSION; - - /* Inform the client the core build - unused because we're still alpha */ - init_param->core_build = 1000; - return XVID_ERR_OK; } @@ -365,6 +499,12 @@ { 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);