commit 846d3f54f1c5d431a155df272d54198aee22c8ee
author Wonsik Kim <wonsik@google.com> Fri Jul 12 16:29:16 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jul 12 16:29:16 2019 -0700
tree 9fa208d8906c45b2ebbcd53f4c194a012cff8fc8
parent c4df490824bc8ddddf5c07b3d502ff0840e4ce14
parent 5e39adb1c42dabd229fa416f4bb484181418e016

Merge "codec2: force array mode for graphic metadata buffers" into qt-dev
am: 5e39adb1c4

Change-Id: I3e611687e0d7ed0d30a1801792c81467ba058a07

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