From c6f3101a182aebed1446c17fb6807b251f4dfeca Mon Sep 17 00:00:00 2001 From: Alec Mouri Date: Fri, 11 Feb 2022 12:24:52 -0800 Subject: Add dump state information for layer brightness Bug: 217794675 Test: dumpsys SurfaceFlinger Change-Id: I6d1fbe1946c7050512710c902b0082e8d184cb55 --- .../include/compositionengine/impl/DumpHelpers.h | 10 ++++++++++ .../CompositionEngine/src/OutputCompositionState.cpp | 4 ++++ .../CompositionEngine/src/OutputLayerCompositionState.cpp | 2 ++ 3 files changed, 16 insertions(+) diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/DumpHelpers.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/DumpHelpers.h index 7521324756..196af707f6 100644 --- a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/DumpHelpers.h +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/DumpHelpers.h @@ -17,6 +17,7 @@ #pragma once #include +#include #include #include @@ -63,4 +64,13 @@ void dumpVal(std::string& out, const char* name, const ui::Transform&); void dumpVal(std::string& out, const char* name, const mat4&); void dumpVal(std::string& out, const char* name, const StretchEffect&); +template +void dumpVal(std::string& out, const char* name, std::optional value) { + if (value.has_value()) { + return dumpVal(out, name, *value); + } else { + return dumpVal(out, name, "nullopt"); + } +} + } // namespace android::compositionengine::impl diff --git a/services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp b/services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp index acc92162ac..482250a165 100644 --- a/services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp +++ b/services/surfaceflinger/CompositionEngine/src/OutputCompositionState.cpp @@ -52,6 +52,10 @@ void OutputCompositionState::dump(std::string& out) const { dumpVal(out, "dataspace", toString(dataspace), dataspace); dumpVal(out, "colorTransformMatrix", colorTransformMatrix); dumpVal(out, "target dataspace", toString(targetDataspace), targetDataspace); + dumpVal(out, "displayBrightnessNits", displayBrightnessNits); + dumpVal(out, "sdrWhitePointNits", sdrWhitePointNits); + dumpVal(out, "clientTargetBrightness", clientTargetBrightness); + dumpVal(out, "displayBrightness", displayBrightness); out.append("\n"); } diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayerCompositionState.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayerCompositionState.cpp index cfa740e251..67494274cd 100644 --- a/services/surfaceflinger/CompositionEngine/src/OutputLayerCompositionState.cpp +++ b/services/surfaceflinger/CompositionEngine/src/OutputLayerCompositionState.cpp @@ -67,6 +67,8 @@ void OutputLayerCompositionState::dump(std::string& out) const { dumpVal(out, "sourceCrop", sourceCrop); dumpVal(out, "bufferTransform", toString(bufferTransform), bufferTransform); dumpVal(out, "dataspace", toString(dataspace), dataspace); + dumpVal(out, "whitePointNits", whitePointNits); + dumpVal(out, "dimmingRatio", dimmingRatio); dumpVal(out, "override buffer", overrideInfo.buffer.get()); dumpVal(out, "override acquire fence", overrideInfo.acquireFence.get()); dumpVal(out, "override display frame", overrideInfo.displayFrame); -- cgit v1.2.3-59-g8ed1b