--- trunk/xvidcore/src/xvid.c 2004/07/15 10:09:30 1493 +++ trunk/xvidcore/src/xvid.c 2008/11/27 00:47:03 1805 @@ -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: xvid.c,v 1.54 2004-07-15 10:08:21 suxen_drol Exp $ + * $Id: xvid.c,v 1.76 2008-11-27 00:47:03 Isibaar Exp $ * ****************************************************************************/ @@ -36,11 +36,11 @@ #include "dct/fdct.h" #include "image/colorspace.h" #include "image/interpolate8x8.h" -#include "image/reduced.h" #include "utils/mem_transfer.h" #include "utils/mbfunctions.h" #include "quant/quant.h" #include "motion/motion.h" +#include "motion/gmc.h" #include "motion/sad.h" #include "utils/emms.h" #include "utils/timer.h" @@ -52,9 +52,9 @@ unsigned int xvid_debug = 0; /* xvid debug mask */ #endif -#if defined(ARCH_IS_IA32) && defined(_MSC_VER) +#if (defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)) && defined(_MSC_VER) # include -#elif defined(ARCH_IS_IA32) || defined(ARCH_IS_PPC) +#elif defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) || defined(ARCH_IS_PPC) # include # include @@ -77,7 +77,7 @@ * 0 : SIGILL was *not* signalled * 1 : SIGILL was signalled */ -#if defined(ARCH_IS_IA32) && defined(_MSC_VER) +#if (defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)) && defined(_MSC_VER) static int sigill_check(void (*func)()) { @@ -90,7 +90,7 @@ } return(0); } -#elif defined(ARCH_IS_IA32) || defined(ARCH_IS_PPC) +#elif defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) || defined(ARCH_IS_PPC) static int sigill_check(void (*func)()) { @@ -127,18 +127,18 @@ /* detect cpu flags */ static unsigned int -detect_cpu_flags() +detect_cpu_flags(void) { /* enable native assembly optimizations by default */ unsigned int cpu_flags = XVID_CPU_ASM; -#if defined(ARCH_IS_IA32) +#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) cpu_flags |= check_cpu_features(); 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; + if ((cpu_flags & (XVID_CPU_SSE2|XVID_CPU_SSE3|XVID_CPU_SSE41)) && sigill_check(sse2_os_trigger)) + cpu_flags &= ~(XVID_CPU_SSE2|XVID_CPU_SSE3|XVID_CPU_SSE41); #endif #if defined(ARCH_IS_PPC) @@ -184,7 +184,7 @@ idct = idct_int32; /* Only needed on PPC Altivec archs */ - sadInit = 0; + sadInit = NULL; /* Restore FPU context : emms_c is a nop functions */ emms = emms_c; @@ -211,8 +211,10 @@ transfer_8to16sub = transfer_8to16sub_c; transfer_8to16subro = transfer_8to16subro_c; transfer_8to16sub2 = transfer_8to16sub2_c; + transfer_8to16sub2ro = transfer_8to16sub2ro_c; transfer_16to8add = transfer_16to8add_c; transfer8x8_copy = transfer8x8_copy_c; + transfer8x4_copy = transfer8x4_copy_c; /* Interlacing functions */ MBFieldTest = MBFieldTest_c; @@ -222,6 +224,15 @@ interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_c; interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_c; + interpolate8x4_halfpel_h = interpolate8x4_halfpel_h_c; + interpolate8x4_halfpel_v = interpolate8x4_halfpel_v_c; + interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_c; + + interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_c; + interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_c; + interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_c; + interpolate8x8_halfpel_hv_add = interpolate8x8_halfpel_hv_add_c; + interpolate16x16_lowpass_h = interpolate16x16_lowpass_h_c; interpolate16x16_lowpass_v = interpolate16x16_lowpass_v_c; interpolate16x16_lowpass_hv = interpolate16x16_lowpass_hv_c; @@ -239,14 +250,6 @@ /* postprocessing */ image_brightness = image_brightness_c; - /* reduced resolution */ - copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_C; - add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_C; - vfilter_31 = xvid_VFilter_31_C; - hfilter_31 = xvid_HFilter_31_C; - filter_18x18_to_8x8 = xvid_Filter_18x18_To_8x8_C; - filter_diff_18x18_to_8x8 = xvid_Filter_Diff_18x18_To_8x8_C; - /* Initialize internal colorspace transformation tables */ colorspace_init(); @@ -254,6 +257,7 @@ yv12_to_yv12 = yv12_to_yv12_c; rgb555_to_yv12 = rgb555_to_yv12_c; rgb565_to_yv12 = rgb565_to_yv12_c; + rgb_to_yv12 = rgb_to_yv12_c; bgr_to_yv12 = bgr_to_yv12_c; bgra_to_yv12 = bgra_to_yv12_c; abgr_to_yv12 = abgr_to_yv12_c; @@ -275,6 +279,7 @@ /* All colorspace transformation functions YV12->User format */ yv12_to_rgb555 = yv12_to_rgb555_c; yv12_to_rgb565 = yv12_to_rgb565_c; + yv12_to_rgb = yv12_to_rgb_c; yv12_to_bgr = yv12_to_bgr_c; yv12_to_bgra = yv12_to_bgra_c; yv12_to_abgr = yv12_to_abgr_c; @@ -304,16 +309,14 @@ sse8_16bit = sse8_16bit_c; sse8_8bit = sse8_8bit_c; -#if defined(ARCH_IS_IA32) + init_GMC(cpu_flags); - if ((cpu_flags & XVID_CPU_ASM)) { - vfilter_31 = xvid_VFilter_31_x86; - hfilter_31 = xvid_HFilter_31_x86; - } +#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64) if ((cpu_flags & XVID_CPU_MMX) || (cpu_flags & XVID_CPU_MMXEXT) || (cpu_flags & XVID_CPU_3DNOW) || (cpu_flags & XVID_CPU_3DNOWEXT) || - (cpu_flags & XVID_CPU_SSE) || (cpu_flags & XVID_CPU_SSE2)) + (cpu_flags & XVID_CPU_SSE) || (cpu_flags & XVID_CPU_SSE2) || + (cpu_flags & XVID_CPU_SSE3) || (cpu_flags & XVID_CPU_SSE41)) { /* Restore FPU context : emms_c is a nop functions */ emms = emms_mmx; @@ -331,15 +334,15 @@ /* Quantization related functions */ quant_h263_intra = quant_h263_intra_mmx; - quant_h263_inter = quant_h263_inter_mmx; + quant_h263_inter = quant_h263_inter_mmx; dequant_h263_intra = dequant_h263_intra_mmx; dequant_h263_inter = dequant_h263_inter_mmx; - quant_mpeg_intra = quant_mpeg_intra_mmx; quant_mpeg_inter = quant_mpeg_inter_mmx; dequant_mpeg_intra = dequant_mpeg_intra_mmx; dequant_mpeg_inter = dequant_mpeg_inter_mmx; + /* Block related functions */ transfer_8to16copy = transfer_8to16copy_mmx; transfer_16to8copy = transfer_16to8copy_mmx; @@ -348,6 +351,7 @@ transfer_8to16sub2 = transfer_8to16sub2_mmx; transfer_16to8add = transfer_16to8add_mmx; transfer8x8_copy = transfer8x8_copy_mmx; + transfer8x4_copy = transfer8x4_copy_mmx; /* Interlacing Functions */ MBFieldTest = MBFieldTest_mmx; @@ -357,6 +361,15 @@ interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_mmx; interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_mmx; + interpolate8x4_halfpel_h = interpolate8x4_halfpel_h_mmx; + interpolate8x4_halfpel_v = interpolate8x4_halfpel_v_mmx; + interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_mmx; + + interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_mmx; + interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_mmx; + interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_mmx; + interpolate8x8_halfpel_hv_add = interpolate8x8_halfpel_hv_add_mmx; + interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_mmx; interpolate8x8_6tap_lowpass_v = interpolate8x8_6tap_lowpass_v_mmx; @@ -366,17 +379,14 @@ /* postprocessing */ image_brightness = image_brightness_mmx; - /* reduced resolution */ - copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_mmx; - add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_mmx; - hfilter_31 = xvid_HFilter_31_mmx; - filter_18x18_to_8x8 = xvid_Filter_18x18_To_8x8_mmx; - filter_diff_18x18_to_8x8 = xvid_Filter_Diff_18x18_To_8x8_mmx; - /* image input xxx_to_yv12 related functions */ + yv12_to_yv12 = yv12_to_yv12_mmx; + bgr_to_yv12 = bgr_to_yv12_mmx; + rgb_to_yv12 = rgb_to_yv12_mmx; bgra_to_yv12 = bgra_to_yv12_mmx; + rgba_to_yv12 = rgba_to_yv12_mmx; yuyv_to_yv12 = yuyv_to_yv12_mmx; uyvy_to_yv12 = uyvy_to_yv12_mmx; @@ -412,6 +422,7 @@ yuyv_to_yv12 = yuyv_to_yv12_3dn; uyvy_to_yv12 = uyvy_to_yv12_3dn; + } @@ -425,23 +436,28 @@ interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_xmm; interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_xmm; interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm; + + interpolate8x4_halfpel_h = interpolate8x4_halfpel_h_xmm; + interpolate8x4_halfpel_v = interpolate8x4_halfpel_v_xmm; + interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_xmm; + + interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_xmm; + interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_xmm; + interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_xmm; + interpolate8x8_halfpel_hv_add = interpolate8x8_halfpel_hv_add_xmm; - /* reduced resolution */ - copy_upsampled_8x8_16to8 = xvid_Copy_Upsampled_8x8_16To8_xmm; - add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_xmm; - - /* Quantization */ - quant_mpeg_intra = quant_mpeg_intra_xmm; + /* Quantization */ quant_mpeg_inter = quant_mpeg_inter_xmm; dequant_h263_intra = dequant_h263_intra_xmm; dequant_h263_inter = dequant_h263_inter_xmm; - /* Buffer transfer */ + /* Buffer transfer */ transfer_8to16sub2 = transfer_8to16sub2_xmm; + transfer_8to16sub2ro = transfer_8to16sub2ro_xmm; /* Colorspace transformation */ - yv12_to_yv12 = yv12_to_yv12_xmm; + /* yv12_to_yv12 = yv12_to_yv12_xmm; */ /* appears to be slow on many machines */ yuyv_to_yv12 = yuyv_to_yv12_xmm; uyvy_to_yv12 = uyvy_to_yv12_xmm; @@ -460,6 +476,10 @@ interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_3dn; interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dn; interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dn; + + interpolate8x4_halfpel_h = interpolate8x4_halfpel_h_3dn; + interpolate8x4_halfpel_v = interpolate8x4_halfpel_v_3dn; + interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_3dn; } if ((cpu_flags & XVID_CPU_3DNOWEXT)) { @@ -471,6 +491,7 @@ transfer_8to16subro = transfer_8to16subro_3dne; transfer_16to8add = transfer_16to8add_3dne; transfer8x8_copy = transfer8x8_copy_3dne; + transfer8x4_copy = transfer8x4_copy_3dne; if ((cpu_flags & XVID_CPU_MMXEXT)) { /* Inverse DCT */ @@ -484,7 +505,11 @@ interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_3dne; interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne; - /* Quantization */ + interpolate8x4_halfpel_h = interpolate8x4_halfpel_h_3dne; + interpolate8x4_halfpel_v = interpolate8x4_halfpel_v_3dne; + interpolate8x4_halfpel_hv = interpolate8x4_halfpel_hv_3dne; + + /* Quantization */ quant_h263_intra = quant_h263_intra_3dne; /* cmov only */ quant_h263_inter = quant_h263_inter_3dne; dequant_mpeg_intra = dequant_mpeg_intra_3dne; /* cmov only */ @@ -492,9 +517,7 @@ dequant_h263_intra = dequant_h263_intra_3dne; dequant_h263_inter = dequant_h263_inter_3dne; - /* ME functions */ - calc_cbp = calc_cbp_3dne; - + /* ME functions */ sad16 = sad16_3dne; sad8 = sad8_3dne; sad16bi = sad16bi_3dne; @@ -502,7 +525,7 @@ dev16 = dev16_3dne; } } - + if ((cpu_flags & XVID_CPU_SSE2)) { calc_cbp = calc_cbp_sse2; @@ -517,13 +540,22 @@ sad16 = sad16_sse2; dev16 = dev16_sse2; - /* DCT operators - * no iDCT because it's not "Walken matching" */ + /* DCT operators */ fdct = fdct_sse2_skal; + idct = idct_sse2_skal; /* Is now IEEE1180 and Walken compliant. */ /* postprocessing */ image_brightness = image_brightness_sse2; + + } + + if ((cpu_flags & XVID_CPU_SSE3)) { + + /* SAD operators */ + sad16 = sad16_sse3; + dev16 = dev16_sse3; } + #endif /* ARCH_IS_IA32 */ #if defined(ARCH_IS_IA64) @@ -555,10 +587,10 @@ #if defined(ARCH_IS_PPC) if ((cpu_flags & XVID_CPU_ALTIVEC)) { /* sad operators */ - sad16 = sad16_altivec_c; - sad16bi = sad16bi_altivec_c; - sad8 = sad8_altivec_c; - dev16 = dev16_altivec_c; + sad16 = sad16_altivec_c; + sad16bi = sad16bi_altivec_c; + sad8 = sad8_altivec_c; + dev16 = dev16_altivec_c; sse8_16bit = sse8_16bit_altivec_c; @@ -578,11 +610,14 @@ interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_altivec_c; interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_altivec_c; interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_altivec_c; - + interpolate8x8_avg2 = interpolate8x8_avg2_altivec_c; interpolate8x8_avg4 = interpolate8x8_avg4_altivec_c; - - interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_altivec_c; + + interpolate8x8_halfpel_add = interpolate8x8_halfpel_add_altivec_c; + interpolate8x8_halfpel_h_add = interpolate8x8_halfpel_h_add_altivec_c; + interpolate8x8_halfpel_v_add = interpolate8x8_halfpel_v_add_altivec_c; + interpolate8x8_halfpel_hv_add = interpolate8x8_halfpel_hv_add_altivec_c; /* Colorspace conversion */ bgra_to_yv12 = bgra_to_yv12_altivec_c; @@ -601,6 +636,13 @@ quant_h263_inter = quant_h263_inter_altivec_c; dequant_h263_intra = dequant_h263_intra_altivec_c; dequant_h263_inter = dequant_h263_inter_altivec_c; + + dequant_mpeg_intra = dequant_mpeg_intra_altivec_c; + dequant_mpeg_inter = dequant_mpeg_inter_altivec_c; + + /* Qpel stuff */ + xvid_QP_Funcs = &xvid_QP_Funcs_Altivec_C; + xvid_QP_Add_Funcs = &xvid_QP_Add_Funcs_Altivec_C; } #endif @@ -619,13 +661,26 @@ return XVID_ERR_VERSION; info->actual_version = XVID_VERSION; - info->build = "xvid-1.1-cvshead"; + info->build = "xvid-1.2.0-dev"; info->cpu_flags = detect_cpu_flags(); + info->num_threads = 0; -#if defined(_SMP) && defined(WIN32) - info->num_threads = pthread_num_processors_np();; +#if defined(_WIN32) + { + DWORD dwProcessAffinityMask, dwSystemAffinityMask; + if (GetProcessAffinityMask(GetCurrentProcess(), (PDWORD_PTR) &dwProcessAffinityMask, (PDWORD_PTR) &dwSystemAffinityMask)) { + int i; + for(i=0; i<32; i++) { + if ((dwProcessAffinityMask & (1<num_threads++; + } + } + } #else - info->num_threads = 0; + + #include + info->num_threads = sysconf(_SC_NPROCESSORS_CONF); + #endif return 0;