Index: unit_test/compare_test.cc |
diff --git a/unit_test/compare_test.cc b/unit_test/compare_test.cc |
index 832f7312340f999c0a8fb2426ad481adfa2c4fe4..a8ce671d693e4233068e1c1d951213a2dfdfe13f 100644 |
--- a/unit_test/compare_test.cc |
+++ b/unit_test/compare_test.cc |
@@ -16,7 +16,6 @@ |
#include "libyuv/basic_types.h" |
#include "libyuv/compare.h" |
#include "libyuv/cpu_id.h" |
-#include "libyuv/row.h" |
#include "libyuv/video_common.h" |
namespace libyuv { |
@@ -34,8 +33,8 @@ static uint32 ReferenceHashDjb2(const uint8* src, uint64 count, uint32 seed) { |
TEST_F(LibYUVBaseTest, Djb2_Test) { |
const int kMaxTest = benchmark_width_ * benchmark_height_; |
- align_buffer_64(src_a, kMaxTest); |
- align_buffer_64(src_b, kMaxTest); |
+ align_buffer_page_end(src_a, kMaxTest); |
+ align_buffer_page_end(src_b, kMaxTest); |
const char* fox = "The quick brown fox jumps over the lazy dog" |
" and feels as if he were in the seventh heaven of typography" |
@@ -112,13 +111,13 @@ TEST_F(LibYUVBaseTest, Djb2_Test) { |
h2 = HashDjb2(src_a, kMaxTest / 2, 0); |
EXPECT_EQ(h1, h2); |
- free_aligned_buffer_64(src_a); |
- free_aligned_buffer_64(src_b); |
+ free_aligned_buffer_page_end(src_a); |
+ free_aligned_buffer_page_end(src_b); |
} |
TEST_F(LibYUVBaseTest, BenchmarkDjb2_Opt) { |
const int kMaxTest = benchmark_width_ * benchmark_height_; |
- align_buffer_64(src_a, kMaxTest); |
+ align_buffer_page_end(src_a, kMaxTest); |
for (int i = 0; i < kMaxTest; ++i) { |
src_a[i] = i; |
@@ -129,12 +128,12 @@ TEST_F(LibYUVBaseTest, BenchmarkDjb2_Opt) { |
h1 = HashDjb2(src_a, kMaxTest, 5381); |
} |
EXPECT_EQ(h1, h2); |
- free_aligned_buffer_64(src_a); |
+ free_aligned_buffer_page_end(src_a); |
} |
TEST_F(LibYUVBaseTest, BenchmarkDjb2_Unaligned) { |
const int kMaxTest = benchmark_width_ * benchmark_height_; |
- align_buffer_64(src_a, kMaxTest + 1); |
+ align_buffer_page_end(src_a, kMaxTest + 1); |
for (int i = 0; i < kMaxTest; ++i) { |
src_a[i + 1] = i; |
} |
@@ -144,13 +143,13 @@ TEST_F(LibYUVBaseTest, BenchmarkDjb2_Unaligned) { |
h1 = HashDjb2(src_a + 1, kMaxTest, 5381); |
} |
EXPECT_EQ(h1, h2); |
- free_aligned_buffer_64(src_a); |
+ free_aligned_buffer_page_end(src_a); |
} |
TEST_F(LibYUVBaseTest, BenchmarkARGBDetect_Opt) { |
uint32 fourcc; |
const int kMaxTest = benchmark_width_ * benchmark_height_ * 4; |
- align_buffer_64(src_a, kMaxTest); |
+ align_buffer_page_end(src_a, kMaxTest); |
for (int i = 0; i < kMaxTest; ++i) { |
src_a[i] = 255; |
} |
@@ -172,13 +171,13 @@ TEST_F(LibYUVBaseTest, BenchmarkARGBDetect_Opt) { |
} |
EXPECT_EQ(0, fourcc); |
- free_aligned_buffer_64(src_a); |
+ free_aligned_buffer_page_end(src_a); |
} |
TEST_F(LibYUVBaseTest, BenchmarkARGBDetect_Unaligned) { |
uint32 fourcc; |
const int kMaxTest = benchmark_width_ * benchmark_height_ * 4 + 1; |
- align_buffer_64(src_a, kMaxTest); |
+ align_buffer_page_end(src_a, kMaxTest); |
for (int i = 1; i < kMaxTest; ++i) { |
src_a[i] = 255; |
} |
@@ -200,12 +199,12 @@ TEST_F(LibYUVBaseTest, BenchmarkARGBDetect_Unaligned) { |
} |
EXPECT_EQ(0, fourcc); |
- free_aligned_buffer_64(src_a); |
+ free_aligned_buffer_page_end(src_a); |
} |
TEST_F(LibYUVBaseTest, BenchmarkSumSquareError_Opt) { |
const int kMaxWidth = 4096 * 3; |
- align_buffer_64(src_a, kMaxWidth); |
- align_buffer_64(src_b, kMaxWidth); |
+ align_buffer_page_end(src_a, kMaxWidth); |
+ align_buffer_page_end(src_b, kMaxWidth); |
memset(src_a, 0, kMaxWidth); |
memset(src_b, 0, kMaxWidth); |
@@ -229,14 +228,14 @@ TEST_F(LibYUVBaseTest, BenchmarkSumSquareError_Opt) { |
EXPECT_EQ(0, h1); |
- free_aligned_buffer_64(src_a); |
- free_aligned_buffer_64(src_b); |
+ free_aligned_buffer_page_end(src_a); |
+ free_aligned_buffer_page_end(src_b); |
} |
TEST_F(LibYUVBaseTest, SumSquareError) { |
const int kMaxWidth = 4096 * 3; |
- align_buffer_64(src_a, kMaxWidth); |
- align_buffer_64(src_b, kMaxWidth); |
+ align_buffer_page_end(src_a, kMaxWidth); |
+ align_buffer_page_end(src_b, kMaxWidth); |
memset(src_a, 0, kMaxWidth); |
memset(src_b, 0, kMaxWidth); |
@@ -269,13 +268,13 @@ TEST_F(LibYUVBaseTest, SumSquareError) { |
EXPECT_EQ(c_err, opt_err); |
- free_aligned_buffer_64(src_a); |
- free_aligned_buffer_64(src_b); |
+ free_aligned_buffer_page_end(src_a); |
+ free_aligned_buffer_page_end(src_b); |
} |
TEST_F(LibYUVBaseTest, BenchmarkPsnr_Opt) { |
- align_buffer_64(src_a, benchmark_width_ * benchmark_height_); |
- align_buffer_64(src_b, benchmark_width_ * benchmark_height_); |
+ align_buffer_page_end(src_a, benchmark_width_ * benchmark_height_); |
+ align_buffer_page_end(src_b, benchmark_width_ * benchmark_height_); |
for (int i = 0; i < benchmark_width_ * benchmark_height_; ++i) { |
src_a[i] = i; |
src_b[i] = i; |
@@ -294,13 +293,13 @@ TEST_F(LibYUVBaseTest, BenchmarkPsnr_Opt) { |
EXPECT_EQ(0, 0); |
- free_aligned_buffer_64(src_a); |
- free_aligned_buffer_64(src_b); |
+ free_aligned_buffer_page_end(src_a); |
+ free_aligned_buffer_page_end(src_b); |
} |
TEST_F(LibYUVBaseTest, BenchmarkPsnr_Unaligned) { |
- align_buffer_64(src_a, benchmark_width_ * benchmark_height_ + 1); |
- align_buffer_64(src_b, benchmark_width_ * benchmark_height_); |
+ align_buffer_page_end(src_a, benchmark_width_ * benchmark_height_ + 1); |
+ align_buffer_page_end(src_b, benchmark_width_ * benchmark_height_); |
for (int i = 0; i < benchmark_width_ * benchmark_height_; ++i) { |
src_a[i + 1] = i; |
src_b[i] = i; |
@@ -319,8 +318,8 @@ TEST_F(LibYUVBaseTest, BenchmarkPsnr_Unaligned) { |
EXPECT_EQ(0, 0); |
- free_aligned_buffer_64(src_a); |
- free_aligned_buffer_64(src_b); |
+ free_aligned_buffer_page_end(src_a); |
+ free_aligned_buffer_page_end(src_b); |
} |
TEST_F(LibYUVBaseTest, Psnr) { |
@@ -329,8 +328,8 @@ TEST_F(LibYUVBaseTest, Psnr) { |
const int b = 128; |
const int kSrcPlaneSize = (kSrcWidth + b * 2) * (kSrcHeight + b * 2); |
const int kSrcStride = 2 * b + kSrcWidth; |
- align_buffer_64(src_a, kSrcPlaneSize); |
- align_buffer_64(src_b, kSrcPlaneSize); |
+ align_buffer_page_end(src_a, kSrcPlaneSize); |
+ align_buffer_page_end(src_b, kSrcPlaneSize); |
memset(src_a, 0, kSrcPlaneSize); |
memset(src_b, 0, kSrcPlaneSize); |
@@ -396,13 +395,13 @@ TEST_F(LibYUVBaseTest, Psnr) { |
EXPECT_EQ(opt_err, c_err); |
- free_aligned_buffer_64(src_a); |
- free_aligned_buffer_64(src_b); |
+ free_aligned_buffer_page_end(src_a); |
+ free_aligned_buffer_page_end(src_b); |
} |
TEST_F(LibYUVBaseTest, DISABLED_BenchmarkSsim_Opt) { |
- align_buffer_64(src_a, benchmark_width_ * benchmark_height_); |
- align_buffer_64(src_b, benchmark_width_ * benchmark_height_); |
+ align_buffer_page_end(src_a, benchmark_width_ * benchmark_height_); |
+ align_buffer_page_end(src_b, benchmark_width_ * benchmark_height_); |
for (int i = 0; i < benchmark_width_ * benchmark_height_; ++i) { |
src_a[i] = i; |
src_b[i] = i; |
@@ -421,8 +420,8 @@ TEST_F(LibYUVBaseTest, DISABLED_BenchmarkSsim_Opt) { |
EXPECT_EQ(0, 0); // Pass if we get this far. |
- free_aligned_buffer_64(src_a); |
- free_aligned_buffer_64(src_b); |
+ free_aligned_buffer_page_end(src_a); |
+ free_aligned_buffer_page_end(src_b); |
} |
TEST_F(LibYUVBaseTest, Ssim) { |
@@ -431,8 +430,8 @@ TEST_F(LibYUVBaseTest, Ssim) { |
const int b = 128; |
const int kSrcPlaneSize = (kSrcWidth + b * 2) * (kSrcHeight + b * 2); |
const int kSrcStride = 2 * b + kSrcWidth; |
- align_buffer_64(src_a, kSrcPlaneSize); |
- align_buffer_64(src_b, kSrcPlaneSize); |
+ align_buffer_page_end(src_a, kSrcPlaneSize); |
+ align_buffer_page_end(src_b, kSrcPlaneSize); |
memset(src_a, 0, kSrcPlaneSize); |
memset(src_b, 0, kSrcPlaneSize); |
@@ -507,8 +506,8 @@ TEST_F(LibYUVBaseTest, Ssim) { |
EXPECT_EQ(opt_err, c_err); |
} |
- free_aligned_buffer_64(src_a); |
- free_aligned_buffer_64(src_b); |
+ free_aligned_buffer_page_end(src_a); |
+ free_aligned_buffer_page_end(src_b); |
} |
} // namespace libyuv |