--- xvid.c 2002/07/23 12:59:57 1.33 +++ xvid.c 2003/02/09 19:32:52 1.40 @@ -3,41 +3,54 @@ * 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 + * Copyright(C) 2001-2002 Peter Ross + * + * This file is part of XviD, a free MPEG-4 video encoder/decoder + * + * XviD 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 + * 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 + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ****************************************************************************/ - -/***************************************************************************** + * Under section 8 of the GNU General Public License, the copyright + * holders of XVID explicitly forbid distribution in the following + * countries: + * + * - Japan + * - United States of America + * + * Linking XviD statically or dynamically with other modules is making a + * combined work based on XviD. Thus, the terms and conditions of the + * GNU General Public License cover the whole combination. + * + * As a special exception, the copyright holders of XviD give you + * permission to link XviD with independent modules that communicate with + * XviD solely through the VFW1.1 and DShow interfaces, regardless of the + * license terms of these independent modules, and to copy and distribute + * the resulting combined work under terms of your choice, provided that + * every copy of the combined work is accompanied by a complete copy of + * the source code of XviD (the version of XviD used to produce the + * combined work), being distributed under the terms of the GNU General + * Public License plus this exception. An independent module is a module + * which is not derived from or based on XviD. + * + * Note that people who make modified versions of XviD are not obligated + * to grant this special exception for their modified versions; it is + * their choice whether to do so. The GNU General Public License gives + * permission to release a modified version without this exception; this + * exception also makes it possible to release a modified version which + * carries forward this exception. * - * 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.33 2002/07/23 12:59:57 suxen_drol Exp $ + * $Id: xvid.c,v 1.40 2003/02/09 19:32:52 edgomez Exp $ * ****************************************************************************/ @@ -58,9 +71,9 @@ #include "utils/timer.h" #include "bitstream/mbcoding.h" -#if defined(ARCH_X86) && defined(EXPERIMENTAL_SSE2_CODE) +#if defined(ARCH_IS_IA32) && defined(EXPERIMENTAL_SSE2_CODE) -#ifdef WIN32 +#ifdef _MSC_VER #include #else #include @@ -68,7 +81,7 @@ #endif -#ifndef WIN32 +#ifndef _MSC_VER static jmp_buf mark; @@ -81,17 +94,17 @@ /* -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 -*/ + * 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 +#ifdef _MSC_VER _try { func(); } @@ -165,7 +178,7 @@ cpu_flags = check_cpu_features(); -#if defined(ARCH_X86) && defined(EXPERIMENTAL_SSE2_CODE) +#if defined(ARCH_IS_IA32) && defined(EXPERIMENTAL_SSE2_CODE) if ((cpu_flags & XVID_CPU_SSE) && sigill_check(sse_os_trigger)) cpu_flags &= ~XVID_CPU_SSE; @@ -252,7 +265,7 @@ Halfpel8_Refine = Halfpel8_Refine_c; -#ifdef ARCH_X86 +#ifdef ARCH_IS_IA32 if ((cpu_flags & XVID_CPU_MMX) > 0) { /* Forward and Inverse Discrete Cosine Transformation functions */ @@ -379,11 +392,11 @@ #endif -#ifdef ARCH_IA64 +#ifdef ARCH_IS_IA64 if ((cpu_flags & XVID_CPU_IA64) > 0) { //use assembler routines? idct_ia64_init(); fdct = fdct_ia64; - idct = idct_ia64; //not yet working, crashes + idct = idct_ia64; interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_ia64; interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_ia64; interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_ia64; @@ -402,12 +415,12 @@ transfer_8to16sub2 = transfer_8to16sub2_ia64; transfer_16to8add = transfer_16to8add_ia64; transfer8x8_copy = transfer8x8_copy_ia64; - DEBUG("Using IA-64 assembler routines.\n"); +// DEBUG("Using IA-64 assembler routines.\n"); } #endif -#ifdef ARCH_PPC -#ifdef ARCH_PPC_ALTIVEC +#ifdef ARCH_IS_PPC +#ifdef ARCH_IS_PPC_ALTIVEC calc_cbp = calc_cbp_altivec; fdct = fdct_altivec; idct = idct_altivec; @@ -473,12 +486,6 @@ { 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);