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

Commit 15769b52 authored by Sally Qi's avatar Sally Qi Committed by Android (Google) Code Review
Browse files

Merge "[Lut] Change setLuts function signature." into main

parents f863ba4d 9e84811f

libs/gui/SurfaceComposerClient.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1953,9 +1953,9 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setDesir 
}



SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setLuts(

        const sp<SurfaceControl>& sc, const base::unique_fd& lutFd,

        const std::vector<int32_t>& offsets, const std::vector<int32_t>& dimensions,

        const std::vector<int32_t>& sizes, const std::vector<int32_t>& samplingKeys) {

        const sp<SurfaceControl>& sc, base::unique_fd&& lutFd, const std::vector<int32_t>& offsets,

        const std::vector<int32_t>& dimensions, const std::vector<int32_t>& sizes,

        const std::vector<int32_t>& samplingKeys) {

    layer_state_t* s = getLayerState(sc);

    if (!s) {

        mStatus = BAD_INDEX;
@@ -1964,8 +1964,8 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setLuts( 


    s->what |= layer_state_t::eLutsChanged;

    if (lutFd.ok()) {

        s->luts = std::make_shared<gui::DisplayLuts>(base::unique_fd(dup(lutFd.get())), offsets,

                                                     dimensions, sizes, samplingKeys);

        s->luts = std::make_shared<gui::DisplayLuts>(std::move(lutFd), offsets, dimensions, sizes,

                                                     samplingKeys);

    } else {

        s->luts = nullptr;

    }

libs/gui/include/gui/SurfaceComposerClient.h

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ public: 
        Transaction& setExtendedRangeBrightness(const sp<SurfaceControl>& sc,

                                                float currentBufferRatio, float desiredRatio);

        Transaction& setDesiredHdrHeadroom(const sp<SurfaceControl>& sc, float desiredRatio);

        Transaction& setLuts(const sp<SurfaceControl>& sc, const base::unique_fd& lutFd,

        Transaction& setLuts(const sp<SurfaceControl>& sc, base::unique_fd&& lutFd,

                             const std::vector<int32_t>& offsets,

                             const std::vector<int32_t>& dimensions,

                             const std::vector<int32_t>& sizes,