commit cd7c3e260395e4994f50a0eba5cf67fbf92cc844
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 15 02:28:55 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 15 02:28:55 2023 +0000
tree bcf875b2c030f314bd9a3171ab1b854ebd7672bb
parent 174a191ab2429dda2a7e52dbecc3d0027fc1aa93
parent 1f4ed7f4b29a4067b6c6b7cded4350b868731d3f

Merge "Fix CodecLooper queue block issue" into main am: 1f4ed7f4b2

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2713913

Change-Id: I34adfd3df0eb1b50fd7b0bb71f579b9164023bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 8082dd7..cd3a80f 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -2326,9 +2326,12 @@
 void CCodec::onWorkDone(std::list<std::unique_ptr<C2Work>> &workItems) {
     if (!workItems.empty()) {
         Mutexed<std::list<std::unique_ptr<C2Work>>>::Locked queue(mWorkDoneQueue);
+        bool shouldPost = queue->empty();
         queue->splice(queue->end(), workItems);
+        if (shouldPost) {
+            (new AMessage(kWhatWorkDone, this))->post();
+        }
     }
-    (new AMessage(kWhatWorkDone, this))->post();
 }
 
 void CCodec::onInputBufferDone(uint64_t frameIndex, size_t arrayIndex) {