ce7c2a231e
The previous defines controlling SSE2 use assumed GCC. To fix this: - Import a chunk of defines to typedefs.h from Chrome's build_config.h, primarily to get WEBRTC_ARCH_X86_FAMILY. - Add a check derived from WebP to define WEBRTC_USE_SSE2. - Modify cpu_features.cc to work with MSVC. This code is borrowed from chrome/src/base/cpu.cc. - Change AEC defines to use WEBRTC_USE_SSE2. - Remove disable_sse2 check from aec.gyp. This is handled by WEBRTC_USE_SSE2. (Also remove a bit of unused code from aec_core.h) Review URL: http://webrtc-codereview.appspot.com/95008 git-svn-id: http://webrtc.googlecode.com/svn/trunk@299 4adac7df-926f-26a2-2b94-8c16560cd09d
141 lines
4.6 KiB
C
141 lines
4.6 KiB
C
/*
|
|
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
// This file contains platform-specific typedefs and defines.
|
|
|
|
#ifndef WEBRTC_TYPEDEFS_H_
|
|
#define WEBRTC_TYPEDEFS_H_
|
|
|
|
// Reserved words definitions
|
|
#define WEBRTC_EXTERN extern
|
|
#define G_CONST const
|
|
#define WEBRTC_INLINE extern __inline
|
|
|
|
// Define WebRTC preprocessor identifiers based on the current build platform.
|
|
// TODO(ajm): Clean these up. We can probably remove everything in this block.
|
|
// - TARGET_MAC_INTEL and TARGET_MAC aren't used anywhere.
|
|
// - In the few places where TARGET_PC is used, it should be replaced by
|
|
// something more specific.
|
|
// - Do we really support PowerPC? Probably not. Remove WEBRTC_MAC_INTEL
|
|
// from build/common.gypi as well.
|
|
#if defined(WIN32)
|
|
// Windows & Windows Mobile
|
|
#if !defined(WEBRTC_TARGET_PC)
|
|
#define WEBRTC_TARGET_PC
|
|
#endif
|
|
#elif defined(__APPLE__)
|
|
// Mac OS X
|
|
#if defined(__LITTLE_ENDIAN__ ) //TODO: is this used?
|
|
#if !defined(WEBRTC_TARGET_MAC_INTEL)
|
|
#define WEBRTC_TARGET_MAC_INTEL
|
|
#endif
|
|
#else
|
|
#if !defined(WEBRTC_TARGET_MAC)
|
|
#define WEBRTC_TARGET_MAC
|
|
#endif
|
|
#endif
|
|
#else
|
|
// Linux etc.
|
|
#if !defined(WEBRTC_TARGET_PC)
|
|
#define WEBRTC_TARGET_PC
|
|
#endif
|
|
#endif
|
|
|
|
// Derived from Chromium's build/build_config.h
|
|
// Processor architecture detection. For more info on what's defined, see:
|
|
// http://msdn.microsoft.com/en-us/library/b0084kay.aspx
|
|
// http://www.agner.org/optimize/calling_conventions.pdf
|
|
// or with gcc, run: "echo | gcc -E -dM -"
|
|
// TODO(ajm): replace WEBRTC_LITTLE_ENDIAN with WEBRTC_ARCH_LITTLE_ENDIAN?
|
|
#if defined(_M_X64) || defined(__x86_64__)
|
|
#define WEBRTC_ARCH_X86_FAMILY
|
|
#define WEBRTC_ARCH_X86_64
|
|
#define WEBRTC_ARCH_64_BITS
|
|
#define WEBRTC_ARCH_LITTLE_ENDIAN
|
|
#elif defined(_M_IX86) || defined(__i386__)
|
|
#define WEBRTC_ARCH_X86_FAMILY
|
|
#define WEBRTC_ARCH_X86
|
|
#define WEBRTC_ARCH_32_BITS
|
|
#define WEBRTC_ARCH_LITTLE_ENDIAN
|
|
#elif defined(__ARMEL__)
|
|
// TODO(ajm): Chromium uses the two commented defines. Should we switch?
|
|
#define WEBRTC_ARCH_ARM
|
|
//#define WEBRTC_ARCH_ARM_FAMILY
|
|
//#define WEBRTC_ARCH_ARMEL
|
|
#define WEBRTC_ARCH_32_BITS
|
|
#define WEBRTC_ARCH_LITTLE_ENDIAN
|
|
#else
|
|
#error Please add support for your architecture in typedefs.h
|
|
#endif
|
|
|
|
// TODO(ajm): SSE2 is disabled on Windows for the moment, because AEC
|
|
// optimization is broken. Enable it as soon as AEC is fixed.
|
|
//#if defined(__SSE2__) || defined(_MSC_VER)
|
|
#if defined(__SSE2__)
|
|
#define WEBRTC_USE_SSE2
|
|
#endif
|
|
|
|
#if defined(WEBRTC_TARGET_PC)
|
|
|
|
#if !defined(_MSC_VER)
|
|
#include <stdint.h>
|
|
#else
|
|
// Define C99 equivalent types.
|
|
// Since MSVC doesn't include these headers, we have to write our own
|
|
// version to provide a compatibility layer between MSVC and the WebRTC
|
|
// headers.
|
|
typedef signed char int8_t;
|
|
typedef signed short int16_t;
|
|
typedef signed int int32_t;
|
|
typedef signed long long int64_t;
|
|
typedef unsigned char uint8_t;
|
|
typedef unsigned short uint16_t;
|
|
typedef unsigned int uint32_t;
|
|
typedef unsigned long long uint64_t;
|
|
#endif
|
|
|
|
#if defined(WIN32)
|
|
typedef __int64 WebRtc_Word64;
|
|
typedef unsigned __int64 WebRtc_UWord64;
|
|
#else
|
|
typedef int64_t WebRtc_Word64;
|
|
typedef uint64_t WebRtc_UWord64;
|
|
#endif
|
|
typedef int32_t WebRtc_Word32;
|
|
typedef uint32_t WebRtc_UWord32;
|
|
typedef int16_t WebRtc_Word16;
|
|
typedef uint16_t WebRtc_UWord16;
|
|
typedef char WebRtc_Word8;
|
|
typedef uint8_t WebRtc_UWord8;
|
|
|
|
// Define endian for the platform
|
|
#define WEBRTC_LITTLE_ENDIAN
|
|
|
|
#elif defined(WEBRTC_TARGET_MAC_INTEL)
|
|
#include <stdint.h>
|
|
|
|
typedef int64_t WebRtc_Word64;
|
|
typedef uint64_t WebRtc_UWord64;
|
|
typedef int32_t WebRtc_Word32;
|
|
typedef uint32_t WebRtc_UWord32;
|
|
typedef int16_t WebRtc_Word16;
|
|
typedef char WebRtc_Word8;
|
|
typedef uint16_t WebRtc_UWord16;
|
|
typedef uint8_t WebRtc_UWord8;
|
|
|
|
// Define endian for the platform
|
|
#define WEBRTC_LITTLE_ENDIAN
|
|
|
|
#else
|
|
#error "No platform defined for WebRTC type definitions (typedefs.h)"
|
|
#endif
|
|
|
|
#endif // WEBRTC_TYPEDEFS_H_
|