Index: unit_test/color_test.cc |
diff --git a/unit_test/color_test.cc b/unit_test/color_test.cc |
index 555413f79a456851e82ca5865a2f356891286efe..0852a91d13830b8e8de809fd966e1a1df30de6bf 100644 |
--- a/unit_test/color_test.cc |
+++ b/unit_test/color_test.cc |
@@ -10,12 +10,12 @@ |
#include <stdlib.h> |
+#include "libyuv/basic_types.h" |
#include "libyuv/convert.h" |
#include "libyuv/convert_argb.h" |
#include "libyuv/convert_from.h" |
#include "libyuv/convert_from_argb.h" |
#include "libyuv/cpu_id.h" |
-#include "libyuv/row.h" // For Sobel |
#include "../unit_test/unit_test.h" |
namespace libyuv { |
@@ -41,15 +41,15 @@ namespace libyuv { |
const int kPixels = benchmark_width_ * benchmark_height_; \ |
const int kHalfPixels = ((benchmark_width_ + 1) / 2) * \ |
((benchmark_height_ + HS1) / HS); \ |
- align_buffer_64(orig_y, kPixels); \ |
- align_buffer_64(orig_u, kHalfPixels); \ |
- align_buffer_64(orig_v, kHalfPixels); \ |
- align_buffer_64(orig_pixels, kPixels * 4); \ |
- align_buffer_64(temp_y, kPixels); \ |
- align_buffer_64(temp_u, kHalfPixels); \ |
- align_buffer_64(temp_v, kHalfPixels); \ |
- align_buffer_64(dst_pixels_opt, kPixels * 4); \ |
- align_buffer_64(dst_pixels_c, kPixels * 4); \ |
+ align_buffer_page_end(orig_y, kPixels); \ |
+ align_buffer_page_end(orig_u, kHalfPixels); \ |
+ align_buffer_page_end(orig_v, kHalfPixels); \ |
+ align_buffer_page_end(orig_pixels, kPixels * 4); \ |
+ align_buffer_page_end(temp_y, kPixels); \ |
+ align_buffer_page_end(temp_u, kHalfPixels); \ |
+ align_buffer_page_end(temp_v, kHalfPixels); \ |
+ align_buffer_page_end(dst_pixels_opt, kPixels * 4); \ |
+ align_buffer_page_end(dst_pixels_c, kPixels * 4); \ |
\ |
MemRandomize(orig_pixels, kPixels * 4); \ |
MemRandomize(orig_y, kPixels); \ |
@@ -132,15 +132,15 @@ namespace libyuv { |
static_cast<int>(dst_pixels_opt[i]), DIFF); \ |
} \ |
\ |
- free_aligned_buffer_64(orig_pixels); \ |
- free_aligned_buffer_64(orig_y); \ |
- free_aligned_buffer_64(orig_u); \ |
- free_aligned_buffer_64(orig_v); \ |
- free_aligned_buffer_64(temp_y); \ |
- free_aligned_buffer_64(temp_u); \ |
- free_aligned_buffer_64(temp_v); \ |
- free_aligned_buffer_64(dst_pixels_opt); \ |
- free_aligned_buffer_64(dst_pixels_c); \ |
+ free_aligned_buffer_page_end(orig_pixels); \ |
+ free_aligned_buffer_page_end(orig_y); \ |
+ free_aligned_buffer_page_end(orig_u); \ |
+ free_aligned_buffer_page_end(orig_v); \ |
+ free_aligned_buffer_page_end(temp_y); \ |
+ free_aligned_buffer_page_end(temp_u); \ |
+ free_aligned_buffer_page_end(temp_v); \ |
+ free_aligned_buffer_page_end(dst_pixels_opt); \ |
+ free_aligned_buffer_page_end(dst_pixels_c); \ |
} \ |
TESTCS(TestI420, I420ToARGB, ARGBToI420, 1, 2, benchmark_width_, ERROR_FULL) |