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

Disable I420Blend_Any test that uses C

Browse Source 
Also renames Inverted to Invert in test name for consistency.

TBR=harryjin@google.com
BUG=libyuv:543

Review URL: https://codereview.chromium.org/1577973004 .
This commit is contained in:
Frank Barchard 2016-01-11 18:23:04 -08:00
parent 8030a711aa
commit 54bbea1701
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/libyuv/row.h
View File

@ -105,17 +105,6 @@ extern "C" {
#define HAS_COPYROW_SSE2 #define HAS_COPYROW_SSE2
#define HAS_H422TOARGBROW_SSSE3 #define HAS_H422TOARGBROW_SSSE3
#define HAS_I400TOARGBROW_SSE2 #define HAS_I400TOARGBROW_SSE2
// The following functions fail on gcc/clang 32 bit with fpic and framepointer.
// caveat: clangcl uses row_win.cc which works.
#if defined(NDEBUG) || !(defined(_DEBUG) && defined(__i386__)) || \
!defined(__i386__) || defined(_MSC_VER)
// TODO(fbarchard): fix build error on x86 debug
// https://code.google.com/p/libyuv/issues/detail?id=524
#define HAS_I411TOARGBROW_SSSE3
// TODO(fbarchard): fix build error on android_full_debug=1
// https://code.google.com/p/libyuv/issues/detail?id=517
#define HAS_I422ALPHATOARGBROW_SSSE3
#endif
#define HAS_I422TOARGB1555ROW_SSSE3 #define HAS_I422TOARGB1555ROW_SSSE3
#define HAS_I422TOARGB4444ROW_SSSE3 #define HAS_I422TOARGB4444ROW_SSSE3
#define HAS_I422TOARGBROW_SSSE3 #define HAS_I422TOARGBROW_SSSE3
@ -130,7 +119,6 @@ extern "C" {
#define HAS_MERGEUVROW_SSE2 #define HAS_MERGEUVROW_SSE2
#define HAS_MIRRORROW_SSSE3 #define HAS_MIRRORROW_SSSE3
#define HAS_MIRRORUVROW_SSSE3 #define HAS_MIRRORUVROW_SSSE3
#define HAS_MIRRORUVROW_SSSE3
#define HAS_NV12TOARGBROW_SSSE3 #define HAS_NV12TOARGBROW_SSSE3
#define HAS_NV12TORGB565ROW_SSSE3 #define HAS_NV12TORGB565ROW_SSSE3
#define HAS_NV21TOARGBROW_SSSE3 #define HAS_NV21TOARGBROW_SSSE3
@ -173,6 +161,7 @@ extern "C" {
#define HAS_ARGBSHADEROW_SSE2 #define HAS_ARGBSHADEROW_SSE2
#define HAS_ARGBSUBTRACTROW_SSE2 #define HAS_ARGBSUBTRACTROW_SSE2
#define HAS_ARGBUNATTENUATEROW_SSE2 #define HAS_ARGBUNATTENUATEROW_SSE2
#define HAS_BLENDPLANEROW_SSSE3
#define HAS_COMPUTECUMULATIVESUMROW_SSE2 #define HAS_COMPUTECUMULATIVESUMROW_SSE2
#define HAS_CUMULATIVESUMTOAVERAGEROW_SSE2 #define HAS_CUMULATIVESUMTOAVERAGEROW_SSE2
#define HAS_INTERPOLATEROW_SSSE3 #define HAS_INTERPOLATEROW_SSSE3
@ -182,7 +171,18 @@ extern "C" {
#define HAS_SOBELXROW_SSE2 #define HAS_SOBELXROW_SSE2
#define HAS_SOBELXYROW_SSE2 #define HAS_SOBELXYROW_SSE2
#define HAS_SOBELYROW_SSE2 #define HAS_SOBELYROW_SSE2
#define HAS_BLENDPLANEROW_SSSE3
// The following functions fail on gcc/clang 32 bit with fpic and framepointer.
// caveat: clangcl uses row_win.cc which works.
#if defined(NDEBUG) || !(defined(_DEBUG) && defined(__i386__)) || \
!defined(__i386__) || defined(_MSC_VER)
// TODO(fbarchard): fix build error on x86 debug
// https://code.google.com/p/libyuv/issues/detail?id=524
#define HAS_I411TOARGBROW_SSSE3
// TODO(fbarchard): fix build error on android_full_debug=1
// https://code.google.com/p/libyuv/issues/detail?id=517
#define HAS_I422ALPHATOARGBROW_SSSE3
#endif
#endif #endif
// The following are available on all x86 platforms, but // The following are available on all x86 platforms, but
@ -264,7 +264,6 @@ extern "C" {
// The following are available on Neon platforms: // The following are available on Neon platforms:
#if !defined(LIBYUV_DISABLE_NEON) && \ #if !defined(LIBYUV_DISABLE_NEON) && \
(defined(__aarch64__) || defined(__ARM_NEON__) || defined(LIBYUV_NEON)) (defined(__aarch64__) || defined(__ARM_NEON__) || defined(LIBYUV_NEON))
#define HAS_I422ALPHATOARGBROW_NEON
#define HAS_ABGRTOUVROW_NEON #define HAS_ABGRTOUVROW_NEON
#define HAS_ABGRTOYROW_NEON #define HAS_ABGRTOYROW_NEON
#define HAS_ARGB1555TOARGBROW_NEON #define HAS_ARGB1555TOARGBROW_NEON
@ -292,6 +291,7 @@ extern "C" {
#define HAS_COPYROW_NEON #define HAS_COPYROW_NEON
#define HAS_I400TOARGBROW_NEON #define HAS_I400TOARGBROW_NEON
#define HAS_I411TOARGBROW_NEON #define HAS_I411TOARGBROW_NEON
#define HAS_I422ALPHATOARGBROW_NEON
#define HAS_I422TOARGB1555ROW_NEON #define HAS_I422TOARGB1555ROW_NEON
#define HAS_I422TOARGB4444ROW_NEON #define HAS_I422TOARGB4444ROW_NEON
#define HAS_I422TOARGBROW_NEON #define HAS_I422TOARGBROW_NEON

4
unit_test/planar_test.cc
View File

@ -1330,7 +1330,9 @@ TEST_F(LibYUVPlanarTest, I420Blend_Unaligned) {
TestI420Blend(benchmark_width_, benchmark_height_, benchmark_iterations_, TestI420Blend(benchmark_width_, benchmark_height_, benchmark_iterations_,
disable_cpu_flags_, benchmark_cpu_info_, +1, 1); disable_cpu_flags_, benchmark_cpu_info_, +1, 1);
} }
TEST_F(LibYUVPlanarTest, I420Blend_Any) {
// TODO(fbarchard): DISABLED because _Any uses C. Avoid C and re-enable.
TEST_F(LibYUVPlanarTest, DISABLED_I420Blend_Any) {
TestI420Blend(benchmark_width_ - 4, benchmark_height_, benchmark_iterations_, TestI420Blend(benchmark_width_ - 4, benchmark_height_, benchmark_iterations_,
disable_cpu_flags_, benchmark_cpu_info_, +1, 0); disable_cpu_flags_, benchmark_cpu_info_, +1, 0);
} }

8
unit_test/rotate_test.cc
View File

@ -262,28 +262,28 @@ TEST_F(LibYUVRotateTest, DISABLED_NV12Rotate270_Odd) {
disable_cpu_flags_, benchmark_cpu_info_); disable_cpu_flags_, benchmark_cpu_info_);
} }
TEST_F(LibYUVRotateTest, NV12Rotate0_Inverted) { TEST_F(LibYUVRotateTest, NV12Rotate0_Invert) {
NV12TestRotate(benchmark_width_, -benchmark_height_, NV12TestRotate(benchmark_width_, -benchmark_height_,
benchmark_width_, benchmark_height_, benchmark_width_, benchmark_height_,
kRotate0, benchmark_iterations_, kRotate0, benchmark_iterations_,
disable_cpu_flags_, benchmark_cpu_info_); disable_cpu_flags_, benchmark_cpu_info_);
} }
TEST_F(LibYUVRotateTest, NV12Rotate90_Inverted) { TEST_F(LibYUVRotateTest, NV12Rotate90_Invert) {
NV12TestRotate(benchmark_width_, -benchmark_height_, NV12TestRotate(benchmark_width_, -benchmark_height_,
benchmark_height_, benchmark_width_, benchmark_height_, benchmark_width_,
kRotate90, benchmark_iterations_, kRotate90, benchmark_iterations_,
disable_cpu_flags_, benchmark_cpu_info_); disable_cpu_flags_, benchmark_cpu_info_);
} }
TEST_F(LibYUVRotateTest, NV12Rotate180_Inverted) { TEST_F(LibYUVRotateTest, NV12Rotate180_Invert) {
NV12TestRotate(benchmark_width_, -benchmark_height_, NV12TestRotate(benchmark_width_, -benchmark_height_,
benchmark_width_, benchmark_height_, benchmark_width_, benchmark_height_,
kRotate180, benchmark_iterations_, kRotate180, benchmark_iterations_,
disable_cpu_flags_, benchmark_cpu_info_); disable_cpu_flags_, benchmark_cpu_info_);
} }
TEST_F(LibYUVRotateTest, NV12Rotate270_Inverted) { TEST_F(LibYUVRotateTest, NV12Rotate270_Invert) {
NV12TestRotate(benchmark_width_, -benchmark_height_, NV12TestRotate(benchmark_width_, -benchmark_height_,
benchmark_height_, benchmark_width_, benchmark_height_, benchmark_width_,
kRotate270, benchmark_iterations_, kRotate270, benchmark_iterations_,