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

Commit 490c032a authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge changes I4c65e433,If447795f 

* changes:
  Add mNamePlusId to hasClientComposition trace
  Name the ScreenCaptureOutput
parents b346e3ff 042fdba5

services/surfaceflinger/CompositionEngine/src/Output.cpp

+6 −4
Original line number Diff line number Diff line
@@ -118,8 +118,9 @@ const std::string& Output::getName() const { 
void Output::setName(const std::string& name) {

    mName = name;

    auto displayIdOpt = getDisplayId();

    mNamePlusId = base::StringPrintf("%s (%s)", mName.c_str(),

                                     displayIdOpt ? to_string(*displayIdOpt).c_str() : "NA");

    mNamePlusId = displayIdOpt ? base::StringPrintf("%s (%s)", mName.c_str(),

                                     to_string(*displayIdOpt).c_str())

                               : mName;

}



void Output::setCompositionEnabled(bool enabled) {
@@ -1224,7 +1225,8 @@ std::optional<base::unique_fd> Output::composeSurfaces( 
    ALOGV(__FUNCTION__);



    const auto& outputState = getState();

    const TracedOrdinal<bool> hasClientComposition = {"hasClientComposition",

    const TracedOrdinal<bool> hasClientComposition = {

        base::StringPrintf("hasClientComposition %s", mNamePlusId.c_str()),

        outputState.usesClientComposition};

    if (!hasClientComposition) {

        setExpensiveRenderingExpected(false);

services/surfaceflinger/ScreenCaptureOutput.cpp

+7 −0
Original line number Diff line number Diff line
@@ -53,6 +53,13 @@ std::shared_ptr<ScreenCaptureOutput> createScreenCaptureOutput(ScreenCaptureOutp 
    Rect sourceCrop = args.renderArea.getSourceCrop();

    output->setDisplaySize({sourceCrop.getWidth(), sourceCrop.getHeight()});



    {

        std::string name = args.regionSampling ? "RegionSampling" : "ScreenCaptureOutput";

        if (auto displayDevice = args.renderArea.getDisplayDevice()) {

            base::StringAppendF(&name, " for %" PRIu64, displayDevice->getId().value);

        }

        output->setName(name);

    }

    return output;

}