Fix BlurEffectLayerIsVisible test
The setBackgroundBlurRadius by design blurs the screen behind the
layer requesting the blur. In the test the canvas is 256px, so when the
blur layer is drawn, the blurring operation samples pixels also from
outside of the canvasSize area. The color of the background behind the
layer the test draws is red, so the checking detects tints of red, which
are blended into our canvas, because of the blur.
To address that, this CL makes two changes:
- change the second color in the test to red instead of green, to match
the background color
- restricts the check to only traverse a portion of the canvas
vertically. We stop the Y traversal at a point where there is no
interference in the blue area from any sampled red colors from the
background
Bug: 200059958
Test: atest EffectLayerTest#BlurEffectLayerIsVisible --iterations=100
Change-Id: If38f3d85b97d70cbd2b4bba308d2870936d7a49f
diff --git a/services/surfaceflinger/tests/EffectLayer_test.cpp b/services/surfaceflinger/tests/EffectLayer_test.cpp
index 52aa502..92ebb8d 100644
--- a/services/surfaceflinger/tests/EffectLayer_test.cpp
+++ b/services/surfaceflinger/tests/EffectLayer_test.cpp
@@ -120,7 +120,7 @@
const auto canvasSize = 256;
sp<SurfaceControl> leftLayer = createColorLayer("Left", Color::BLUE);
- sp<SurfaceControl> rightLayer = createColorLayer("Right", Color::GREEN);
+ sp<SurfaceControl> rightLayer = createColorLayer("Right", Color::RED);
sp<SurfaceControl> blurLayer;
const auto leftRect = Rect(0, 0, canvasSize / 2, canvasSize);
const auto rightRect = Rect(canvasSize / 2, 0, canvasSize, canvasSize);
@@ -140,12 +140,12 @@
{
auto shot = screenshot();
shot->expectColor(leftRect, Color::BLUE);
- shot->expectColor(rightRect, Color::GREEN);
+ shot->expectColor(rightRect, Color::RED);
}
ASSERT_NO_FATAL_FAILURE(blurLayer = createColorLayer("BackgroundBlur", Color::TRANSPARENT));
- const auto blurRadius = canvasSize / 2;
+ const auto blurRadius = canvasSize / 4;
asTransaction([&](Transaction& t) {
t.setLayer(blurLayer, mLayerZBase + 3);
t.reparent(blurLayer, mParentLayer);
@@ -159,21 +159,26 @@
auto shot = screenshot();
const auto stepSize = 1;
- const auto blurAreaOffset = blurRadius * 0.7f;
- const auto blurAreaStartX = canvasSize / 2 - blurRadius + blurAreaOffset;
- const auto blurAreaEndX = canvasSize / 2 + blurRadius - blurAreaOffset;
+ const auto expectedBlurAreaSize = blurRadius * 1.5f;
+ const auto blurAreaStartX = canvasSize / 2 - expectedBlurAreaSize / 2;
+ const auto blurAreaEndX = canvasSize / 2 + expectedBlurAreaSize / 2;
+ // testAreaEndY is needed because the setBackgroundBlurRadius API blurs everything behind
+ // the surface, which means it samples pixels from outside the canvasSize and we get some
+ // unexpected colors in the screenshot.
+ const auto testAreaEndY = canvasSize - blurRadius * 2;
+
Color previousColor;
Color currentColor;
- for (int y = 0; y < canvasSize; y++) {
+ for (int y = 0; y < testAreaEndY; y++) {
shot->checkPixel(0, y, /* r = */ 0, /* g = */ 0, /* b = */ 255);
previousColor = shot->getPixelColor(0, y);
for (int x = blurAreaStartX; x < blurAreaEndX; x += stepSize) {
currentColor = shot->getPixelColor(x, y);
- ASSERT_GT(currentColor.g, previousColor.g);
+ ASSERT_GT(currentColor.r, previousColor.r);
ASSERT_LT(currentColor.b, previousColor.b);
- ASSERT_EQ(0, currentColor.r);
+ ASSERT_EQ(0, currentColor.g);
}
- shot->checkPixel(canvasSize - 1, y, 0, 255, 0);
+ shot->checkPixel(canvasSize - 1, y, 255, 0, 0);
}
}
}