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

Commit b4947572 authored by Peiyong Lin's avatar Peiyong Lin
Browse files

Ensure to switch to unprotected context if display is not secure. 

Previously we only consider the switch when the display is secure,
however, it is possible that the primary display uses protected context
but virtual display is not secure and hence RenderEngine won't switch
back to unprotected context.  This patch enforce the switch when display
is not secure.

Bug: b/169393573
Test: No flashing when recording Youtube DRM
Test: atest libcompositionengine_test
Change-Id: Ieeda99a92e8d78f7418f7a1e0da9938bcd4753d5
Merged-In: Ieeda99a92e8d78f7418f7a1e0da9938bcd4753d5
parent d95f8b18

services/surfaceflinger/CompositionEngine/src/Output.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -835,6 +835,8 @@ std::optional<base::unique_fd> Output::composeSurfaces( 
            needsProtected == renderEngine.isProtected()) {

            needsProtected == renderEngine.isProtected()) {

            mRenderSurface->setProtected(needsProtected);

            mRenderSurface->setProtected(needsProtected);

        }

        }

    } else if (!outputState.isSecure && renderEngine.isProtected()) {

        renderEngine.useProtectedContext(false);

    }

    }





    base::unique_fd fd;

    base::unique_fd fd;

services/surfaceflinger/CompositionEngine/tests/DisplayTest.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -159,6 +159,7 @@ struct DisplayTestCommon : public testing::Test { 
        EXPECT_CALL(mCompositionEngine, getHwComposer()).WillRepeatedly(ReturnRef(mHwComposer));

        EXPECT_CALL(mCompositionEngine, getHwComposer()).WillRepeatedly(ReturnRef(mHwComposer));

        EXPECT_CALL(mCompositionEngine, getRenderEngine()).WillRepeatedly(ReturnRef(mRenderEngine));

        EXPECT_CALL(mCompositionEngine, getRenderEngine()).WillRepeatedly(ReturnRef(mRenderEngine));

        EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

        EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

        EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    }

    }





    DisplayCreationArgs getDisplayCreationArgsForPhysicalHWCDisplay() {

    DisplayCreationArgs getDisplayCreationArgsForPhysicalHWCDisplay() {

services/surfaceflinger/CompositionEngine/tests/OutputTest.cpp

+14 −0
Original line number Original line Diff line number Diff line
@@ -2871,6 +2871,7 @@ TEST_F(OutputComposeSurfacesTest, doesNothingButSignalNoExpensiveRenderingIfNoCl 
    mOutput.mState.usesClientComposition = false;

    mOutput.mState.usesClientComposition = false;





    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));





    EXPECT_CALL(mOutput, setExpensiveRenderingExpected(false));

    EXPECT_CALL(mOutput, setExpensiveRenderingExpected(false));
@@ -2883,6 +2884,7 @@ TEST_F(OutputComposeSurfacesTest, 
    mOutput.mState.flipClientTarget = true;

    mOutput.mState.flipClientTarget = true;





    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));





    EXPECT_CALL(*mRenderSurface, dequeueBuffer(_)).WillOnce(Return(mOutputBuffer));

    EXPECT_CALL(*mRenderSurface, dequeueBuffer(_)).WillOnce(Return(mOutputBuffer));

    EXPECT_CALL(mOutput, setExpensiveRenderingExpected(false));

    EXPECT_CALL(mOutput, setExpensiveRenderingExpected(false));
@@ -2892,6 +2894,7 @@ TEST_F(OutputComposeSurfacesTest, 




TEST_F(OutputComposeSurfacesTest, doesMinimalWorkIfDequeueBufferFailsForClientComposition) {

TEST_F(OutputComposeSurfacesTest, doesMinimalWorkIfDequeueBufferFailsForClientComposition) {

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));





    EXPECT_CALL(*mRenderSurface, dequeueBuffer(_)).WillOnce(Return(nullptr));

    EXPECT_CALL(*mRenderSurface, dequeueBuffer(_)).WillOnce(Return(nullptr));
@@ -2904,6 +2907,7 @@ TEST_F(OutputComposeSurfacesTest, 
    mOutput.mState.flipClientTarget = true;

    mOutput.mState.flipClientTarget = true;





    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));





    EXPECT_CALL(*mRenderSurface, dequeueBuffer(_)).WillOnce(Return(nullptr));

    EXPECT_CALL(*mRenderSurface, dequeueBuffer(_)).WillOnce(Return(nullptr));
@@ -2914,6 +2918,7 @@ TEST_F(OutputComposeSurfacesTest, handlesZeroCompositionRequests) { 
    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{}));

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{}));

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))
@@ -2936,6 +2941,7 @@ TEST_F(OutputComposeSurfacesTest, buildsAndRendersRequestList) { 
    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{r1}));

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{r1}));

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))
@@ -2963,6 +2969,7 @@ TEST_F(OutputComposeSurfacesTest, renderDuplicateClientCompositionRequestsWithou 
    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{r1, r2}));

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{r1, r2}));

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))
@@ -2991,6 +2998,7 @@ TEST_F(OutputComposeSurfacesTest, skipDuplicateClientCompositionRequests) { 
    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{r1, r2}));

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{r1, r2}));

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))
@@ -3019,6 +3027,7 @@ TEST_F(OutputComposeSurfacesTest, clientCompositionIfBufferChanges) { 
    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{r1, r2}));

            .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{r1, r2}));

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))

    EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))
@@ -3050,6 +3059,7 @@ TEST_F(OutputComposeSurfacesTest, clientCompositionIfRequestChanges) { 
    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

    EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

    EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

            .WillOnce(Return(std::vector<LayerFE::LayerSettings>{r1, r2}))

            .WillOnce(Return(std::vector<LayerFE::LayerSettings>{r1, r2}))

            .WillOnce(Return(std::vector<LayerFE::LayerSettings>{r1, r3}));

            .WillOnce(Return(std::vector<LayerFE::LayerSettings>{r1, r3}));
@@ -3072,6 +3082,7 @@ TEST_F(OutputComposeSurfacesTest, clientCompositionIfRequestChanges) { 
struct OutputComposeSurfacesTest_UsesExpectedDisplaySettings : public OutputComposeSurfacesTest {

struct OutputComposeSurfacesTest_UsesExpectedDisplaySettings : public OutputComposeSurfacesTest {

    OutputComposeSurfacesTest_UsesExpectedDisplaySettings() {

    OutputComposeSurfacesTest_UsesExpectedDisplaySettings() {

        EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

        EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

        EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

        EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

        EXPECT_CALL(mOutput, generateClientCompositionRequests(_, _, kDefaultOutputDataspace))

                .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{}));

                .WillRepeatedly(Return(std::vector<LayerFE::LayerSettings>{}));

        EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))

        EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))
@@ -3219,6 +3230,8 @@ TEST_F(OutputComposeSurfacesTest_HandlesProtectedContent, ifDisplayIsNotSecure) 
    mOutput.mState.isSecure = false;

    mOutput.mState.isSecure = false;

    mLayer2.mLayerFEState.hasProtectedContent = true;

    mLayer2.mLayerFEState.hasProtectedContent = true;

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(true));

    EXPECT_CALL(mRenderEngine, isProtected).WillOnce(Return(true));

    EXPECT_CALL(mRenderEngine, useProtectedContext(false)).WillOnce(Return(true));





    mOutput.composeSurfaces(kDebugRegion, kDefaultRefreshArgs);

    mOutput.composeSurfaces(kDebugRegion, kDefaultRefreshArgs);

}

}
@@ -3311,6 +3324,7 @@ struct OutputComposeSurfacesTest_SetsExpensiveRendering : public OutputComposeSu 
        EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

        EXPECT_CALL(mOutput, getSkipColorTransform()).WillRepeatedly(Return(false));

        EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

        EXPECT_CALL(*mDisplayColorProfile, hasWideColorGamut()).WillRepeatedly(Return(true));

        EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

        EXPECT_CALL(mRenderEngine, supportsProtectedContent()).WillRepeatedly(Return(false));

        EXPECT_CALL(mRenderEngine, isProtected()).WillRepeatedly(Return(false));

        EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))

        EXPECT_CALL(mOutput, appendRegionFlashRequests(RegionEq(kDebugRegion), _))

                .WillRepeatedly(Return());

                .WillRepeatedly(Return());

        EXPECT_CALL(*mRenderSurface, dequeueBuffer(_)).WillRepeatedly(Return(mOutputBuffer));

        EXPECT_CALL(*mRenderSurface, dequeueBuffer(_)).WillRepeatedly(Return(mOutputBuffer));