diff options
| -rw-r--r-- | services/surfaceflinger/CompositionEngine/src/Output.cpp | 10 | ||||
| -rw-r--r-- | services/surfaceflinger/ScreenCaptureOutput.cpp | 7 |
2 files changed, 13 insertions, 4 deletions
diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp index d513731fa3..3ec681668b 100644 --- a/services/surfaceflinger/CompositionEngine/src/Output.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp @@ -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,8 +1225,9 @@ std::optional<base::unique_fd> Output::composeSurfaces( ALOGV(__FUNCTION__); const auto& outputState = getState(); - const TracedOrdinal<bool> hasClientComposition = {"hasClientComposition", - outputState.usesClientComposition}; + const TracedOrdinal<bool> hasClientComposition = { + base::StringPrintf("hasClientComposition %s", mNamePlusId.c_str()), + outputState.usesClientComposition}; if (!hasClientComposition) { setExpensiveRenderingExpected(false); return base::unique_fd(); diff --git a/services/surfaceflinger/ScreenCaptureOutput.cpp b/services/surfaceflinger/ScreenCaptureOutput.cpp index 37b3218138..6d195b9f7b 100644 --- a/services/surfaceflinger/ScreenCaptureOutput.cpp +++ b/services/surfaceflinger/ScreenCaptureOutput.cpp @@ -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; } |