From 697c5aa8315fe85f61918e3113f3849d4a0bded6 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Fri, 6 Mar 2015 19:12:21 +0000 Subject: [PATCH] disable nv12 avx2 for vs9/10 that dont support avx2 instructions. BUG=409 TESTED=try bots R=harryjin@google.com, johannkoenig@google.com Review URL: https://webrtc-codereview.appspot.com/43629004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1311 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/row_win.cc | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.chromium b/README.chromium index a6a69907b..43f30e488 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1310 +Version: 1311 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 027e34a3b..ef2c1c27b 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 1310 +#define LIBYUV_VERSION 1311 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_win.cc b/source/row_win.cc index 22c654070..08941f2a9 100644 --- a/source/row_win.cc +++ b/source/row_win.cc @@ -1775,6 +1775,7 @@ void I422ToARGBRow_AVX2(const uint8* y_buf, } #endif // HAS_I422TOARGBROW_AVX2 +#ifdef HAS_NV12TOARGBROW_AVX2 // 16 pixels. // 8 UV values upsampled to 16 UV, mixed with 16 Y producing 16 ARGB (64 bytes). __declspec(naked) __declspec(align(16)) @@ -1802,7 +1803,9 @@ void NV12ToARGBRow_AVX2(const uint8* y_buf, ret } } +#endif // HAS_NV12TOARGBROW_AVX2 +#ifdef HAS_NV21TOARGBROW_AVX2 // 16 pixels. // 8 VU values upsampled to 16 VU, mixed with 16 Y producing 16 ARGB (64 bytes). __declspec(naked) __declspec(align(16)) @@ -1830,6 +1833,7 @@ void NV21ToARGBRow_AVX2(const uint8* y_buf, ret } } +#endif // HAS_NV21TOARGBROW_AVX2 #ifdef HAS_I422TOBGRAROW_AVX2 // 16 pixels