From 6a2593ac53c6eccf5505e17594e57dab51f816ea Mon Sep 17 00:00:00 2001 From: Kalle Raita Date: Tue, 2 Aug 2016 16:19:15 -0700 Subject: [PATCH] Increase YV12BufferPow2 test threshold The NPOT version already has 3 as the threshold and at least one platform seems to have diff of 3 in one of the internal pixels for POW2 variant. Bug: 21306103 Bug: 30920650 Change-Id: I7882a6ff43ffc862d95fea32c8ee8e7f19fb759d Cherry-pick from master (e3747fd25918c943caef4d9c7158a668c786c55d) --- libs/gui/tests/SurfaceTextureGL_test.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/gui/tests/SurfaceTextureGL_test.cpp b/libs/gui/tests/SurfaceTextureGL_test.cpp index dddcf922f6..5311c5957e 100644 --- a/libs/gui/tests/SurfaceTextureGL_test.cpp +++ b/libs/gui/tests/SurfaceTextureGL_test.cpp @@ -115,13 +115,13 @@ TEST_F(SurfaceTextureGLTest, TexturingFromCpuFilledYV12BufferPow2) { EXPECT_TRUE(checkPixel(63, 63, 0, 133, 0, 255)); EXPECT_TRUE(checkPixel( 0, 63, 255, 127, 255, 255)); - EXPECT_TRUE(checkPixel(22, 19, 100, 255, 74, 255)); - EXPECT_TRUE(checkPixel(45, 11, 100, 255, 74, 255)); - EXPECT_TRUE(checkPixel(52, 12, 155, 0, 181, 255)); - EXPECT_TRUE(checkPixel( 7, 32, 150, 237, 170, 255)); - EXPECT_TRUE(checkPixel(31, 54, 0, 71, 117, 255)); - EXPECT_TRUE(checkPixel(29, 28, 0, 133, 0, 255)); - EXPECT_TRUE(checkPixel(36, 41, 100, 232, 255, 255)); + EXPECT_TRUE(checkPixel(22, 19, 100, 255, 74, 255, 3)); + EXPECT_TRUE(checkPixel(45, 11, 100, 255, 74, 255, 3)); + EXPECT_TRUE(checkPixel(52, 12, 155, 0, 181, 255, 3)); + EXPECT_TRUE(checkPixel( 7, 32, 150, 237, 170, 255, 3)); + EXPECT_TRUE(checkPixel(31, 54, 0, 71, 117, 255, 3)); + EXPECT_TRUE(checkPixel(29, 28, 0, 133, 0, 255, 3)); + EXPECT_TRUE(checkPixel(36, 41, 100, 232, 255, 255, 3)); } TEST_F(SurfaceTextureGLTest, TexturingFromCpuFilledYV12BufferWithCrop) { -- 2.11.0