diff options
author | Frank Barchard <fbarchard@chromium.org> | 2022-06-07 09:06:38 +0000 |
---|---|---|
committer | libyuv LUCI CQ <libyuv-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-06-07 09:16:05 +0000 |
commit | d011314f14738e0751dcb269c1d989c4dcbaad7b (patch) | |
tree | ba4ac530c7714d19e51bd8490da51c9ad2f9bb87 /unit_test/scale_test.cc | |
parent | 60254a1d846a93a4d7559009004cdd91bcc04d82 (diff) | |
download | libyuv-d011314f14738e0751dcb269c1d989c4dcbaad7b.tar.gz |
Revert "I210ToI420, InterpolatePlane_16, and ScalePlane Vertical-only asan fix"
This reverts commit 60254a1d846a93a4d7559009004cdd91bcc04d82.
Reason for revert: breaks PaintCanvasVideoRendererTest.HighBitDepth
Original change's description:
> I210ToI420, InterpolatePlane_16, and ScalePlane Vertical-only asan fix
>
> - Add I210ToI420 to convert 10 bit 4:2:2 YUV to 4:2:0 8 bit
> - Add NEON InterpolateRow_16 for fast 10 bit scaling
> - When scaling up, set step to interpolate toward height - 1 to avoid buffer overread
> - When scaling down, center the 2 rows used for source to achieve filtering.
> - CopyPlane check for 0 size and return
>
> Bug: libyuv:931, b/228605787, b/233233302, b/233634772, b/234558395, b/234340482
> Change-Id: I63e8580710a57812b683c2fe40583ac5a179c4f1
> Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3687552
> Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
> Reviewed-by: richard winterton <rrwinterton@gmail.com>
Bug: libyuv:931, b/228605787, b/233233302, b/233634772, b/234558395, b/234340482
Change-Id: Icc05bb340db0e7fe864061fb501d0a861c764116
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3692886
Reviewed-by: Frank Barchard <fbarchard@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Diffstat (limited to 'unit_test/scale_test.cc')
-rw-r--r-- | unit_test/scale_test.cc | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/unit_test/scale_test.cc b/unit_test/scale_test.cc index 81c839f4..1fb3b2f0 100644 --- a/unit_test/scale_test.cc +++ b/unit_test/scale_test.cc @@ -1545,57 +1545,4 @@ TEST_F(LibYUVScaleTest, PlaneTestRotate_Box) { free_aligned_buffer_page_end(orig_pixels); } -TEST_F(LibYUVScaleTest, PlaneTest1_Box) { - align_buffer_page_end(orig_pixels, 3); - align_buffer_page_end(dst_pixels, 3); - - // Pad the 1x1 byte image with invalid values before and after in case libyuv - // reads outside the memory boundaries. - orig_pixels[0] = 0; - orig_pixels[1] = 1; // scale this pixel - orig_pixels[2] = 2; - dst_pixels[0] = 3; - dst_pixels[1] = 3; - dst_pixels[2] = 3; - - libyuv::ScalePlane(orig_pixels + 1, /* src_stride= */ 1, /* src_width= */ 1, - /* src_height= */ 1, dst_pixels, /* dst_stride= */ 1, - /* dst_width= */ 1, /* dst_height= */ 2, - libyuv::kFilterBox); - - EXPECT_EQ(dst_pixels[0], 1); - EXPECT_EQ(dst_pixels[1], 1); - EXPECT_EQ(dst_pixels[2], 3); - - free_aligned_buffer_page_end(dst_pixels); - free_aligned_buffer_page_end(orig_pixels); -} - -TEST_F(LibYUVScaleTest, PlaneTest1_16_Box) { - align_buffer_page_end(orig_pixels_alloc, 3 * 2); - align_buffer_page_end(dst_pixels_alloc, 3 * 2); - uint16_t* orig_pixels = (uint16_t*)orig_pixels_alloc; - uint16_t* dst_pixels = (uint16_t*)dst_pixels_alloc; - - // Pad the 1x1 byte image with invalid values before and after in case libyuv - // reads outside the memory boundaries. - orig_pixels[0] = 0; - orig_pixels[1] = 1; // scale this pixel - orig_pixels[2] = 2; - dst_pixels[0] = 3; - dst_pixels[1] = 3; - dst_pixels[2] = 3; - - libyuv::ScalePlane_16( - orig_pixels + 1, /* src_stride= */ 1, /* src_width= */ 1, - /* src_height= */ 1, dst_pixels, /* dst_stride= */ 1, - /* dst_width= */ 1, /* dst_height= */ 2, libyuv::kFilterNone); - - EXPECT_EQ(dst_pixels[0], 1); - EXPECT_EQ(dst_pixels[1], 1); - EXPECT_EQ(dst_pixels[2], 3); - - free_aligned_buffer_page_end(dst_pixels_alloc); - free_aligned_buffer_page_end(orig_pixels_alloc); -} } // namespace libyuv |