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

Commit b22eaaa6 authored by Sally Qi's avatar Sally Qi Committed by Automerger Merge Worker
Browse files

Merge "Rename Sdr/Hdr to Hdr/Sdr internally to get avoid of confusion." into udc-dev am: d6e0bae8 

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



Change-Id: I75995cef8849eed5922b71b85ee9ea016d362f62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6de718e0 d6e0bae8

libs/gui/LayerState.cpp

+8 −8
Original line number Diff line number Diff line
@@ -190,8 +190,8 @@ status_t layer_state_t::write(Parcel& output) const 
    }

    SAFE_PARCEL(output.writeParcelable, trustedPresentationThresholds);

    SAFE_PARCEL(output.writeParcelable, trustedPresentationListener);

    SAFE_PARCEL(output.writeFloat, currentSdrHdrRatio);

    SAFE_PARCEL(output.writeFloat, desiredSdrHdrRatio);

    SAFE_PARCEL(output.writeFloat, currentHdrSdrRatio);

    SAFE_PARCEL(output.writeFloat, desiredHdrSdrRatio);

    SAFE_PARCEL(output.writeInt32, static_cast<int32_t>(cachingHint))

    return NO_ERROR;

}
@@ -335,9 +335,9 @@ status_t layer_state_t::read(const Parcel& input) 
    SAFE_PARCEL(input.readParcelable, &trustedPresentationListener);



    SAFE_PARCEL(input.readFloat, &tmpFloat);

    currentSdrHdrRatio = tmpFloat;

    currentHdrSdrRatio = tmpFloat;

    SAFE_PARCEL(input.readFloat, &tmpFloat);

    desiredSdrHdrRatio = tmpFloat;

    desiredHdrSdrRatio = tmpFloat;



    int32_t tmpInt32;

    SAFE_PARCEL(input.readInt32, &tmpInt32);
@@ -592,8 +592,8 @@ void layer_state_t::merge(const layer_state_t& other) { 
    }

    if (other.what & eExtendedRangeBrightnessChanged) {

        what |= eExtendedRangeBrightnessChanged;

        desiredSdrHdrRatio = other.desiredSdrHdrRatio;

        currentSdrHdrRatio = other.currentSdrHdrRatio;

        desiredHdrSdrRatio = other.desiredHdrSdrRatio;

        currentHdrSdrRatio = other.currentHdrSdrRatio;

    }

    if (other.what & eCachingHintChanged) {

        what |= eCachingHintChanged;
@@ -747,8 +747,8 @@ uint64_t layer_state_t::diff(const layer_state_t& other) const { 
    CHECK_DIFF(diff, eCropChanged, other, crop);

    if (other.what & eBufferChanged) diff |= eBufferChanged;

    CHECK_DIFF(diff, eDataspaceChanged, other, dataspace);

    CHECK_DIFF2(diff, eExtendedRangeBrightnessChanged, other, currentSdrHdrRatio,

                desiredSdrHdrRatio);

    CHECK_DIFF2(diff, eExtendedRangeBrightnessChanged, other, currentHdrSdrRatio,

                desiredHdrSdrRatio);

    CHECK_DIFF(diff, eCachingHintChanged, other, cachingHint);

    CHECK_DIFF(diff, eHdrMetadataChanged, other, hdrMetadata);

    if (other.what & eSurfaceDamageRegionChanged &&

libs/gui/SurfaceComposerClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1723,8 +1723,8 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setExten 
        return *this;

    }

    s->what |= layer_state_t::eExtendedRangeBrightnessChanged;

    s->currentSdrHdrRatio = currentBufferRatio;

    s->desiredSdrHdrRatio = desiredRatio;

    s->currentHdrSdrRatio = currentBufferRatio;

    s->desiredHdrSdrRatio = desiredRatio;



    registerSurfaceControlForCallback(sc);

    return *this;

libs/gui/include/gui/LayerState.h

+2 −2
Original line number Diff line number Diff line
@@ -389,8 +389,8 @@ struct layer_state_t { 
    gui::DropInputMode dropInputMode;



    bool dimmingEnabled;

    float currentSdrHdrRatio = 1.f;

    float desiredSdrHdrRatio = 1.f;

    float currentHdrSdrRatio = 1.f;

    float desiredHdrSdrRatio = 1.f;



    gui::CachingHint cachingHint = gui::CachingHint::Enabled;

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

+2 −2
Original line number Diff line number Diff line
@@ -210,8 +210,8 @@ struct LayerFECompositionState { 
    // The dimming flag

    bool dimmingEnabled{true};



    float currentSdrHdrRatio = 1.f;

    float desiredSdrHdrRatio = 1.f;

    float currentHdrSdrRatio = 1.f;

    float desiredHdrSdrRatio = 1.f;



    gui::CachingHint cachingHint = gui::CachingHint::Enabled;

    virtual ~LayerFECompositionState();

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

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ public: 
    ui::Dataspace getDataspace() const { return mOutputDataspace.get(); }



    float getHdrSdrRatio() const {

        return getOutputLayer()->getLayerFE().getCompositionState()->currentSdrHdrRatio;

        return getOutputLayer()->getLayerFE().getCompositionState()->currentHdrSdrRatio;

    };



    wp<GraphicBuffer> getBuffer() const { return mBuffer.get(); }