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

Commit 0a7e0da8 authored by Fyodor Kyslov's avatar Fyodor Kyslov Committed by Automerger Merge Worker
Browse files

Merge "ultrahdr: signal all threads that no further jobs will be queued" into... 

Merge "ultrahdr: signal all threads that no further jobs will be queued" into udc-dev am: 15ed5da8 am: 85e4e90a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23114816



Change-Id: If5cd90b3779535f025250597e3c588814ccad78c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 297d1e04 85e4e90a

libs/ultrahdr/jpegr.cpp

+3 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ bool JobQueue::dequeueJob(size_t& rowStart, size_t& rowEnd) { 
      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::enqueueJob(size_t rowStart, size_t rowEnd) { 
void JobQueue::markQueueForEnd() {

  std::unique_lock<std::mutex> lock{mMutex};

  mQueuedAllJobs = true;

  lock.unlock();

  mCv.notify_all();

}



void JobQueue::reset() {