Merge "Dispatch tonemapAndDrawGainmap on main thread with non-threaded RE" into main (f110207d) · Commits · e / os / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+16 −6

Original line number	Diff line number	Diff line
		@@ -7887,12 +7887,22 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::captureScreenshot(
		return fenceResult;
		}

		auto tonemapAndDrawGainmap = [&]() -> FenceResult {
		return getRenderEngine()
		.tonemapAndDrawGainmap(hdrBuffer, fenceResult.value()->get(),
		.tonemapAndDrawGainmap(hdrBuffer,
		fenceResult.value()->get(),
		hdrSdrRatio,
		static_cast<ui::Dataspace>(dataspace),
		static_cast<ui::Dataspace>(
		dataspace),
		buffer, gainmapBuffer)
		.get();
		};

		if (mRenderEngine->isThreaded()) {
		return tonemapAndDrawGainmap();
		} else {
		return mScheduler->schedule(std::move(tonemapAndDrawGainmap)).get();
		}
		})
		.share();
		} else {