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

Commit 10121fa4 authored by Chia-I Wu's avatar Chia-I Wu
Browse files

resolve merge conflicts of 7918a122 to master 

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iddb8c57dc21e8d051c96fbb93f7d3d7f372e4676
parents daf10122 0d711268

services/surfaceflinger/DisplayDevice.cpp

+11 −1
Original line number Diff line number Diff line
@@ -707,8 +707,18 @@ void DisplayDevice::populateColorModes( 
        return;

    }



    // collect all known SDR render intents

    std::unordered_set<RenderIntent> sdrRenderIntents(sSdrRenderIntents.begin(),

                                                      sSdrRenderIntents.end());

    auto iter = hwcColorModes.find(ColorMode::SRGB);

    if (iter != hwcColorModes.end()) {

        for (auto intent : iter->second) {

            sdrRenderIntents.insert(intent);

        }

    }



    // add known SDR combinations

    for (auto intent : sSdrRenderIntents) {

    for (auto intent : sdrRenderIntents) {

        for (auto mode : sSdrColorModes) {

            addColorMode(hwcColorModes, mode, intent);

        }

services/surfaceflinger/SurfaceFlinger.cpp

+42 −48
Original line number Diff line number Diff line
@@ -159,29 +159,18 @@ bool useTrebleTestingOverride() { 
    return std::string(value) == "true";

}



DisplayColorSetting toDisplayColorSetting(int value) {

    switch(value) {

        case 0:

            return DisplayColorSetting::MANAGED;

        case 1:

            return DisplayColorSetting::UNMANAGED;

        case 2:

            return DisplayColorSetting::ENHANCED;

        default:

            return DisplayColorSetting::MANAGED;

    }

}



std::string decodeDisplayColorSetting(DisplayColorSetting displayColorSetting) {

    switch(displayColorSetting) {

        case DisplayColorSetting::MANAGED:

            return std::string("Natural Mode");

            return std::string("Managed");

        case DisplayColorSetting::UNMANAGED:

            return std::string("Saturated Mode");

            return std::string("Unmanaged");

        case DisplayColorSetting::ENHANCED:

            return std::string("Auto Color Mode");

            return std::string("Enhanced");

        default:

            return std::string("Unknown ") +

                std::to_string(static_cast<int>(displayColorSetting));

    }

    return std::string("Unknown Display Color Setting");

}



NativeWindowSurface::~NativeWindowSurface() = default;
@@ -741,9 +730,7 @@ void SurfaceFlinger::readPersistentProperties() { 
    ALOGV("Saturation is set to %.2f", mGlobalSaturationFactor);



    property_get("persist.sys.sf.native_mode", value, "0");

    mDisplayColorSetting = toDisplayColorSetting(atoi(value));

    ALOGV("Display Color Setting is set to %s.",

          decodeDisplayColorSetting(mDisplayColorSetting).c_str());

    mDisplayColorSetting = static_cast<DisplayColorSetting>(atoi(value));

}



void SurfaceFlinger::startBootAnim() {
@@ -1920,8 +1907,19 @@ void SurfaceFlinger::pickColorMode(const sp<DisplayDevice>& displayDevice, 
    Dataspace hdrDataSpace;

    Dataspace bestDataSpace = getBestDataspace(displayDevice, &hdrDataSpace);



    RenderIntent intent = mDisplayColorSetting == DisplayColorSetting::ENHANCED ?

        RenderIntent::ENHANCE : RenderIntent::COLORIMETRIC;

    RenderIntent intent;

    switch (mDisplayColorSetting) {

        case DisplayColorSetting::MANAGED:

        case DisplayColorSetting::UNMANAGED:

            intent = RenderIntent::COLORIMETRIC;

            break;

        case DisplayColorSetting::ENHANCED:

            intent = RenderIntent::ENHANCE;

            break;

        default: // vendor display color setting

            intent = static_cast<RenderIntent>(mDisplayColorSetting);

            break;

    }



    // respect hdrDataSpace only when there is modern HDR support

    if (hdrDataSpace != Dataspace::UNKNOWN && displayDevice->hasModernHdrSupport(hdrDataSpace)) {
@@ -2309,10 +2307,6 @@ sp<DisplayDevice> SurfaceFlinger::setupNewDisplayDeviceInternal( 
        nativeWindowSurface->preallocateBuffers();

    }



    if (hw->isPrimary() && hw->hasRenderIntent(RenderIntent::ENHANCE)) {

        mBuiltinDisplaySupportsEnhance = true;

    }



    ColorMode defaultColorMode = ColorMode::NATIVE;

    Dataspace defaultDataSpace = Dataspace::UNKNOWN;

    if (hasWideColorGamut) {
@@ -2905,7 +2899,7 @@ bool SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& displayDev 
        }



        needsLegacyColorMatrix =

            (displayDevice->getActiveRenderIntent() == RenderIntent::ENHANCE &&

            (displayDevice->getActiveRenderIntent() >= RenderIntent::ENHANCE &&

             outputDataspace != Dataspace::UNKNOWN &&

             outputDataspace != Dataspace::SRGB);
@@ -4127,7 +4121,8 @@ void SurfaceFlinger::dumpDisplayIdentificationData(String8& result) const { 


void SurfaceFlinger::dumpWideColorInfo(String8& result) const {

    result.appendFormat("hasWideColorDisplay: %d\n", hasWideColorDisplay);

    result.appendFormat("DisplayColorSetting: %d\n", mDisplayColorSetting);

    result.appendFormat("DisplayColorSetting: %s\n",

            decodeDisplayColorSetting(mDisplayColorSetting).c_str());



    // TODO: print out if wide-color mode is active or not
@@ -4660,15 +4655,7 @@ status_t SurfaceFlinger::onTransact( 
                return NO_ERROR;

            }

            case 1023: { // Set native mode

                int32_t value = data.readInt32();

                if (value > 2) {

                    return BAD_VALUE;

                }

                if (value == 2 && !mBuiltinDisplaySupportsEnhance) {

                    return BAD_VALUE;

                }



                mDisplayColorSetting = toDisplayColorSetting(value);

                mDisplayColorSetting = static_cast<DisplayColorSetting>(data.readInt32());

                invalidateHwcGeometry();

                repaintEverything();

                return NO_ERROR;
@@ -4697,20 +4684,27 @@ status_t SurfaceFlinger::onTransact( 
            }

            // Is a DisplayColorSetting supported?

            case 1027: {

                int32_t value = data.readInt32();

                switch (value) {

                    case 0:

                sp<const DisplayDevice> hw(getDefaultDisplayDevice());

                if (!hw) {

                    return NAME_NOT_FOUND;

                }



                DisplayColorSetting setting = static_cast<DisplayColorSetting>(data.readInt32());

                switch (setting) {

                    case DisplayColorSetting::MANAGED:

                        reply->writeBool(hasWideColorDisplay);

                        return NO_ERROR;

                    case 1:

                        break;

                    case DisplayColorSetting::UNMANAGED:

                        reply->writeBool(true);

                        return NO_ERROR;

                    case 2:

                        reply->writeBool(mBuiltinDisplaySupportsEnhance);

                        return NO_ERROR;

                    default:

                        return BAD_VALUE;

                        break;

                    case DisplayColorSetting::ENHANCED:

                        reply->writeBool(hw->hasRenderIntent(RenderIntent::ENHANCE));

                        break;

                    default: // vendor display color setting

                        reply->writeBool(hw->hasRenderIntent(static_cast<RenderIntent>(setting)));

                        break;

                }

                return NO_ERROR;

            }

        }

    }

services/surfaceflinger/SurfaceFlinger.h

+0 −1
Original line number Diff line number Diff line
@@ -882,7 +882,6 @@ private: 
    DisplayColorSetting mDisplayColorSetting = DisplayColorSetting::MANAGED;

    // Applied on sRGB layers when the render intent is non-colorimetric.

    mat4 mLegacySrgbSaturationMatrix;

    bool mBuiltinDisplaySupportsEnhance = false;



    using CreateBufferQueueFunction =

            std::function<void(sp<IGraphicBufferProducer>* /* outProducer */,