From 4e155ef6c40420e3b6e84dd18f813bbf8e8c61cd Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Tue, 27 Jan 2015 00:22:10 +0000 Subject: [PATCH] Change test to test for Arm, since all CPUs except arm provide accurate yuv conversion BUG=392 TESTED=try bots Review URL: https://webrtc-codereview.appspot.com/34059004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1254 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- unit_test/color_test.cc | 21 +++++++++------------ 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/README.chromium b/README.chromium index 221028ba7..cce3f2ff1 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1253 +Version: 1255 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 9a23e15c6..3c8386b99 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 1253 +#define LIBYUV_VERSION 1255 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/unit_test/color_test.cc b/unit_test/color_test.cc index 96e41bb3a..887327323 100644 --- a/unit_test/color_test.cc +++ b/unit_test/color_test.cc @@ -21,23 +21,20 @@ namespace libyuv { -#if defined (_M_X64) || defined(_M_IX86) || \ - defined(__x86_64__) || defined(__i386__)) -#define HIGH_ACCURACY 1 -#endif - -#ifdef HIGH_ACCURACY -#define MAX_CDIFF 0 -#define ERROR_R 1 -#define ERROR_G 1 -#define ERROR_B 3 -#define ERROR_FULL 5 -#else +// TODO(fbarchard): Port high accuracy YUV to RGB to Neon. +#if !defined(LIBYUV_DISABLE_NEON) && \ + (defined(__aarch64__) || defined(__ARM_NEON__) || defined(LIBYUV_NEON)) #define MAX_CDIFF 2 #define ERROR_R 3 #define ERROR_G 3 #define ERROR_B 5 #define ERROR_FULL 7 +#else +#define MAX_CDIFF 0 +#define ERROR_R 1 +#define ERROR_G 1 +#define ERROR_B 3 +#define ERROR_FULL 5 #endif #define TESTCS(TESTNAME, YUVTOARGB, ARGBTOYUV, HS1, HS, HN, DIFF, CDIFF) \