commit 15ed5da8eadde5be0c3d7833dec3812daa73969d
author Fyodor Kyslov <kyslov@google.com> Tue May 09 21:22:40 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 09 21:22:40 2023 +0000
tree 5a15f95f72a6961112f68d7b5e2368142be608a6
parent d9227711df9ae8dfcfff29066f9d1ab5a3bc99f2
parent d39fb0823880f508419da4b75aaee74e5abadd34

Merge "ultrahdr: signal all threads that no further jobs will be queued" into udc-dev

libs/ultrahdr/jpegr.cpp

diff --git a/libs/ultrahdr/jpegr.cpp b/libs/ultrahdr/jpegr.cpp
index 0f7aa27..ef927e3 100644
--- a/libs/ultrahdr/jpegr.cpp
+++ b/libs/ultrahdr/jpegr.cpp
@@ -534,7 +534,7 @@
       if (mQueuedAllJobs) {
         return false;
       } else {
-        mCv.wait(lock);
+        mCv.wait_for(lock, std::chrono::milliseconds(100));
       }
     } else {
       auto it = mJobs.begin();
@@ -557,6 +557,8 @@
 void JobQueue::markQueueForEnd() {
   std::unique_lock<std::mutex> lock{mMutex};
   mQueuedAllJobs = true;
+  lock.unlock();
+  mCv.notify_all();
 }
 
 void JobQueue::reset() {