coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2026-02-16 23:29:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

ifdefs for compilers commented

Browse Source 
BUG=none
TEST=try bots
R=tpsiaki@google.com

Review URL: https://webrtc-codereview.appspot.com/3979006

git-svn-id: http://libyuv.googlecode.com/svn/trunk@859 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-11-19 00:33:54 +00:00
parent ba0eab9366
commit a1b5a27f79
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 858 Version: 859
License: BSD License: BSD
License File: LICENSE License File: LICENSE

34
include/libyuv/row.h
View File

@ -145,26 +145,29 @@ extern "C" {
#define HAS_YUY2TOYROW_SSE2 #define HAS_YUY2TOYROW_SSE2
#endif #endif
// AVX2 functions available on all x86 platforms, but not NaCL, and // GCC >= 4.7.0 required for AVX2.
// require VS2012, clang 3.4 or gcc 4.7.
#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
/* Test for GCC >= 4.7.0 */
#if (__GNUC__ > 4) || (__GNUC__ == 4 && (__GNUC_MINOR__ >= 7)) #if (__GNUC__ > 4) || (__GNUC__ == 4 && (__GNUC_MINOR__ >= 7))
#define GCC_HAS_AVX2 1 #define GCC_HAS_AVX2 1
#endif // GNUC >= 4.7 #endif // GNUC >= 4.7
#endif // __GNUC__ #endif // __GNUC__
// clang >= 3.4.0 required for AVX2.
#if defined(__clang__) && (defined(__x86_64__) || defined(__i386__)) #if defined(__clang__) && (defined(__x86_64__) || defined(__i386__))
/* Test for clang >= 3.4.0 */
#if (__clang_major__ > 3) || (__clang_major__ == 3 && (__clang_minor__ >= 4)) #if (__clang_major__ > 3) || (__clang_major__ == 3 && (__clang_minor__ >= 4))
#define CLANG_HAS_AVX2 1 #define CLANG_HAS_AVX2 1
#endif // GNUC >= 4.7 #endif // clang >= 3.4
#endif // __GNUC__ #endif // __clang__
#if !defined(LIBYUV_DISABLE_X86) && \ // Visual C 2012 required for AVX2.
(defined(__x86_64__) || defined(__i386__)) && \ #if defined(_M_IX86) && defined(_MSC_VER) && _MSC_VER >= 1700
((defined(_M_IX86) && defined(_MSC_VER) && _MSC_VER >= 1700) || \ #define VISUALC_HAS_AVX2 1
defined(CLANG_HAS_AVX2) || defined(GCC_HAS_AVX2)) #endif // VisualStudio >= 2012
// The following are available on all x86 platforms except NaCL x64, and
// require VS2012, clang 3.4 or gcc 4.7.
#if !defined(LIBYUV_DISABLE_X86) && (defined(VISUALC_HAS_AVX2) || \
defined(CLANG_HAS_AVX2) || defined(GCC_HAS_AVX2))
// Effects: // Effects:
#define HAS_ARGBPOLYNOMIALROW_AVX2 #define HAS_ARGBPOLYNOMIALROW_AVX2
#define HAS_ARGBSHUFFLEROW_AVX2 #define HAS_ARGBSHUFFLEROW_AVX2
@ -172,13 +175,9 @@ extern "C" {
#define HAS_ARGBCOPYYTOALPHAROW_AVX2 #define HAS_ARGBCOPYYTOALPHAROW_AVX2
#endif #endif
// The following are Windows only: // The following are require VS2012.
// TODO(fbarchard): Port to gcc. // TODO(fbarchard): Port to gcc.
#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && defined(_MSC_VER) #if !defined(LIBYUV_DISABLE_X86) && defined(VISUALC_HAS_AVX2)
// Effects:
// Caveat: Visual C 2012 required for AVX2.
#if _MSC_VER >= 1700
#define HAS_ARGBTOUVROW_AVX2 #define HAS_ARGBTOUVROW_AVX2
#define HAS_ARGBTOYJROW_AVX2 #define HAS_ARGBTOYJROW_AVX2
#define HAS_ARGBTOYROW_AVX2 #define HAS_ARGBTOYROW_AVX2
@ -202,8 +201,7 @@ extern "C" {
#define HAS_ARGBMULTIPLYROW_AVX2 #define HAS_ARGBMULTIPLYROW_AVX2
#define HAS_ARGBSUBTRACTROW_AVX2 #define HAS_ARGBSUBTRACTROW_AVX2
#define HAS_ARGBUNATTENUATEROW_AVX2 #define HAS_ARGBUNATTENUATEROW_AVX2
#endif // _MSC_VER >= 1700 #endif // defined(VISUALC_HAS_AVX2)
#endif // defined(_MSC_VER)
// The following are Yasm x86 only: // The following are Yasm x86 only:
// TODO(fbarchard): Port AVX2 to inline. // TODO(fbarchard): Port AVX2 to inline.

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 858 #define LIBYUV_VERSION 859
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT