From 0a6dab42c0930a2e243bfef98c7a84b04c2aadb9 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Thu, 23 Oct 2014 23:05:12 +0000 Subject: [PATCH] Add check for minimum of 8 pixels for any functions and multiple of 8 not 16 for neon functions. BUG=373 TESTED=try bots R=harryjin@google.com Review URL: https://webrtc-codereview.appspot.com/23189004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1139 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/planar_functions.cc | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.chromium b/README.chromium index 5ff9eef8a..bd8165e96 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1137 +Version: 1138 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index f4f370fa8..93f8a778e 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 1137 +#define LIBYUV_VERSION 1138 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/planar_functions.cc b/source/planar_functions.cc index eb3092922..002a4a3dd 100644 --- a/source/planar_functions.cc +++ b/source/planar_functions.cc @@ -871,9 +871,9 @@ int I422ToABGR(const uint8* src_y, int src_stride_y, src_stride_y = src_stride_u = src_stride_v = dst_stride_abgr = 0; } #if defined(HAS_I422TOABGRROW_NEON) - if (TestCpuFlag(kCpuHasNEON)) { + if (TestCpuFlag(kCpuHasNEON) && width >= 8) { I422ToABGRRow = I422ToABGRRow_Any_NEON; - if (IS_ALIGNED(width, 16)) { + if (IS_ALIGNED(width, 8)) { I422ToABGRRow = I422ToABGRRow_NEON; } } @@ -939,9 +939,9 @@ int I422ToRGBA(const uint8* src_y, int src_stride_y, src_stride_y = src_stride_u = src_stride_v = dst_stride_rgba = 0; } #if defined(HAS_I422TORGBAROW_NEON) - if (TestCpuFlag(kCpuHasNEON)) { + if (TestCpuFlag(kCpuHasNEON) && width >= 8) { I422ToRGBARow = I422ToRGBARow_Any_NEON; - if (IS_ALIGNED(width, 16)) { + if (IS_ALIGNED(width, 8)) { I422ToRGBARow = I422ToRGBARow_NEON; } }