--- portab.h 2003/01/11 14:59:23 1.26.2.6 +++ portab.h 2002/09/22 18:17:32 1.31 @@ -3,56 +3,32 @@ * XVID MPEG-4 VIDEO CODEC * - Portable macros, types and inlined assembly - * - * Copyright(C) 2002 Michael Militzer - * 2002 Peter Ross - * 2002 Edouard Gomez + * Copyright(C) 2002 Michael Militzer * - * 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 + * 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 + * 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. - * - * $Id: portab.h,v 1.26.2.6 2003/01/11 14:59:23 chl Exp $ + * $Id: portab.h,v 1.31 2002/09/22 18:17:32 h Exp $ * ****************************************************************************/ @@ -71,15 +47,10 @@ #define DPRINTF_MB 0x00000010 #define DPRINTF_COEFF 0x00000020 #define DPRINTF_MV 0x00000040 -#define DPRINTF_RC 0x00000080 #define DPRINTF_DEBUG 0x80000000 /* debug level for this library */ -#ifdef _DEBUG -#define DPRINTF_LEVEL (DPRINTF_RC|0x0000007F) -#else -#define DPRINTF_LEVEL DPRINTF_RC -#endif +#define DPRINTF_LEVEL 0 /* Buffer size for non C99 compliant compilers (msvc) */ #define DPRINTF_BUF_SZ 1024 @@ -115,7 +86,7 @@ | Fallback when using gcc *---------------------------------------------------------------------------*/ -#elif defined(__GNUC__) || defined(__ICC) +#elif defined(__GNUC__) # define int8_t char # define uint8_t unsigned char @@ -138,16 +109,14 @@ * Some things that are only architecture dependant ****************************************************************************/ -#if defined(ARCH_X86) || defined(ARCH_PPC) || defined(ARCH_MIPS) || defined(ARCH_SPARC) +#if defined(ARCH_X86) || defined(ARCH_PPC) || defined(ARCH_MIPS) # define CACHE_LINE 16 # define ptr_t uint32_t -#elif defined(ARCH_IA64) +#elif defined(ARCH_IA64) || defined(ARCH_SPARC) # define CACHE_LINE 32 # define ptr_t uint64_t #else -/* todo: fix cache_line 0 operation */ -# define CACHE_LINE 16 -# define ptr_t uint32_t +# error Architecture not supported. #endif /***************************************************************************** @@ -198,6 +167,7 @@ *---------------------------------------------------------------------------*/ # if defined(ARCH_X86) # 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) { @@ -216,13 +186,7 @@ | msvc unknown architecture *---------------------------------------------------------------------------*/ # else -/* ANSI C version of BSWAP */ -#define BSWAP(x) \ - x = ((((x) & 0xff000000) >> 24) | \ - (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | \ - (((x) & 0x000000ff) << 24)) - +# error Architecture not supported. # endif @@ -232,7 +196,7 @@ * GNU CC compiler stuff ****************************************************************************/ -#elif defined(__GNUC__) || defined(__ICC) /* Compiler test */ +#elif defined(__GNUC__) /* Compiler test */ /*---------------------------------------------------------------------------- | Common gcc stuff @@ -268,6 +232,7 @@ *---------------------------------------------------------------------------*/ # if defined(ARCH_X86) # define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) ); +# define EMMS() __asm__ ("emms\n\t"); static __inline int64_t read_counter(void) { @@ -284,6 +249,7 @@ # elif defined(ARCH_PPC) # define BSWAP(a) __asm__ __volatile__ \ ( "lwbrx %0,0,%1; eieio" : "=r" (a) : "r" (&(a)), "m" (a)); +# define EMMS() static __inline unsigned long get_tbl(void) { @@ -316,6 +282,7 @@ # define BSWAP(a) __asm__ __volatile__ \ ("mux1 %1 = %0, @rev" ";;" \ "shr.u %1 = %1, 32" : "=r" (a) : "r" (a)); +# define EMMS() static __inline int64_t read_counter(void) { unsigned long result; @@ -330,6 +297,7 @@ # define BSWAP(a) \ ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) +# define EMMS() static __inline int64_t read_counter(void) { @@ -343,6 +311,7 @@ # define BSWAP(a) \ ((a) = (((a) & 0xff) << 24) | (((a) & 0xff00) << 8) | \ (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff)) +# define EMMS() static __inline int64_t read_counter(void) { @@ -353,13 +322,7 @@ | XviD + gcc unsupported Architecture *---------------------------------------------------------------------------*/ # else -/* ANSI C version of BSWAP */ -#define BSWAP(x) \ - x = ((((x) & 0xff000000) >> 24) | \ - (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | \ - (((x) & 0x000000ff) << 24)) - +# error Architecture not supported. # endif /* Architecture checking */ /*****************************************************************************