Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a047b922 authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

CachedSet::append: remove mHolePunchLayer 

Bug: 189899692
Test: libcompositionengine_test

When the PIP is paused, it soon becomes inactive, and then it is
appended to the CachedSet behind it. This invalidates the override
buffer, but when we create a new one, we drew the video and (because
mHolePunchLayer was unchanged) immediately erased it.

With this CL, we'll remove mHolePunchLayer when we append so that we no
longer erase the PIP.

Change-Id: I45f4f8d557da9b54680527b08df23475ae04d0bc
parent 3b71371d

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/CachedSet.h

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ public: 
        mOutputDataspace = ui::Dataspace::UNKNOWN;

        mDrawFence = nullptr;

        mBlurLayer = nullptr;

        mHolePunchLayer = nullptr;



        mLayers.insert(mLayers.end(), other.mLayers.cbegin(), other.mLayers.cend());

        Region boundingRegion;

services/surfaceflinger/CompositionEngine/tests/planner/CachedSetTest.cpp

+19 −0
Original line number Diff line number Diff line
@@ -607,6 +607,25 @@ TEST_F(CachedSetTest, addHolePunch_noBuffer) { 
    cachedSet.render(mRenderEngine, mOutputState);

}



TEST_F(CachedSetTest, append_removesHolePunch) {

    mTestLayers[0]->outputLayerCompositionState.displayFrame = Rect(0, 0, 5, 5);

    mTestLayers[0]->layerFECompositionState.isOpaque = true;

    CachedSet::Layer& layer1 = *mTestLayers[0]->cachedSetLayer.get();

    CachedSet::Layer& layer2 = *mTestLayers[1]->cachedSetLayer.get();

    CachedSet::Layer& layer3 = *mTestLayers[2]->cachedSetLayer.get();



    CachedSet cachedSet(layer1);

    cachedSet.addLayer(layer2.getState(), kStartTime + 10ms);



    cachedSet.addHolePunchLayerIfFeasible(layer3, false);



    ASSERT_EQ(&mTestLayers[2]->outputLayer, cachedSet.getHolePunchLayer());



    CachedSet cachedSet3(layer3);

    cachedSet.append(cachedSet3);

    ASSERT_EQ(nullptr, cachedSet.getHolePunchLayer());

}



TEST_F(CachedSetTest, decompose_removesHolePunch) {

    mTestLayers[0]->outputLayerCompositionState.displayFrame = Rect(0, 0, 5, 5);

    CachedSet::Layer& layer1 = *mTestLayers[0]->cachedSetLayer.get();