commit dbb0dd074872b4ae6478ba5f303c063ea4c552ad
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 12 23:14:01 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 12 23:14:01 2020 +0000
tree 801de92e7a8d39db760c39191d9eab582cad2886
parent 5e3479c296b0ddbebfdf0675ef9355882523f9fb
parent e64060fe2a93f6744be400c2cd688b8ae2f4468e

Merge "CCodec: Guard against null output->buffers" into rvc-dev am: 19d5116432 am: 7958631d2b am: e64060fe2a

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

Change-Id: Iaf90cb37ee806ca8ddb8d5948a29694bbf368e35

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index c07f3dc..2cd357b 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -618,13 +618,14 @@
 }
 
 void CCodecBufferChannel::feedInputBufferIfAvailableInternal() {
-    if (mInputMetEos ||
-           mOutput.lock()->buffers->hasPending() ||
-           mPipelineWatcher.lock()->pipelineFull()) {
+    if (mInputMetEos || mPipelineWatcher.lock()->pipelineFull()) {
         return;
-    } else {
+    }
+    {
         Mutexed<Output>::Locked output(mOutput);
-        if (!output->buffers || output->buffers->numClientBuffers() >= output->numSlots) {
+        if (!output->buffers ||
+                output->buffers->hasPending() ||
+                output->buffers->numClientBuffers() >= output->numSlots) {
             return;
         }
     }