commit f808bcdcb73f1c1e9f535f8167c175597ee2123a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 10 22:06:58 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 10 22:06:58 2020 +0000
tree 4156693d454c21a51752db0e5e433287050fc5ad
parent f0cf34b64c95f374fe369ed833f4f4483f4c594f
parent 57692305d89706f346b0c9aaef11fdd2f4366851

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

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

Change-Id: I92f31f2b33196d4ae8b249b3933cfbf74cc2cde2

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);