From d3d8e0d9337e82cb5e231785846c7bca2c8be3a4 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Mon, 1 Jun 2015 23:28:59 +0000 Subject: [PATCH] make source for planar tests contiguous to test planar functions coalesce into a single low level call. BUG=431 TESTED=SetPlane unittest R=bcornell@google.com Review URL: https://webrtc-codereview.appspot.com/51999004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1419 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- unit_test/planar_test.cc | 42 ++++++++++++++++++++++++---------------- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/README.chromium b/README.chromium index 5fb824541..9a330d466 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1418 +Version: 1419 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 86d8b7f26..4372d9aad 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 1418 +#define LIBYUV_VERSION 1419 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/unit_test/planar_test.cc b/unit_test/planar_test.cc index 0933fa9e1..c66834a04 100644 --- a/unit_test/planar_test.cc +++ b/unit_test/planar_test.cc @@ -110,7 +110,7 @@ static int TestAttenuateI(int width, int height, int benchmark_iterations, width = 1; } const int kBpp = 4; - const int kStride = (width * kBpp + 15) & ~15; + const int kStride = width * kBpp; align_buffer_64(src_argb, kStride * height + off); align_buffer_64(dst_argb_c, kStride * height); align_buffer_64(dst_argb_opt, kStride * height); @@ -176,7 +176,7 @@ static int TestUnattenuateI(int width, int height, int benchmark_iterations, width = 1; } const int kBpp = 4; - const int kStride = (width * kBpp + 15) & ~15; + const int kStride = width * kBpp; align_buffer_64(src_argb, kStride * height + off); align_buffer_64(dst_argb_c, kStride * height); align_buffer_64(dst_argb_opt, kStride * height); @@ -1366,7 +1366,7 @@ static int TestMultiply(int width, int height, int benchmark_iterations, width = 1; } const int kBpp = 4; - const int kStride = (width * kBpp + 15) & ~15; + const int kStride = width * kBpp; align_buffer_64(src_argb_a, kStride * height + off); align_buffer_64(src_argb_b, kStride * height + off); align_buffer_64(dst_argb_c, kStride * height); @@ -1437,7 +1437,7 @@ static int TestAdd(int width, int height, int benchmark_iterations, width = 1; } const int kBpp = 4; - const int kStride = (width * kBpp + 15) & ~15; + const int kStride = width * kBpp; align_buffer_64(src_argb_a, kStride * height + off); align_buffer_64(src_argb_b, kStride * height + off); align_buffer_64(dst_argb_c, kStride * height); @@ -1508,7 +1508,7 @@ static int TestSubtract(int width, int height, int benchmark_iterations, width = 1; } const int kBpp = 4; - const int kStride = (width * kBpp + 15) & ~15; + const int kStride = width * kBpp; align_buffer_64(src_argb_a, kStride * height + off); align_buffer_64(src_argb_b, kStride * height + off); align_buffer_64(dst_argb_c, kStride * height); @@ -1579,7 +1579,7 @@ static int TestSobel(int width, int height, int benchmark_iterations, width = 1; } const int kBpp = 4; - const int kStride = (width * kBpp + 15) & ~15; + const int kStride = width * kBpp; align_buffer_64(src_argb_a, kStride * height + off); align_buffer_64(dst_argb_c, kStride * height); align_buffer_64(dst_argb_opt, kStride * height); @@ -1715,7 +1715,7 @@ static int TestSobelXY(int width, int height, int benchmark_iterations, width = 1; } const int kBpp = 4; - const int kStride = (width * kBpp + 15) & ~15; + const int kStride = width * kBpp; align_buffer_64(src_argb_a, kStride * height + off); align_buffer_64(dst_argb_c, kStride * height); align_buffer_64(dst_argb_opt, kStride * height); @@ -1782,7 +1782,7 @@ static int TestBlur(int width, int height, int benchmark_iterations, width = 1; } const int kBpp = 4; - const int kStride = (width * kBpp + 15) & ~15; + const int kStride = width * kBpp; align_buffer_64(src_argb_a, kStride * height + off); align_buffer_64(dst_cumsum, width * height * 16); align_buffer_64(dst_argb_c, kStride * height); @@ -2103,7 +2103,7 @@ static int TestARGBRect(int width, int height, int benchmark_iterations, if (width < 1) { width = 1; } - const int kStride = (width * bpp + 15) & ~15; + const int kStride = width * bpp; const int kSize = kStride * height; const uint32 v32 = random() & (bpp == 4 ? 0xffffffff : 0xff); @@ -2144,49 +2144,57 @@ static int TestARGBRect(int width, int height, int benchmark_iterations, TEST_F(libyuvTest, ARGBRect_Any) { int max_diff = TestARGBRect(benchmark_width_ - 1, benchmark_height_, - benchmark_iterations_, disable_cpu_flags_, +1, 0, 4); + benchmark_iterations_, disable_cpu_flags_, + +1, 0, 4); EXPECT_EQ(0, max_diff); } TEST_F(libyuvTest, ARGBRect_Unaligned) { int max_diff = TestARGBRect(benchmark_width_, benchmark_height_, - benchmark_iterations_, disable_cpu_flags_, +1, 1, 4); + benchmark_iterations_, disable_cpu_flags_, + +1, 1, 4); EXPECT_EQ(0, max_diff); } TEST_F(libyuvTest, ARGBRect_Invert) { int max_diff = TestARGBRect(benchmark_width_, benchmark_height_, - benchmark_iterations_, disable_cpu_flags_, -1, 0, 4); + benchmark_iterations_, disable_cpu_flags_, + -1, 0, 4); EXPECT_EQ(0, max_diff); } TEST_F(libyuvTest, ARGBRect_Opt) { int max_diff = TestARGBRect(benchmark_width_, benchmark_height_, - benchmark_iterations_, disable_cpu_flags_, +1, 0, 4); + benchmark_iterations_, disable_cpu_flags_, + +1, 0, 4); EXPECT_EQ(0, max_diff); } TEST_F(libyuvTest, SetPlane_Any) { int max_diff = TestARGBRect(benchmark_width_ - 1, benchmark_height_, - benchmark_iterations_, disable_cpu_flags_, +1, 0, 1); + benchmark_iterations_, disable_cpu_flags_, + +1, 0, 1); EXPECT_EQ(0, max_diff); } TEST_F(libyuvTest, SetPlane_Unaligned) { int max_diff = TestARGBRect(benchmark_width_, benchmark_height_, - benchmark_iterations_, disable_cpu_flags_, +1, 1, 1); + benchmark_iterations_, disable_cpu_flags_, + +1, 1, 1); EXPECT_EQ(0, max_diff); } TEST_F(libyuvTest, SetPlane_Invert) { int max_diff = TestARGBRect(benchmark_width_, benchmark_height_, - benchmark_iterations_, disable_cpu_flags_, -1, 0, 1); + benchmark_iterations_, disable_cpu_flags_, + -1, 0, 1); EXPECT_EQ(0, max_diff); } TEST_F(libyuvTest, SetPlane_Opt) { int max_diff = TestARGBRect(benchmark_width_, benchmark_height_, - benchmark_iterations_, disable_cpu_flags_, +1, 0, 1); + benchmark_iterations_, disable_cpu_flags_, + +1, 0, 1); EXPECT_EQ(0, max_diff); }