Merge "Use std::shared_future to pass Surface from the render thread" into main (c034c8b2) · Commits · e / os / android_frameworks_av

services/camera/virtualcamera/VirtualCameraRenderThread.cc

+3 −2

Original line number	Diff line number	Diff line
		@@ -313,7 +313,8 @@ VirtualCameraRenderThread::VirtualCameraRenderThread(
		: mCameraDeviceCallback(cameraDeviceCallback),
		mInputSurfaceSize(inputSurfaceSize),
		mReportedSensorSize(reportedSensorSize),
		mSessionContext(sessionContext) {
		mSessionContext(sessionContext),
		mInputSurfaceFuture(mInputSurfacePromise.get_future()) {
		}

		VirtualCameraRenderThread::~VirtualCameraRenderThread() {
		@@ -373,7 +374,7 @@ void VirtualCameraRenderThread::stop() {
		}

		sp<Surface> VirtualCameraRenderThread::getInputSurface() {
		return mInputSurfacePromise.get_future().get();
		return mInputSurfaceFuture.get();
		}

		std::unique_ptr<ProcessCaptureRequestTask>

+1 −0

Original line number	Diff line number	Diff line
		@@ -204,6 +204,7 @@ class VirtualCameraRenderThread {
		std::unique_ptr<EglSurfaceTexture> mEglSurfaceTexture;

		std::promise<sp<Surface>> mInputSurfacePromise;
		std::shared_future<sp<Surface>> mInputSurfaceFuture;
		};

		} // namespace virtualcamera