commit 1221fd1704150c76f175afe5bf46436236bdf48b
author Wonsik Kim <wonsik@google.com> Fri Jul 12 12:52:05 2019 -0700
committer Wonsik Kim <wonsik@google.com> Fri Jul 12 12:52:05 2019 -0700
tree 1a899bddc378cacfe99c60b7b9fb04740438f9f9
parent c3fa11b6cc0951d21a193be001733b08549415d0

codec2: force array mode for graphic metadata buffers

Bug: 133291455
Test: bug repro steps (10 times)
Change-Id: I7513a97dcfa50df880539a4a121c697952aae36a

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 09049b9..8308292 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -896,6 +896,9 @@
                 input->buffers.reset(new DummyInputBuffers(mName));
             } else if (mMetaMode == MODE_ANW) {
                 input->buffers.reset(new GraphicMetadataInputBuffers(mName));
+                // This is to ensure buffers do not get released prematurely.
+                // TODO: handle this without going into array mode
+                forceArrayMode = true;
             } else {
                 input->buffers.reset(new GraphicInputBuffers(numInputSlots, mName));
             }