rowbytes fix for nv12 tests

R=harryjin@google.com
BUG=libyuv:466

Review URL: https://webrtc-codereview.appspot.com/50349004.
This commit is contained in:
Frank Barchard 2015-07-21 10:48:10 -07:00
parent ce98129951
commit f5c71e52bb
3 changed files with 6 additions and 6 deletions

View File

@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 1448
Version: 1449
License: BSD
License File: LICENSE

View File

@ -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

View File

@ -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); \