commit 48e2b36fad0759beda38c564eb31efe32131be38
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 28 03:32:46 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 28 03:32:46 2020 +0000
tree aa2160a3dfebc3dd4b8514197dc6664032923c85
parent 9fe700a819ad17c2ec98d1e8fcc26affd986e708
parent eb7bc8c24bd5032c66e73f79655818e494a834de

Merge "CCodec: add to check pipelineFull() in feedInputBufferIfAvailableInternal()" am: cd69f69c11 am: 07218133ef am: 958c7169f2 am: 6cf8ceda37 am: eb7bc8c24b

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

Change-Id: If81886543fc0f5543af84dc842ccba2878b87dec

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 369087d..97145c3 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;
         {