From f5c71e52bbb1adb50e4ec60605f6fa8ef9539390 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Tue, 21 Jul 2015 10:48:10 -0700 Subject: [PATCH] rowbytes fix for nv12 tests R=harryjin@google.com BUG=libyuv:466 Review URL: https://webrtc-codereview.appspot.com/50349004. --- README.chromium | 2 +- include/libyuv/version.h | 2 +- unit_test/convert_test.cc | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.chromium b/README.chromium index cfa14b1b3..c50fa361c 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1448 +Version: 1449 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index b8dbe3b06..9c46e9574 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 1448 +#define LIBYUV_VERSION 1449 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/unit_test/convert_test.cc b/unit_test/convert_test.cc index cbe2b444f..c546e955c 100644 --- a/unit_test/convert_test.cc +++ b/unit_test/convert_test.cc @@ -1537,7 +1537,7 @@ TEST_F(libyuvTest, NAME) { \ const int kHeight = benchmark_height_; \ \ align_buffer_64(orig_uyvy, \ - 2 * SUBSAMPLE(kWidth, 2) * kHeight); \ + 4 * SUBSAMPLE(kWidth, 2) * kHeight); \ align_buffer_64(orig_y, kWidth * kHeight); \ align_buffer_64(orig_u, \ SUBSAMPLE(kWidth, 2) * \ @@ -1557,10 +1557,10 @@ TEST_F(libyuvTest, NAME) { \ SUBSAMPLE(kHeight, 2)); \ \ srandom(time(NULL)); \ - MemRandomize(orig_uyvy, 2 * SUBSAMPLE(kWidth, 2) * kHeight); \ + MemRandomize(orig_uyvy, 4 * SUBSAMPLE(kWidth, 2) * kHeight); \ \ /* Convert UYVY to NV12 in 2 steps for reference */ \ - libyuv::UYVYTOI420(orig_uyvy, 2 * SUBSAMPLE(kWidth, 2), \ + libyuv::UYVYTOI420(orig_uyvy, 4 * SUBSAMPLE(kWidth, 2), \ orig_y, kWidth, \ orig_u, SUBSAMPLE(kWidth, 2), \ orig_v, SUBSAMPLE(kWidth, 2), \ @@ -1574,7 +1574,7 @@ TEST_F(libyuvTest, NAME) { \ \ /* Convert to NV12 */ \ for (int i = 0; i < benchmark_iterations_; ++i) { \ - libyuv::UYVYTONV12(orig_uyvy, 2 * SUBSAMPLE(kWidth, 2), \ + libyuv::UYVYTONV12(orig_uyvy, 4 * SUBSAMPLE(kWidth, 2), \ dst_y, kWidth, \ dst_uv, 2 * SUBSAMPLE(kWidth, 2), \ kWidth, kHeight); \