commit 3d1e0c86cc2db6969bb8dc2b14e1c993ace58124
author Wonsik Kim <wonsik@google.com> Wed Oct 23 20:08:50 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 23 20:08:50 2024 +0000
tree a64d0f742eb81fa5081b0fa1c3f50b90eeebeb59
parent 32ab3d6717a2a4c249af3ce736b58c0483ce9dea
parent 8f67e7313fbb859cc97f4d2f0e96f08286febd28

Merge "Fix a race condition in CCodecBufferChannel::requestInitialInputBuffers" into main

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 3ef2f84..acf1c0b 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -2052,6 +2052,14 @@
 
 status_t CCodecBufferChannel::requestInitialInputBuffers(
         std::map<size_t, sp<MediaCodecBuffer>> &&clientInputBuffers) {
+    std::optional<QueueGuard> guard;
+    if (android::media::codec::provider_->codec_buffer_state_cleanup()) {
+        guard.emplace(mSync);
+        if (!guard->isRunning()) {
+            ALOGD("[%s] skip requestInitialInputBuffers when not running", mName);
+            return OK;
+        }
+    }
     C2StreamBufferTypeSetting::output oStreamFormat(0u);
     C2PrependHeaderModeSetting prepend(PREPEND_HEADER_TO_NONE);
     c2_status_t err = mComponent->query({ &oStreamFormat, &prepend }, {}, C2_DONT_BLOCK, nullptr);