Snap for 10817717 from 93a128378e1b48bf7f9937558311a5810f2e283f to udc-qpr1-release (1b28952e) · Commits · e / devices / smdk4412 / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+17 −10

Original line number	Diff line number	Diff line
		@@ -7373,6 +7373,7 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::renderScreenImpl(
		ATRACE_CALL();

		auto layers = getLayerSnapshots();

		for (auto& [_, layerFE] : layers) {
		frontend::LayerSnapshot* snapshot = layerFE->mSnapshot.get();
		captureResults.capturedSecureLayers \|= (snapshot->isVisible && snapshot->isSecure);
		@@ -7424,16 +7425,22 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::renderScreenImpl(
		pickBestDataspace(requestedDataspace, display, captureResults.capturedHdrLayers,
		renderArea->getHintForSeamlessTransition());
		sdrWhitePointNits = state.sdrWhitePointNits;

		if (!captureResults.capturedHdrLayers) {
		displayBrightnessNits = sdrWhitePointNits;
		} else {
		displayBrightnessNits = state.displayBrightnessNits;
		// Only clamp the display brightness if this is not a seamless transition. Otherwise
		// for seamless transitions it's important to match the current display state as the
		// buffer will be shown under these same conditions, and we want to avoid any flickers
		// buffer will be shown under these same conditions, and we want to avoid any
		// flickers
		if (sdrWhitePointNits > 1.0f && !renderArea->getHintForSeamlessTransition()) {
		// Restrict the amount of HDR "headroom" in the screenshot to avoid over-dimming
		// the SDR portion. 2.0 chosen by experimentation
		constexpr float kMaxScreenshotHeadroom = 2.0f;
		displayBrightnessNits =
		std::min(sdrWhitePointNits * kMaxScreenshotHeadroom, displayBrightnessNits);
		displayBrightnessNits = std::min(sdrWhitePointNits * kMaxScreenshotHeadroom,
		displayBrightnessNits);
		}
		}

		if (requestedDataspace == ui::Dataspace::UNKNOWN) {