--- xvid.c 2003/06/11 14:10:55 1.47 +++ xvid.c 2004/03/22 22:36:23 1.48 @@ -3,6 +3,8 @@ * XVID MPEG-4 VIDEO CODEC * - Native API implementation - * + * Copyright(C) 2001-2003 Peter Ross + * * 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 * the Free Software Foundation ; either version 2 of the License, or @@ -17,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.47 2003/06/11 14:10:55 Isibaar Exp $ + * $Id: xvid.c,v 1.48 2004/03/22 22:36:23 edgomez Exp $ * ****************************************************************************/ @@ -37,16 +39,20 @@ #include "image/reduced.h" #include "utils/mem_transfer.h" #include "utils/mbfunctions.h" -#include "quant/quant_h263.h" -#include "quant/quant_mpeg4.h" +#include "quant/quant.h" #include "motion/motion.h" #include "motion/sad.h" #include "utils/emms.h" #include "utils/timer.h" #include "bitstream/mbcoding.h" +#include "image/qpel.h" +#include "image/postprocessing.h" -#if defined(ARCH_IS_IA32) +#if defined(_DEBUG) +unsigned int xvid_debug = 0; /* xvid debug mask */ +#endif +#if defined(ARCH_IS_IA32) #if defined(_MSC_VER) # include #else @@ -144,7 +150,7 @@ * to the CPU features forced by the library client or autodetected (depending * on the XVID_CPU_FORCE flag). It also initializes vlc coding tables and all * image colorspace transformation tables. - * + * * Returned value : XVID_ERR_OK * + API_VERSION in the input XVID_INIT_PARAM structure * + core build " " " " " @@ -152,35 +158,15 @@ ****************************************************************************/ -static -int xvid_init_init(XVID_INIT_PARAM * init_param) +static +int xvid_gbl_init(xvid_gbl_init_t * init) { - int cpu_flags; - - /* Inform the client the API version */ - init_param->api_version = API_VERSION; + unsigned int cpu_flags; - /* 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)) { - - cpu_flags = init_param->cpu_flags; - - } else { - - cpu_flags = detect_cpu_flags(); - } - - if ((init_param->cpu_flags & XVID_CPU_CHKONLY)) - { - init_param->cpu_flags = cpu_flags; - return XVID_ERR_OK; - } - - init_param->cpu_flags = cpu_flags; + if (XVID_VERSION_MAJOR(init->version) != 1) /* v1.x.x */ + return XVID_ERR_VERSION; + cpu_flags = (init->cpu_flags & XVID_CPU_FORCE) ? init->cpu_flags : detect_cpu_flags(); /* Initialize the function pointers */ idct_int32_init(); @@ -196,16 +182,21 @@ /* Restore FPU context : emms_c is a nop functions */ emms = emms_c; + /* Qpel stuff */ + xvid_QP_Funcs = &xvid_QP_Funcs_C; + xvid_QP_Add_Funcs = &xvid_QP_Add_Funcs_C; + xvid_Init_QP(); + /* Quantization functions */ - quant_intra = quant_intra_c; - dequant_intra = dequant_intra_c; - quant_inter = quant_inter_c; - dequant_inter = dequant_inter_c; - - quant4_intra = quant4_intra_c; - dequant4_intra = dequant4_intra_c; - quant4_inter = quant4_inter_c; - dequant4_inter = dequant4_inter_c; + quant_h263_intra = quant_h263_intra_c; + quant_h263_inter = quant_h263_inter_c; + dequant_h263_intra = dequant_h263_intra_c; + dequant_h263_inter = dequant_h263_inter_c; + + quant_mpeg_intra = quant_mpeg_intra_c; + quant_mpeg_inter = quant_mpeg_inter_c; + dequant_mpeg_intra = dequant_mpeg_intra_c; + dequant_mpeg_inter = dequant_mpeg_inter_c; /* Block transfer related functions */ transfer_8to16copy = transfer_8to16copy_c; @@ -238,7 +229,7 @@ interpolate8x8_avg2 = interpolate8x8_avg2_c; interpolate8x8_avg4 = interpolate8x8_avg4_c; - /* reduced resoltuion */ + /* 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; @@ -257,6 +248,7 @@ bgra_to_yv12 = bgra_to_yv12_c; abgr_to_yv12 = abgr_to_yv12_c; rgba_to_yv12 = rgba_to_yv12_c; + argb_to_yv12 = argb_to_yv12_c; yuyv_to_yv12 = yuyv_to_yv12_c; uyvy_to_yv12 = uyvy_to_yv12_c; @@ -266,10 +258,10 @@ bgrai_to_yv12 = bgrai_to_yv12_c; abgri_to_yv12 = abgri_to_yv12_c; rgbai_to_yv12 = rgbai_to_yv12_c; + argbi_to_yv12 = argbi_to_yv12_c; yuyvi_to_yv12 = yuyvi_to_yv12_c; uyvyi_to_yv12 = uyvyi_to_yv12_c; - /* All colorspace transformation functions YV12->User format */ yv12_to_rgb555 = yv12_to_rgb555_c; yv12_to_rgb565 = yv12_to_rgb565_c; @@ -277,33 +269,33 @@ yv12_to_bgra = yv12_to_bgra_c; yv12_to_abgr = yv12_to_abgr_c; yv12_to_rgba = yv12_to_rgba_c; + yv12_to_argb = yv12_to_argb_c; yv12_to_yuyv = yv12_to_yuyv_c; yv12_to_uyvy = yv12_to_uyvy_c; - + yv12_to_rgb555i = yv12_to_rgb555i_c; yv12_to_rgb565i = yv12_to_rgb565i_c; yv12_to_bgri = yv12_to_bgri_c; yv12_to_bgrai = yv12_to_bgrai_c; yv12_to_abgri = yv12_to_abgri_c; yv12_to_rgbai = yv12_to_rgbai_c; + yv12_to_argbi = yv12_to_argbi_c; yv12_to_yuyvi = yv12_to_yuyvi_c; yv12_to_uyvyi = yv12_to_uyvyi_c; /* Functions used in motion estimation algorithms */ - calc_cbp = calc_cbp_c; - sad16 = sad16_c; - sad8 = sad8_c; - sad16bi = sad16bi_c; - sad8bi = sad8bi_c; - dev16 = dev16_c; - sad16v = sad16v_c; - -/* Halfpel8_Refine = Halfpel8_Refine_c; */ + calc_cbp = calc_cbp_c; + sad16 = sad16_c; + sad8 = sad8_c; + sad16bi = sad16bi_c; + sad8bi = sad8bi_c; + dev16 = dev16_c; + sad16v = sad16v_c; + sse8_16bit = sse8_16bit_c; #if defined(ARCH_IS_IA32) - if ((cpu_flags & XVID_CPU_ASM)) - { + if ((cpu_flags & XVID_CPU_ASM)) { vfilter_31 = xvid_VFilter_31_x86; hfilter_31 = xvid_HFilter_31_x86; } @@ -319,19 +311,23 @@ if ((cpu_flags & XVID_CPU_MMX)) { /* Forward and Inverse Discrete Cosine Transformation functions */ - fdct = fdct_mmx; + fdct = fdct_mmx_skal; idct = idct_mmx; + /* Qpel stuff */ + xvid_QP_Funcs = &xvid_QP_Funcs_mmx; + xvid_QP_Add_Funcs = &xvid_QP_Add_Funcs_mmx; + /* Quantization related functions */ - quant_intra = quant_intra_mmx; - dequant_intra = dequant_intra_mmx; - quant_inter = quant_inter_mmx; - dequant_inter = dequant_inter_mmx; - - quant4_intra = quant4_intra_mmx; - dequant4_intra = dequant4_intra_mmx; - quant4_inter = quant4_inter_mmx; - dequant4_inter = dequant4_inter_mmx; + quant_h263_intra = quant_h263_intra_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; @@ -375,7 +371,7 @@ yv12_to_bgra = yv12_to_bgra_mmx; yv12_to_yuyv = yv12_to_yuyv_mmx; yv12_to_uyvy = yv12_to_uyvy_mmx; - + yv12_to_yuyvi = yv12_to_yuyvi_mmx; yv12_to_uyvyi = yv12_to_uyvyi_mmx; @@ -387,6 +383,7 @@ sad8bi = sad8bi_mmx; dev16 = dev16_mmx; sad16v = sad16v_mmx; + sse8_16bit = sse8_16bit_mmx; } /* these 3dnow functions are faster than mmx, but slower than xmm. */ @@ -405,7 +402,8 @@ if ((cpu_flags & XVID_CPU_MMXEXT)) { - /* Inverse DCT */ + /* DCT */ + fdct = fdct_xmm_skal; idct = idct_xmm; /* Interpolation */ @@ -418,11 +416,11 @@ add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_xmm; /* Quantization */ - quant4_intra = quant4_intra_xmm; - quant4_inter = quant4_inter_xmm; + quant_mpeg_intra = quant_mpeg_intra_xmm; + quant_mpeg_inter = quant_mpeg_inter_xmm; - dequant_intra = dequant_intra_xmm; - dequant_inter = dequant_inter_xmm; + dequant_h263_intra = dequant_h263_intra_xmm; + dequant_h263_inter = dequant_h263_inter_xmm; /* Buffer transfer */ transfer_8to16sub2 = transfer_8to16sub2_xmm; @@ -464,12 +462,12 @@ transfer8x8_copy = transfer8x8_copy_3dne; /* Quantization */ - dequant4_intra = dequant4_intra_3dne; - dequant4_inter = dequant4_inter_3dne; - quant_intra = quant_intra_3dne; - quant_inter = quant_inter_3dne; - dequant_intra = dequant_intra_3dne; - dequant_inter = dequant_inter_3dne; + quant_h263_intra = quant_h263_intra_3dne; + quant_h263_inter = quant_h263_inter_3dne; + dequant_mpeg_intra = dequant_mpeg_intra_3dne; + dequant_mpeg_inter = dequant_mpeg_inter_3dne; + dequant_h263_intra = dequant_h263_intra_3dne; + dequant_h263_inter = dequant_h263_inter_3dne; /* ME functions */ calc_cbp = calc_cbp_3dne; @@ -485,29 +483,25 @@ interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_3dne; } - if ((cpu_flags & XVID_CPU_SSE2)) { -#if defined(EXPERIMENTAL_SSE2_CODE) /* many people reported crashes with SSE2 */ - /* better deactivate it completely and fix everything */ - /* in dev-api-4 */ calc_cbp = calc_cbp_sse2; /* Quantization */ - quant_intra = quant_intra_sse2; - dequant_intra = dequant_intra_sse2; - quant_inter = quant_inter_sse2; - dequant_inter = dequant_inter_sse2; + quant_h263_intra = quant_h263_intra_sse2; + quant_h263_inter = quant_h263_inter_sse2; + dequant_h263_intra = dequant_h263_intra_sse2; + dequant_h263_inter = dequant_h263_inter_sse2; - /* ME; slower than xmm */ + /* SAD operators */ sad16 = sad16_sse2; dev16 = dev16_sse2; -#endif - /* Forward and Inverse DCT */ - /* idct = idct_sse2; - /* fdct = fdct_sse2; Both are none to be unprecise - better deactivate for now */ + + /* DCT operators + * no iDCT because it's not "Walken matching" */ + fdct = fdct_sse2_skal; } -#endif +#endif /* ARCH_IS_IA32 */ #if defined(ARCH_IS_IA64) if ((cpu_flags & XVID_CPU_ASM)) { /* use assembler routines? */ @@ -522,19 +516,18 @@ 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; - dequant_inter = dequant_inter_ia64; + quant_h263_intra = quant_h263_intra_ia64; + quant_h263_inter = quant_h263_inter_ia64; + dequant_h263_intra = dequant_h263_intra_ia64; + dequant_h263_inter = dequant_h263_inter_ia64; transfer_8to16copy = transfer_8to16copy_ia64; transfer_16to8copy = transfer_16to8copy_ia64; transfer_8to16sub = transfer_8to16sub_ia64; transfer_8to16sub2 = transfer_8to16sub2_ia64; transfer_16to8add = transfer_16to8add_ia64; transfer8x8_copy = transfer8x8_copy_ia64; - DPRINTF(DPRINTF_DEBUG, "Using IA-64 assembler routines."); } -#endif +#endif #if defined(ARCH_IS_PPC) if ((cpu_flags & XVID_CPU_ASM)) @@ -554,431 +547,102 @@ } #endif - return XVID_ERR_OK; -} - - - -static int -xvid_init_convert(XVID_INIT_CONVERTINFO* convert) -{ -/* - const int flip1 = - (convert->input.colorspace & XVID_CSP_VFLIP) ^ - (convert->output.colorspace & XVID_CSP_VFLIP); -*/ - const int width = convert->width; - const int height = convert->height; - const int width2 = convert->width/2; - const int height2 = convert->height/2; - IMAGE img; - - switch (convert->input.colorspace & ~XVID_CSP_VFLIP) - { - case XVID_CSP_YV12 : - img.y = convert->input.y; - img.v = (uint8_t*)convert->input.y + width*height; - img.u = (uint8_t*)convert->input.y + width*height + width2*height2; - image_output(&img, width, height, width, - convert->output.y, convert->output.y_stride, - convert->output.colorspace, convert->interlacing); - break; - - default : - return XVID_ERR_FORMAT; - } - - - emms(); - return XVID_ERR_OK; -} - - - -void fill8(uint8_t * block, int size, int value) -{ - int i; - for (i = 0; i < size; i++) - block[i] = value; -} +#if defined(_DEBUG) + xvid_debug = init->debug; +#endif -void fill16(int16_t * block, int size, int value) -{ - int i; - for (i = 0; i < size; i++) - block[i] = value; + return 0; } -#define RANDOM(min,max) min + (rand() % (max-min)) -void random8(uint8_t * block, int size, int min, int max) +static int +xvid_gbl_info(xvid_gbl_info_t * info) { - int i; - for (i = 0; i < size; i++) - block[i] = RANDOM(min,max); -} + if (XVID_VERSION_MAJOR(info->version) != 1) /* v1.x.x */ + return XVID_ERR_VERSION; -void random16(int16_t * block, int size, int min, int max) -{ - int i; - for (i = 0; i < size; i++) - block[i] = RANDOM(min,max); -} + info->actual_version = XVID_VERSION; + info->build = "xvid-1.0.0"; + info->cpu_flags = detect_cpu_flags(); -int compare16(const int16_t * blockA, const int16_t * blockB, int size) -{ - int i; - for (i = 0; i < size; i++) - if (blockA[i] != blockB[i]) - return 1; +#if defined(_SMP) && defined(WIN32) + info->num_threads = pthread_num_processors_np();; +#else + info->num_threads = 0; +#endif return 0; } -int diff16(const int16_t * blockA, const int16_t * blockB, int size) -{ - int i, diff = 0; - for (i = 0; i < size; i++) - diff += ABS(blockA[i]-blockB[i]); - return diff; -} - - -#define XVID_TEST_RANDOM 0x00000001 /* random input data */ -#define XVID_TEST_VERBOSE 0x00000002 /* verbose error output */ - -#define TEST_FORWARD 0x00000001 /* intra */ -#define TEST_FDCT (TEST_FORWARD) -#define TEST_IDCT (0) - -static int test_transform(void * funcA, void * funcB, const char * nameB, - int test, int flags) +static int +xvid_gbl_convert(xvid_gbl_convert_t* convert) { - int i; - int64_t timeSTART; - int64_t timeA = 0; - int64_t timeB = 0; - DECLARE_ALIGNED_MATRIX(arrayA, 1, 64, int16_t, CACHE_LINE); - DECLARE_ALIGNED_MATRIX(arrayB, 1, 64, int16_t, CACHE_LINE); - int min, max; - int count = 0; - - int tmp; - int min_error = 0x10000*64; - int max_error = 0; + int width; + int height; + int width2; + int height2; + IMAGE img; + if (XVID_VERSION_MAJOR(convert->version) != 1) /* v1.x.x */ + return XVID_ERR_VERSION; - if ((test & TEST_FORWARD)) /* forward */ - { - min = -256; - max = 255; - }else{ /* inverse */ - min = -2048; - max = 2047; - } +#if 0 + const int flip1 = (convert->input.colorspace & XVID_CSP_VFLIP) ^ (convert->output.colorspace & XVID_CSP_VFLIP); +#endif + width = convert->width; + height = convert->height; + width2 = convert->width/2; + height2 = convert->height/2; - for (i = 0; i < 64*64; i++) + switch (convert->input.csp & ~XVID_CSP_VFLIP) { - if ((flags & XVID_TEST_RANDOM)) - { - random16(arrayA, 64, min, max); - }else{ - fill16(arrayA, 64, i); - } - memcpy(arrayB, arrayA, 64*sizeof(int16_t)); - - if ((test & TEST_FORWARD)) - { - timeSTART = read_counter(); - ((fdctFunc*)funcA)(arrayA); - timeA += read_counter() - timeSTART; - - timeSTART = read_counter(); - ((fdctFunc*)funcB)(arrayB); - timeB += read_counter() - timeSTART; - } - else - { - timeSTART = read_counter(); - ((idctFunc*)funcA)(arrayA); - timeA += read_counter() - timeSTART; - - timeSTART = read_counter(); - ((idctFunc*)funcB)(arrayB); - timeB += read_counter() - timeSTART; - } - - tmp = diff16(arrayA, arrayB, 64) / 64; - if (tmp > max_error) - max_error = tmp; - if (tmp < min_error) - min_error = tmp; - - count++; - } - - /* print the "average difference" of best/worst transforms */ - printf("%s:\t%i\t(min_error:%i, max_error:%i)\n", nameB, (int)(timeB / count), min_error, max_error); - - return 0; -} - - -#define TEST_QUANT 0x00000001 /* forward quantization */ -#define TEST_INTRA 0x00000002 /* intra */ -#define TEST_QUANT_INTRA (TEST_QUANT|TEST_INTRA) -#define TEST_QUANT_INTER (TEST_QUANT) -#define TEST_DEQUANT_INTRA (TEST_INTRA) -#define TEST_DEQUANT_INTER (0) - -static int test_quant(void * funcA, void * funcB, const char * nameB, - int test, int flags) -{ - int q,i; - int64_t timeSTART; - int64_t timeA = 0; - int64_t timeB = 0; - int retA = 0, retB = 0; - DECLARE_ALIGNED_MATRIX(arrayX, 1, 64, int16_t, CACHE_LINE); - DECLARE_ALIGNED_MATRIX(arrayA, 1, 64, int16_t, CACHE_LINE); - DECLARE_ALIGNED_MATRIX(arrayB, 1, 64, int16_t, CACHE_LINE); - int min, max; - int count = 0; - int errors = 0; + case XVID_CSP_YV12 : + img.y = convert->input.plane[0]; + img.v = (uint8_t*)convert->input.plane[0] + convert->input.stride[0]*height; + img.u = (uint8_t*)convert->input.plane[0] + convert->input.stride[0]*height + (convert->input.stride[0]/2)*height2; + image_output(&img, width, height, width, + (uint8_t**)convert->output.plane, convert->output.stride, + convert->output.csp, convert->interlacing); + break; - if ((test & TEST_QUANT)) /* quant */ - { - min = -2048; - max = 2047; - }else{ /* dequant */ - min = -256; - max = 255; + default : + return XVID_ERR_FORMAT; } - for (q = 1; q <= 31; q++) /* quantizer */ - { - for (i = min; i < max; i++) /* input coeff */ - { - if ((flags & XVID_TEST_RANDOM)) - { - random16(arrayX, 64, min, max); - }else{ - fill16(arrayX, 64, i); - } - - if ((test & TEST_INTRA)) /* intra */ - { - timeSTART = read_counter(); - ((quanth263_intraFunc*)funcA)(arrayA, arrayX, q, q); - timeA += read_counter() - timeSTART; - - timeSTART = read_counter(); - ((quanth263_intraFunc*)funcB)(arrayB, arrayX, q, q); - timeB += read_counter() - timeSTART; - } - else /* inter */ - { - timeSTART = read_counter(); - retA = ((quanth263_interFunc*)funcA)(arrayA, arrayX, q); - timeA += read_counter() - timeSTART; - - timeSTART = read_counter(); - retB = ((quanth263_interFunc*)funcB)(arrayB, arrayX, q); - timeB += read_counter() - timeSTART; - } - - /* compare return value from quant_inter, and compare (de)quantiz'd arrays */ - if ( ((test&TEST_QUANT) && !(test&TEST_INTRA) && retA != retB ) || - compare16(arrayA, arrayB, 64)) - { - errors++; - if ((flags & XVID_TEST_VERBOSE)) - printf("%s error: q=%i, i=%i\n", nameB, q, i); - } - - count++; - } - } - printf("%s:\t%i", nameB, (int)(timeB / count)); - if (errors>0) - printf("\t(%i errors out of %i)", errors, count); - printf("\n"); - + emms(); return 0; } - - -int xvid_init_test(int flags) -{ -#if defined(ARCH_IS_IA32) - int cpu_flags; -#endif - - printf("XviD tests\n\n"); - -#if defined(ARCH_IS_IA32) - cpu_flags = detect_cpu_flags(); -#endif - - idct_int32_init(); - emms(); - - srand(time(0)); - - /* fDCT test */ - printf("--- fdct ---\n"); - test_transform(fdct_int32, fdct_int32, "c", TEST_FDCT, flags); - -#if defined(ARCH_IS_IA32) - if (cpu_flags & XVID_CPU_MMX) - test_transform(fdct_int32, fdct_mmx, "mmx", TEST_FDCT, flags); - if (cpu_flags & XVID_CPU_SSE2) - test_transform(fdct_int32, fdct_sse2, "sse2", TEST_FDCT, flags); -#endif - - /* iDCT test */ - printf("\n--- idct ---\n"); - test_transform(idct_int32, idct_int32, "c", TEST_IDCT, flags); - -#if defined(ARCH_IS_IA32) - if (cpu_flags & XVID_CPU_MMX) - test_transform(idct_int32, idct_mmx, "mmx", TEST_IDCT, flags); - if (cpu_flags & XVID_CPU_MMXEXT) - test_transform(idct_int32, idct_xmm, "xmm", TEST_IDCT, flags); - if (cpu_flags & XVID_CPU_3DNOWEXT) - test_transform(idct_int32, idct_3dne, "3dne", TEST_IDCT, flags); - if (cpu_flags & XVID_CPU_SSE2) - test_transform(idct_int32, idct_sse2, "sse2", TEST_IDCT, flags); -#endif - - /* Intra quantization test */ - printf("\n--- quant intra ---\n"); - test_quant(quant_intra_c, quant_intra_c, "c", TEST_QUANT_INTRA, flags); - -#if defined(ARCH_IS_IA32) - if (cpu_flags & XVID_CPU_MMX) - test_quant(quant_intra_c, quant_intra_mmx, "mmx", TEST_QUANT_INTRA, flags); - if (cpu_flags & XVID_CPU_3DNOWEXT) - test_quant(quant_intra_c, quant_intra_3dne, "3dne", TEST_QUANT_INTRA, flags); - if (cpu_flags & XVID_CPU_SSE2) - test_quant(quant_intra_c, quant_intra_sse2, "sse2", TEST_QUANT_INTRA, flags); -#endif - - /* Inter quantization test */ - printf("\n--- quant inter ---\n"); - test_quant(quant_inter_c, quant_inter_c, "c", TEST_QUANT_INTER, flags); - -#if defined(ARCH_IS_IA32) - if (cpu_flags & XVID_CPU_MMX) - test_quant(quant_inter_c, quant_inter_mmx, "mmx", TEST_QUANT_INTER, flags); - if (cpu_flags & XVID_CPU_3DNOWEXT) - test_quant(quant_inter_c, quant_inter_3dne, "3dne", TEST_QUANT_INTER, flags); - if (cpu_flags & XVID_CPU_SSE2) - test_quant(quant_inter_c, quant_inter_sse2, "sse2", TEST_QUANT_INTER, flags); -#endif - - /* Intra dequantization test */ - printf("\n--- dequant intra ---\n"); - test_quant(dequant_intra_c, dequant_intra_c, "c", TEST_DEQUANT_INTRA, flags); - -#if defined(ARCH_IS_IA32) - if (cpu_flags & XVID_CPU_MMX) - test_quant(dequant_intra_c, dequant_intra_mmx, "mmx", TEST_DEQUANT_INTRA, flags); - if (cpu_flags & XVID_CPU_MMXEXT) - test_quant(dequant_intra_c, dequant_intra_xmm, "xmm", TEST_DEQUANT_INTRA, flags); - if (cpu_flags & XVID_CPU_3DNOWEXT) - test_quant(dequant_intra_c, dequant_intra_3dne, "3dne", TEST_DEQUANT_INTRA, flags); - if (cpu_flags & XVID_CPU_SSE2) - test_quant(dequant_intra_c, dequant_intra_sse2, "sse2", TEST_DEQUANT_INTRA, flags); -#endif - - /* Inter dequantization test */ - printf("\n--- dequant inter ---\n"); - test_quant(dequant_inter_c, dequant_inter_c, "c", TEST_DEQUANT_INTER, flags); - -#if defined(ARCH_IS_IA32) - if (cpu_flags & XVID_CPU_MMX) - test_quant(dequant_inter_c, dequant_inter_mmx, "mmx", TEST_DEQUANT_INTER, flags); - if (cpu_flags & XVID_CPU_MMXEXT) - test_quant(dequant_inter_c, dequant_inter_xmm, "xmm", TEST_DEQUANT_INTER, flags); - if (cpu_flags & XVID_CPU_3DNOWEXT) - test_quant(dequant_inter_c, dequant_inter_3dne, "3dne", TEST_DEQUANT_INTER, flags); - if (cpu_flags & XVID_CPU_SSE2) - test_quant(dequant_inter_c, dequant_inter_sse2, "sse2", TEST_DEQUANT_INTER, flags); -#endif - - /* Intra quantization test */ - printf("\n--- quant4 intra ---\n"); - test_quant(quant4_intra_c, quant4_intra_c, "c", TEST_QUANT_INTRA, flags); - -#if defined(ARCH_IS_IA32) - if (cpu_flags & XVID_CPU_MMX) - test_quant(quant4_intra_c, quant4_intra_mmx, "mmx", TEST_QUANT_INTRA, flags); - if (cpu_flags & XVID_CPU_MMXEXT) - test_quant(quant4_intra_c, quant4_intra_xmm, "xmm", TEST_QUANT_INTRA, flags); -#endif - - /* Inter quantization test */ - printf("\n--- quant4 inter ---\n"); - test_quant(quant4_inter_c, quant4_inter_c, "c", TEST_QUANT_INTER, flags); - -#if defined(ARCH_IS_IA32) - if (cpu_flags & XVID_CPU_MMX) - test_quant(quant4_inter_c, quant4_inter_mmx, "mmx", TEST_QUANT_INTER, flags); - if (cpu_flags & XVID_CPU_MMXEXT) - test_quant(quant4_inter_c, quant4_inter_xmm, "xmm", TEST_QUANT_INTER, flags); -#endif - - /* Intra dequantization test */ - printf("\n--- dequant4 intra ---\n"); - test_quant(dequant4_intra_c, dequant4_intra_c, "c", TEST_DEQUANT_INTRA, flags); - -#if defined(ARCH_IS_IA32) - if (cpu_flags & XVID_CPU_MMX) - test_quant(dequant4_intra_c, dequant4_intra_mmx, "mmx", TEST_DEQUANT_INTRA, flags); - if (cpu_flags & XVID_CPU_3DNOWEXT) - test_quant(dequant4_intra_c, dequant4_intra_3dne, "3dne", TEST_DEQUANT_INTRA, flags); -#endif - - /* Inter dequantization test */ - printf("\n--- dequant4 inter ---\n"); - test_quant(dequant4_inter_c, dequant4_inter_c, "c", TEST_DEQUANT_INTER, flags); - -#if defined(ARCH_IS_IA32) - if (cpu_flags & XVID_CPU_MMX) - test_quant(dequant4_inter_c, dequant4_inter_mmx, "mmx", TEST_DEQUANT_INTER, flags); - if (cpu_flags & XVID_CPU_3DNOWEXT) - test_quant(dequant4_inter_c, dequant4_inter_3dne, "3dne", TEST_DEQUANT_INTER, flags); -#endif - - emms(); - - return XVID_ERR_OK; -} +/***************************************************************************** + * XviD Global Entry point + * + * Well this function initialize all internal function pointers according + * to the CPU features forced by the library client or autodetected (depending + * on the XVID_CPU_FORCE flag). It also initializes vlc coding tables and all + * image colorspace transformation tables. + * + ****************************************************************************/ int -xvid_init(void *handle, +xvid_global(void *handle, int opt, void *param1, void *param2) { switch(opt) { - case XVID_INIT_INIT : - return xvid_init_init((XVID_INIT_PARAM*)param1); + case XVID_GBL_INIT : + return xvid_gbl_init((xvid_gbl_init_t*)param1); - case XVID_INIT_CONVERT : - return xvid_init_convert((XVID_INIT_CONVERTINFO*)param1); + case XVID_GBL_INFO : + return xvid_gbl_info((xvid_gbl_info_t*)param1); + + case XVID_GBL_CONVERT : + return xvid_gbl_convert((xvid_gbl_convert_t*)param1); - case XVID_INIT_TEST : - { - ptr_t flags = (ptr_t)param1; - return xvid_init_test((int)flags); - } default : return XVID_ERR_FAIL; } @@ -1001,15 +665,15 @@ void *param2) { switch (opt) { - case XVID_DEC_DECODE: - return decoder_decode((DECODER *) handle, (XVID_DEC_FRAME *) param1, (XVID_DEC_STATS*) param2); - case XVID_DEC_CREATE: - return decoder_create((XVID_DEC_PARAM *) param1); + return decoder_create((xvid_dec_create_t *) param1); case XVID_DEC_DESTROY: return decoder_destroy((DECODER *) handle); + case XVID_DEC_DECODE: + return decoder_decode((DECODER *) handle, (xvid_dec_frame_t *) param1, (xvid_dec_stats_t*) param2); + default: return XVID_ERR_FAIL; } @@ -1035,20 +699,15 @@ switch (opt) { case XVID_ENC_ENCODE: - if (((Encoder *) handle)->mbParam.max_bframes >= 0) - return encoder_encode_bframes((Encoder *) handle, - (XVID_ENC_FRAME *) param1, - (XVID_ENC_STATS *) param2); - else - return encoder_encode((Encoder *) handle, - (XVID_ENC_FRAME *) param1, - (XVID_ENC_STATS *) param2); + return enc_encode((Encoder *) handle, + (xvid_enc_frame_t *) param1, + (xvid_enc_stats_t *) param2); case XVID_ENC_CREATE: - return encoder_create((XVID_ENC_PARAM *) param1); + return enc_create((xvid_enc_create_t *) param1); case XVID_ENC_DESTROY: - return encoder_destroy((Encoder *) handle); + return enc_destroy((Encoder *) handle); default: return XVID_ERR_FAIL;