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

Commit 7e992ac1 authored by Alec Mouri's avatar Alec Mouri Committed by Automerger Merge Worker
Browse files

Merge "Plumb display brightness nits to composer hal." into tm-dev am: d7814346 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17354440



Change-Id: I8836d392254d2bbea4c9448b7bc8a9095d9e8d49
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba104275 d7814346

services/surfaceflinger/CompositionEngine/src/Display.cpp

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ void Display::beginFrame() { 
        physicalDisplayId && getState().displayBrightness) {

        const status_t result =

                hwc.setDisplayBrightness(*physicalDisplayId, *getState().displayBrightness,

                                         getState().displayBrightnessNits,

                                         Hwc2::Composer::DisplayBrightnessOptions{

                                                 .applyImmediately = false})

                        .get();

services/surfaceflinger/CompositionEngine/tests/DisplayTest.cpp

+3 −1
Original line number Diff line number Diff line
@@ -640,8 +640,9 @@ TEST_F(DisplayChooseCompositionStrategyTest, normalOperationWithDisplayBrightnes 
    // values, use a Sequence to control the matching so the values are returned in a known

    // order.

    constexpr float kDisplayBrightness = 0.5f;

    constexpr float kDisplayBrightnessNits = 200.f;

    EXPECT_CALL(mHwComposer,

                setDisplayBrightness(DEFAULT_DISPLAY_ID, kDisplayBrightness,

                setDisplayBrightness(DEFAULT_DISPLAY_ID, kDisplayBrightness, kDisplayBrightnessNits,

                                     Hwc2::Composer::DisplayBrightnessOptions{.applyImmediately =

                                                                                      false}))

            .WillOnce(Return(ByMove(ftl::yield<status_t>(NO_ERROR))));
@@ -650,6 +651,7 @@ TEST_F(DisplayChooseCompositionStrategyTest, normalOperationWithDisplayBrightnes 
    mock::RenderSurface* renderSurface = new StrictMock<mock::RenderSurface>();

    EXPECT_CALL(*renderSurface, beginFrame(_)).Times(1);

    mDisplay->setRenderSurfaceForTest(std::unique_ptr<RenderSurface>(renderSurface));

    mDisplay->editState().displayBrightnessNits = kDisplayBrightnessNits;

    mDisplay->beginFrame();



    auto& state = mDisplay->getState();

services/surfaceflinger/CompositionEngine/tests/MockHWComposer.h

+2 −2
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ public: 
    MOCK_METHOD4(setDisplayContentSamplingEnabled, status_t(HalDisplayId, bool, uint8_t, uint64_t));

    MOCK_METHOD4(getDisplayedContentSample,

                 status_t(HalDisplayId, uint64_t, uint64_t, DisplayedFrameStats*));

    MOCK_METHOD3(setDisplayBrightness,

                 std::future<status_t>(PhysicalDisplayId, float,

    MOCK_METHOD4(setDisplayBrightness,

                 std::future<status_t>(PhysicalDisplayId, float, float,

                                       const Hwc2::Composer::DisplayBrightnessOptions&));

    MOCK_METHOD2(getDisplayBrightnessSupport, status_t(PhysicalDisplayId, bool*));

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

+2 −2
Original line number Diff line number Diff line
@@ -927,9 +927,9 @@ Error AidlComposer::setLayerPerFrameMetadataBlobs( 
    return Error::NONE;

}



Error AidlComposer::setDisplayBrightness(Display display, float brightness,

Error AidlComposer::setDisplayBrightness(Display display, float brightness, float brightnessNits,

                                         const DisplayBrightnessOptions& options) {

    mWriter.setDisplayBrightness(translate<int64_t>(display), brightness);

    mWriter.setDisplayBrightness(translate<int64_t>(display), brightness, brightnessNits);



    if (options.applyImmediately) {

        return execute();

services/surfaceflinger/DisplayHardware/AidlComposerHal.h

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ public: 
    Error setLayerPerFrameMetadataBlobs(

            Display display, Layer layer,

            const std::vector<IComposerClient::PerFrameMetadataBlob>& metadata) override;

    Error setDisplayBrightness(Display display, float brightness,

    Error setDisplayBrightness(Display display, float brightness, float brightnessNits,

                               const DisplayBrightnessOptions& options) override;



    // Composer HAL 2.4