--- xvid.c 2002/06/13 13:18:57 1.16 +++ xvid.c 2002/07/07 09:38:13 1.24 @@ -1,43 +1,45 @@ /***************************************************************************** -* -* XVID MPEG-4 VIDEO CODEC -* - Native API implementation - -* -* 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 -* advised that its use may infringe existing patents or copyrights, and -* any such use would be at such party's own risk. The original -* developer of this software module and his/her company, and subsequent -* editors and their companies, will have no liability for use of this -* software or modifications or derivatives thereof. -* -* 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 -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY ; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program ; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -* -*****************************************************************************/ + * + * XVID MPEG-4 VIDEO CODEC + * - Native API implementation - + * + * 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 + * advised that its use may infringe existing patents or copyrights, and + * any such use would be at such party's own risk. The original + * developer of this software module and his/her company, and subsequent + * editors and their companies, will have no liability for use of this + * software or modifications or derivatives thereof. + * + * 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 + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY ; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program ; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + ****************************************************************************/ + /***************************************************************************** -* -* History -* -* - 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.16 2002/06/13 13:18:57 edgomez Exp $ -* -*****************************************************************************/ + * + * 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.24 2002/07/07 09:38:13 Isibaar Exp $ + * + ****************************************************************************/ #include "xvid.h" #include "decoder.h" @@ -80,16 +82,24 @@ 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; + + if ((init_param->cpu_flags & XVID_CPU_CHKONLY)) + { + init_param->cpu_flags = check_cpu_features(); + return XVID_ERR_OK; + } + /* Do we have to force CPU features ? */ if ((init_param->cpu_flags & XVID_CPU_FORCE) > 0) { cpu_flags = init_param->cpu_flags; } else { -#ifdef ARCH_X86 cpu_flags = check_cpu_features(); -#else - cpu_flags = 0; -#endif init_param->cpu_flags = cpu_flags; } @@ -184,9 +194,11 @@ 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; + /* Image Interpolation related functions */ interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_mmx; interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_mmx; @@ -223,11 +235,15 @@ interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_xmm; interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_xmm; + /* Buffer transfer */ + transfer_8to16sub2 = transfer_8to16sub2_xmm; + /* Colorspace transformation */ yuv_to_yv12 = yuv_to_yv12_xmm; /* ME functions */ sad16 = sad16_xmm; + sad16bi = sad16bi_xmm; sad8 = sad8_xmm; dev16 = dev16_xmm; @@ -244,6 +260,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; @@ -251,7 +269,6 @@ dequant_inter = dequant_inter_sse2; /* ME */ - calc_cbp = calc_cbp_sse2; sad16 = sad16_sse2; dev16 = dev16_sse2; @@ -263,6 +280,32 @@ #endif +#ifdef ARCH_IA64 + if ((cpu_flags & XVID_CPU_IA64) > 0) { //use assembler routines? + idct_ia64_init(); + fdct = fdct_ia64; + idct = idct_ia64; //not yet working, crashes + interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_ia64; + interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_ia64; + interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_ia64; + sad16 = sad16_ia64; + sad16bi = sad16bi_ia64; + sad8 = sad8_ia64; + dev16 = dev16_ia64; + quant_intra = quant_intra_ia64; + dequant_intra = dequant_intra_ia64; + quant_inter = quant_inter_ia64; + dequant_inter = dequant_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; + DEBUG("Using IA-64 assembler routines.\n"); + } +#endif + #ifdef ARCH_PPC #ifdef ARCH_PPC_ALTIVEC calc_cbp = calc_cbp_altivec; @@ -277,12 +320,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; } @@ -336,6 +373,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);