commit cd69f69c112c03942885c648dbe79c2cd7a4500f
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 28 01:18:02 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 28 01:18:02 2020 +0000
tree 68f517f22b9bf611205c4dd19209dcf10de2bd11
parent 9fb67351a93a283c038e3b5dd1686396aa0987a9
parent da0517d8d2765c6454aaf4660004983c4c2c3e0c

Merge "CCodec: add to check pipelineFull() in feedInputBufferIfAvailableInternal()"

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 0626c8d..ba19565 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -618,7 +618,7 @@
 }
 
 void CCodecBufferChannel::feedInputBufferIfAvailableInternal() {
-    if (mInputMetEos || mPipelineWatcher.lock()->pipelineFull()) {
+    if (mInputMetEos) {
         return;
     }
     {
@@ -631,6 +631,9 @@
     }
     size_t numInputSlots = mInput.lock()->numSlots;
     for (size_t i = 0; i < numInputSlots; ++i) {
+        if (mPipelineWatcher.lock()->pipelineFull()) {
+            return;
+        }
         sp<MediaCodecBuffer> inBuffer;
         size_t index;
         {