--- portab.h 2002/09/22 17:59:13 1.30 +++ portab.h 2002/11/23 18:11:58 1.36 @@ -3,32 +3,56 @@ * XVID MPEG-4 VIDEO CODEC * - Portable macros, types and inlined assembly - * - * Copyright(C) 2002 Michael Militzer + * Copyright(C) 2002 Michael Militzer + * 2002 Peter Ross + * 2002 Edouard Gomez * - * 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 + * 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 * - * $Id: portab.h,v 1.30 2002/09/22 17:59:13 edgomez Exp $ + * 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. + * + * $Id: portab.h,v 1.36 2002/11/23 18:11:58 chl Exp $ * ****************************************************************************/ @@ -86,7 +110,7 @@ | Fallback when using gcc *---------------------------------------------------------------------------*/ -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__ICC__) # define int8_t char # define uint8_t unsigned char @@ -109,10 +133,10 @@ * Some things that are only architecture dependant ****************************************************************************/ -#if defined(ARCH_X86) || defined(ARCH_PPC) || defined(ARCH_MIPS) +#if defined(ARCH_X86) || defined(ARCH_PPC) || defined(ARCH_MIPS) || defined(ARCH_SPARC) # define CACHE_LINE 16 # define ptr_t uint32_t -#elif defined(ARCH_IA64) || defined(ARCH_SPARC) +#elif defined(ARCH_IA64) # define CACHE_LINE 32 # define ptr_t uint64_t #else @@ -166,12 +190,7 @@ | msvc x86 specific macros/functions *---------------------------------------------------------------------------*/ # if defined(ARCH_X86) -# define BSWAP(a) - __asm { \ - mov eax,a \ - bswap eax \ - mov a, eax \ - } +# define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax # define EMMS() __asm {emms} static __inline int64_t read_counter(void) @@ -201,7 +220,7 @@ * GNU CC compiler stuff ****************************************************************************/ -#elif defined(__GNUC__) /* Compiler test */ +#elif defined(__GNUC__) || defined(__ICC__) /* Compiler test */ /*---------------------------------------------------------------------------- | Common gcc stuff