Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fcd0264 authored by Jan Sebechlebsky's avatar Jan Sebechlebsky
Browse files

Use std::shared_future to pass Surface from the render thread 

... so getInputSurface can be safely called multiple times.

Bug: 343628528
Test: atest virtual_camera_tests
Test: atest CtsVirtualDevicesCameraTestCases
Change-Id: I2a97d57ee7dbc6ade3f7e9441a5ac8c8f0a01e28
parent 0a90de23

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>

services/camera/virtualcamera/VirtualCameraRenderThread.h

+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