| commit | d1ba95ce0984e4d88f2f0ad5cf17b06cfdda2a4a | [log] [tgz] |
|---|---|---|
| author | Vadim Caen <caen@google.com> | Tue Oct 22 18:09:16 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 22 18:09:16 2024 +0000 |
| tree | 2326ff4b77a4c1b380def160c3770c3dbe04286c | |
| parent | ca4f9087d4e008c45f50f5335f48481ecc8ba7bf [diff] | |
| parent | f83184b29933eb8e4b0575f230db37ffcf8a8fca [diff] |
Merge "Fix render thread early termination" into main am: b657980c15 am: f83184b299 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3311539 Change-Id: Ic29b2b8bb9d823d3469f7779f3b5e89f2a1e6122 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 a35eea1..1fb4e84 100644 --- a/services/camera/virtualcamera/VirtualCameraRenderThread.h +++ b/services/camera/virtualcamera/VirtualCameraRenderThread.h
@@ -221,8 +221,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;