commit 6b8f0cd35b8aeb47e47b0e90a72311a3d858e537
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Nov 15 02:29:31 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 15 02:29:31 2023 +0000
tree 97d5809edb8f71631a1a7e0c25dac3843a9b5831
parent fe6d3c45c1fc6484654110d790148adf13a023ab
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: If10a1abbdc71cda2bdd3e668118f5f8cb83f20b6
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 0adc14f..ea13989 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -2333,9 +2333,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) {