commit de71c67e53d79190b5b7cc760ade9027855dd945
author Frank Barchard <fbarchard@google.com> Wed Apr 27 00:15:10 2022 -0700
committer libyuv LUCI CQ <libyuv-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Apr 27 07:38:05 2022 +0000
tree fbd20bd93c501dcae8a532bf7a2b47cf47a25242
parent d62ee21e6627888e84466b5a5ed15775582ac67b

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 <mbonadei@chromium.org>
Commit-Queue: Frank Barchard <fbarchard@chromium.org>

README.chromium

diff --git a/README.chromium b/README.chromium
index 388a914..76b5412 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
 

include/libyuv/version.h

diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index a2d9fce..d0b94fe 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_

unit_test/planar_test.cc

diff --git a/unit_test/planar_test.cc b/unit_test/planar_test.cc
index 8a98d55..76fec3e 100644
--- a/unit_test/planar_test.cc
+++ b/unit_test/planar_test.cc
@@ -3364,19 +3364,19 @@
 
   MergeUVRow_16_C(reinterpret_cast<const uint16_t*>(src_pixels_u),
                   reinterpret_cast<const uint16_t*>(src_pixels_v),
-                  reinterpret_cast<uint16_t*>(dst_pixels_uv_c), 64, kPixels);
+                  reinterpret_cast<uint16_t*>(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<const uint16_t*>(src_pixels_u),
                          reinterpret_cast<const uint16_t*>(src_pixels_v),
-                         reinterpret_cast<uint16_t*>(dst_pixels_uv_opt), 64,
+                         reinterpret_cast<uint16_t*>(dst_pixels_uv_opt), 16,
                          kPixels);
     } else {
       MergeUVRow_16_C(reinterpret_cast<const uint16_t*>(src_pixels_u),
                       reinterpret_cast<const uint16_t*>(src_pixels_v),
-                      reinterpret_cast<uint16_t*>(dst_pixels_uv_opt), 64,
+                      reinterpret_cast<uint16_t*>(dst_pixels_uv_opt), 16,
                       kPixels);
     }
   }