[cvs] / xvidcore / src / portab.h Repository:
ViewVC logotype

Diff of /xvidcore/src/portab.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.42, Sun Feb 9 22:48:38 2003 UTC revision 1.43, Sat Feb 15 15:22:17 2003 UTC
# Line 23  Line 23 
23   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
24   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
25   *   *
  *  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.  
  *  
26   * $Id$   * $Id$
27   *   *
28   ****************************************************************************/   ****************************************************************************/
# Line 71  Line 42 
42  #define DPRINTF_MB                      0x00000010  #define DPRINTF_MB                      0x00000010
43  #define DPRINTF_COEFF           0x00000020  #define DPRINTF_COEFF           0x00000020
44  #define DPRINTF_MV                      0x00000040  #define DPRINTF_MV                      0x00000040
45    #define DPRINTF_RC                      0x00000080
46  #define DPRINTF_DEBUG           0x80000000  #define DPRINTF_DEBUG           0x80000000
47    
48  /* debug level for this library */  /* debug level for this library */
# Line 87  Line 59 
59   | For MSVC   | For MSVC
60   *---------------------------------------------------------------------------*/   *---------------------------------------------------------------------------*/
61    
62  #if defined(_MSC_VER)  #if defined(_MSC_VER) || defined (__WATCOMC__)
63  #    define int8_t   char  #    define int8_t   char
64  #    define uint8_t  unsigned char  #    define uint8_t  unsigned char
65  #    define int16_t  short  #    define int16_t  short
# Line 359  Line 331 
331  #    endif  #    endif
332    
333  /*****************************************************************************  /*****************************************************************************
334     *  OPEN WATCOM C/C++ compiler
335     ****************************************************************************/
336    #elif defined(__WATCOMC__)
337    
338    #    include <stdio.h>
339    #    include <stdarg.h>
340    
341    #    ifdef _DEBUG
342        static __inline void DPRINTF(int level, char *fmt, ...)
343        {
344                    if (DPRINTF_LEVEL & level) {
345                va_list args;
346                char buf[DPRINTF_BUF_SZ];
347                va_start(args, fmt);
348                vsprintf(buf, fmt, args);
349                            fprintf(stderr, "%s\n", buf);
350                    }
351            }
352    #    else /* _DEBUG */
353            static __inline void DPRINTF(int level, char *format, ...) {}
354    #    endif /* _DEBUG */
355    
356    #       define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
357                    type name##_storage[(sizex)*(sizey)+(alignment)-1]; \
358                    type * name = (type *) (((int32_t) name##_storage+(alignment - 1)) & ~((int32_t)(alignment)-1))
359    
360    /*----------------------------------------------------------------------------
361     | watcom x86 specific macros/functions
362     *---------------------------------------------------------------------------*/
363    #    if defined(ARCH_IS_IA32)
364    
365    #        define BSWAP(a)  __asm mov eax,a __asm bswap eax __asm mov a, eax
366    #        define EMMS() __asm {emms}
367    #        ifdef _PROFILING_
368             static __inline int64_t read_counter(void)
369             {
370                 uint64_t ts;
371                 uint32_t ts1, ts2;
372                 __asm {
373                     rdtsc
374                     mov ts1, eax
375                     mov ts2, edx
376                 }
377                 ts = ((uint64_t) ts2 << 32) | ((uint64_t) ts1);
378                 return ts;
379             }
380    #        endif
381    
382    /*----------------------------------------------------------------------------
383     | watcom unsupported architecture
384     *---------------------------------------------------------------------------*/
385    #       else
386    
387    #               define BSWAP(x) \
388                            x = ((((x) & 0xff000000) >> 24) | \
389                                    (((x) & 0x00ff0000) >>  8) | \
390                                    (((x) & 0x0000ff00) <<  8) | \
391                                    (((x) & 0x000000ff) << 24))
392    #        define EMMS()
393    #        ifdef _PROFILING_
394             static int64_t read_counter() { return 0; }
395    #        endif
396    
397    #       endif
398    
399    /*****************************************************************************
400   *  Unknown compiler   *  Unknown compiler
401   ****************************************************************************/   ****************************************************************************/
402  #else /* Compiler test */  #else /* Compiler test */

Legend:
Removed from v.1.42  
changed lines
  Added in v.1.43

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4