From de71c67e53d79190b5b7cc760ade9027855dd945 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Wed, 27 Apr 2022 00:15:10 -0700 Subject: [PATCH] MergeUV test fix - depth is 16 (bits) Bug: b/230550621 Change-Id: Ie36d3b8bdadb4300d54611798a4dfd488c30ca8d Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3609691 Reviewed-by: Mirko Bonadei Commit-Queue: Frank Barchard --- README.chromium | 2 +- include/libyuv/version.h | 2 +- unit_test/planar_test.cc | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.chromium b/README.chromium index 388a9145d..76b541212 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1822 +Version: 1823 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index a2d9fce0d..d0b94feec 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1822 +#define LIBYUV_VERSION 1823 #endif // INCLUDE_LIBYUV_VERSION_H_ diff --git a/unit_test/planar_test.cc b/unit_test/planar_test.cc index 8a98d5596..76fec3ecf 100644 --- a/unit_test/planar_test.cc +++ b/unit_test/planar_test.cc @@ -3364,19 +3364,19 @@ TEST_F(LibYUVPlanarTest, MergeUVRow_16_Opt) { MergeUVRow_16_C(reinterpret_cast(src_pixels_u), reinterpret_cast(src_pixels_v), - reinterpret_cast(dst_pixels_uv_c), 64, kPixels); + reinterpret_cast(dst_pixels_uv_c), 16, kPixels); int has_avx2 = TestCpuFlag(kCpuHasAVX2); for (int i = 0; i < benchmark_iterations_; ++i) { if (has_avx2) { MergeUVRow_16_AVX2(reinterpret_cast(src_pixels_u), reinterpret_cast(src_pixels_v), - reinterpret_cast(dst_pixels_uv_opt), 64, + reinterpret_cast(dst_pixels_uv_opt), 16, kPixels); } else { MergeUVRow_16_C(reinterpret_cast(src_pixels_u), reinterpret_cast(src_pixels_v), - reinterpret_cast(dst_pixels_uv_opt), 64, + reinterpret_cast(dst_pixels_uv_opt), 16, kPixels); } }