--- xvid.c 2003/02/19 21:13:00 1.43 +++ xvid.c 2003/07/14 12:40:16 1.45.2.10 @@ -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.43 2003/02/19 21:13:00 edgomez Exp $ + * $Id: xvid.c,v 1.45.2.10 2003/07/14 12:40:16 syskin Exp $ * ****************************************************************************/ @@ -45,6 +47,10 @@ #include "utils/timer.h" #include "bitstream/mbcoding.h" +#if defined(_DEBUG) +unsigned int xvid_debug = 0; /* xvid debug mask */ +#endif + #if defined(ARCH_IS_IA32) #if defined(_MSC_VER) @@ -153,34 +159,14 @@ static -int xvid_init_init(XVID_INIT_PARAM * init_param) +int xvid_gbl_init(xvid_gbl_init_t * init) { - int cpu_flags; - - /* 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)) { - - 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; - } + unsigned int cpu_flags; - init_param->cpu_flags = cpu_flags; + if (XVID_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(); @@ -302,8 +288,7 @@ #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; } @@ -418,7 +403,7 @@ add_upsampled_8x8_16to8 = xvid_Add_Upsampled_8x8_16To8_xmm; /* Quantization */ - quant4_intra = quant4_intra_xmm; +// quant4_intra = quant4_intra_xmm; quant4_inter = quant4_inter_xmm; dequant_intra = dequant_intra_xmm; @@ -466,7 +451,7 @@ /* Quantization */ dequant4_intra = dequant4_intra_3dne; dequant4_inter = dequant4_inter_3dne; - quant_intra = quant_intra_3dne; +// quant_intra = quant_intra_3dne; quant_inter = quant_inter_3dne; dequant_intra = dequant_intra_3dne; dequant_inter = dequant_inter_3dne; @@ -502,8 +487,10 @@ dev16 = dev16_sse2; #endif /* Forward and Inverse DCT */ +#if 0 /* Both function are known to be unprecise, better keep them deactivated */ idct = idct_sse2; fdct = fdct_sse2; +#endif } #endif @@ -530,7 +517,6 @@ transfer_8to16sub2 = transfer_8to16sub2_ia64; transfer_16to8add = transfer_16to8add_ia64; transfer8x8_copy = transfer8x8_copy_ia64; - DPRINTF(DPRINTF_DEBUG, "Using IA-64 assembler routines."); } #endif @@ -552,34 +538,63 @@ } #endif - return XVID_ERR_OK; +#if defined(_DEBUG) + xvid_debug = init->debug; +#endif + + return 0; } +static int +xvid_gbl_info(xvid_gbl_info_t * info) +{ + if (XVID_MAJOR(info->version) != 1) /* v1.x.x */ + return XVID_ERR_VERSION; + + info->actual_version = XVID_VERSION; + info->build = "dev-api-4"; + info->cpu_flags = detect_cpu_flags(); + +#if defined(_SMP) && defined(WIN32) + info->num_threads = pthread_num_processors_np();; +#else + info->num_threads = 0; +#endif + + return 0; +} + static int -xvid_init_convert(XVID_INIT_CONVERTINFO* convert) +xvid_gbl_convert(xvid_gbl_convert_t* 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; + int width; + int height; + int width2; + int height2; IMAGE img; - switch (convert->input.colorspace & ~XVID_CSP_VFLIP) + if (XVID_MAJOR(convert->version) != 1) /* v1.x.x */ + return XVID_ERR_VERSION; + +#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; + + switch (convert->input.csp & ~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; + 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, - convert->output.y, convert->output.y_stride, - convert->output.colorspace, convert->interlacing); + (uint8_t**)convert->output.plane, convert->output.stride, + convert->output.csp, convert->interlacing); break; default : @@ -588,7 +603,7 @@ emms(); - return XVID_ERR_OK; + return 0; } @@ -637,7 +652,7 @@ { int i, diff = 0; for (i = 0; i < size; i++) - diff += ABS(blockA[i]-blockB[i]); + diff += abs(blockA[i]-blockB[i]); return diff; } @@ -811,26 +826,37 @@ int xvid_init_test(int flags) { +#if defined(ARCH_IS_IA32) int cpu_flags; +#endif - srand(time(0)); - - printf("xvid_init_test\n"); + printf("XviD tests\n\n"); -#if defined(ARCH_IS_IA32) +#if defined(ARCH_IS_IA32) cpu_flags = detect_cpu_flags(); +#endif + idct_int32_init(); - emms_mmx(); + 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) @@ -839,27 +865,39 @@ 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) @@ -868,9 +906,13 @@ 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) @@ -879,60 +921,91 @@ 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 - printf("\n--- quant4_intra ---\n"); + /* 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 - printf("\n--- quant4_inter ---\n"); + /* 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 - printf("\n--- dequant4_intra ---\n"); + /* 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 - printf("\n--- dequant4_inter ---\n"); + /* 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); - - emms_mmx(); - #endif - return XVID_ERR_OK; + emms(); + + return 0; } +/***************************************************************************** + * 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_INIT_TEST : - return xvid_init_test((int)param1); + case XVID_GBL_CONVERT : + return xvid_gbl_convert((xvid_gbl_convert_t*)param1); + case XVID_GBL_TEST : + { + ptr_t flags = (ptr_t)param1; + return xvid_init_test((int)flags); + } default : return XVID_ERR_FAIL; } @@ -955,15 +1028,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; } @@ -989,18 +1062,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;