commit 5e39adb1c42dabd229fa416f4bb484181418e016
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 12 23:13:17 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 12 23:13:17 2019 +0000
tree 9ba1df53d19f8daa24e5536b09224dfaa4b76e90
parent f12025b61d793a6a16eb5673663a828c2b1e9d0d
parent 1221fd1704150c76f175afe5bf46436236bdf48b

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

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