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

Commit 6caac612 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allow SurfaceFlinger to treat 170M as sRGB." into tm-dev

parents 85ba66b7 dda07d9b

services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h

+3 −0
Original line number Diff line number Diff line
@@ -267,6 +267,9 @@ public: 
    // Enables predicting composition strategy to run client composition earlier

    virtual void setPredictCompositionStrategy(bool) = 0;



    // Enables overriding the 170M trasnfer function as sRGB

    virtual void setTreat170mAsSrgb(bool) = 0;



protected:

    virtual void setDisplayColorProfile(std::unique_ptr<DisplayColorProfile>) = 0;

    virtual void setRenderSurface(std::unique_ptr<RenderSurface>) = 0;

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Output.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ public: 
    void cacheClientCompositionRequests(uint32_t) override;

    bool canPredictCompositionStrategy(const CompositionRefreshArgs&) override;

    void setPredictCompositionStrategy(bool) override;

    void setTreat170mAsSrgb(bool) override;



    // Testing

    const ReleasedLayers& getReleasedLayersForTest() const;

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputCompositionState.h

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ struct OutputCompositionState { 
    CompositionStrategyPredictionState strategyPrediction =

            CompositionStrategyPredictionState::DISABLED;



    bool treat170mAsSrgb = false;



    // Debugging

    void dump(std::string& result) const;

};

services/surfaceflinger/CompositionEngine/include/compositionengine/mock/Output.h

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ public: 
    MOCK_METHOD1(cacheClientCompositionRequests, void(uint32_t));

    MOCK_METHOD1(canPredictCompositionStrategy, bool(const CompositionRefreshArgs&));

    MOCK_METHOD1(setPredictCompositionStrategy, void(bool));

    MOCK_METHOD1(setTreat170mAsSrgb, void(bool));

};



} // namespace android::compositionengine::mock

services/surfaceflinger/CompositionEngine/src/Output.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1488,6 +1488,10 @@ void Output::setPredictCompositionStrategy(bool predict) { 
    }

}



void Output::setTreat170mAsSrgb(bool enable) {

    editState().treat170mAsSrgb = enable;

}



bool Output::canPredictCompositionStrategy(const CompositionRefreshArgs& refreshArgs) {

    if (!getState().isEnabled || !mHwComposerAsyncWorker) {

        ALOGV("canPredictCompositionStrategy disabled");