commit 3896dfc798fb7496d3063aaa7b35ce41a65d5db4
author Lajos Molnar <lajos@google.com> Sat Jun 09 00:00:18 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 09 00:00:18 2018 +0000
tree 25ac0695273eb149845a5f5c5eaa4e7ffec8452d
parent 10b6074406c8813f9e694745841c25d7b0cfecef
parent 4bf68ce16bfd972d0ab242a27c5c258d7e1eb768

Merge "CCodec: create an empty ByteBuffer for null output buffer" into pi-dev

media/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/sfplugin/CCodecBufferChannel.cpp b/media/sfplugin/CCodecBufferChannel.cpp
index 611f145..c834f36 100644
--- a/media/sfplugin/CCodecBufferChannel.cpp
+++ b/media/sfplugin/CCodecBufferChannel.cpp
@@ -1063,7 +1063,7 @@
 
     sp<Codec2Buffer> wrap(const std::shared_ptr<C2Buffer> &buffer) override {
         if (buffer == nullptr) {
-            return new DummyContainerBuffer(mFormat, buffer);
+            return new LocalLinearBuffer(mFormat, new ABuffer(0));
         }
         if (buffer->data().type() != C2BufferData::LINEAR) {
             // We expect linear output buffers from the component.