commit 94dd157360eabcefc2848e42bc2c46a2029b14e0
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 10 21:50:19 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 10 21:50:19 2020 +0000
tree d4c7cd091ad70c7acdaa9d9e38922c9568647497
parent 186b92a0c68a6cd8b8b16cf10aa3ebe868c109de
parent 082dc299c3112877bfe576c3379763f0241076b2

Merge "CCodec: retry sending output buffer after realloc" into rvc-dev am: 082dc299c3

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

Change-Id: Ie936460b008bd697b2d4d48a043bd76b2cffd7ed

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 4b158bd..4345a9f 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -1770,7 +1770,7 @@
                     realloc(c2Buffer);
             output.unlock();
             mCCodecCallback->onOutputBuffersChanged();
-            return;
+            break;
         case OutputBuffers::RETRY:
             ALOGV("[%s] sendOutputBuffers: unable to register output buffer",
                   mName);