| commit | f83184b29933eb8e4b0575f230db37ffcf8a8fca | [log] [tgz] |
|---|---|---|
| author | Vadim Caen <caen@google.com> | Tue Oct 22 17:47:50 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 22 17:47:50 2024 +0000 |
| tree | 976998d03cd3110cbb191b6bdfd0681d79244599 | |
| parent | c2868bf575eb5b9139bc3f6b6c161d56176e0581 [diff] | |
| parent | b657980c15ccc1b1d022bb5f35ce7ca7977781fe [diff] |
Merge "Fix render thread early termination" into main am: b657980c15 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3311539 Change-Id: Ic038c667249761cc0aef37adb744b49f52c62a14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/camera/virtualcamera/VirtualCameraRenderThread.h b/services/camera/virtualcamera/VirtualCameraRenderThread.h index 5a5966b..c6b58fb 100644 --- a/services/camera/virtualcamera/VirtualCameraRenderThread.h +++ b/services/camera/virtualcamera/VirtualCameraRenderThread.h
@@ -216,8 +216,8 @@ std::mutex mLock; std::deque<std::unique_ptr<ProcessCaptureRequestTask>> mQueue GUARDED_BY(mLock); std::condition_variable mCondVar; - volatile bool mTextureUpdateRequested GUARDED_BY(mLock); - volatile bool mPendingExit GUARDED_BY(mLock); + volatile bool GUARDED_BY(mLock) mTextureUpdateRequested = false; + volatile bool GUARDED_BY(mLock) mPendingExit = false; // Acquisition timestamp of last frame. std::atomic<uint64_t> mLastAcquisitionTimestampNanoseconds;