From f7e5b5e361f66f7edc8c4b6617f541f341fd88cd Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Thu, 5 Feb 2015 19:41:10 +0000 Subject: [PATCH] Enable AVX I422ToARGB for Windows. BUG=393 TESTED=c:\intelsde\sde -ast -hsw -- out\release\libyuv_unittest.exe --gtest_catch_exceptions=0 --gtest_filter=*I422ToARGB_Opt R=harryjin@google.com Review URL: https://webrtc-codereview.appspot.com/41789004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1261 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/row.h | 12 ++++++------ include/libyuv/version.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.chromium b/README.chromium index a405f2efa..576608b52 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1260 +Version: 1261 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index 206e270ee..982523be2 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -196,11 +196,6 @@ extern "C" { #define HAS_ARGBTOYJROW_AVX2 #define HAS_ARGBTOYROW_AVX2 #define HAS_COPYROW_AVX -// TODO(fbarchard): fix AVX2 versions of YUV conversion. bug=393 -//#define HAS_I422TOABGRROW_AVX2 -//#define HAS_I422TOARGBROW_AVX2 -//#define HAS_I422TOBGRAROW_AVX2 -//#define HAS_I422TORGBAROW_AVX2 #define HAS_INTERPOLATEROW_AVX2 #define HAS_MERGEUVROW_AVX2 #define HAS_MIRRORROW_AVX2 @@ -220,9 +215,14 @@ extern "C" { #define HAS_ARGBUNATTENUATEROW_AVX2 #endif -// The following are available require VS2012 +// The following are available require VS2012. Port to GCC. #if !defined(LIBYUV_DISABLE_X86) && defined(VISUALC_HAS_AVX2) #define HAS_YTOARGBROW_AVX2 +// TODO(fbarchard): fix AVX2 versions of YUV conversion. bug=393 +#define HAS_I422TOABGRROW_AVX2 +#define HAS_I422TOARGBROW_AVX2 +#define HAS_I422TOBGRAROW_AVX2 +#define HAS_I422TORGBAROW_AVX2 #endif // The following are Yasm x86 only: diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 817f2132c..49d5581e4 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1260 +#define LIBYUV_VERSION 1261 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT