commit 66768403a6d1aadaa0a14cd607a42177c42c5467
author android-build-team Robot <android-build-team-robot@google.com> Sun Jun 10 19:04:19 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Jun 10 19:04:19 2018 +0000
tree 25ac0695273eb149845a5f5c5eaa4e7ffec8452d
parent b202411050e161274b663f84ef2df56d32109e29
parent 3896dfc798fb7496d3063aaa7b35ce41a65d5db4

Snap for 4832339 from 3896dfc798fb7496d3063aaa7b35ce41a65d5db4 to pi-release

Change-Id: I038db4eb23bd53a918170b5ccf761ff8010cf71d

codec2/hidl/1.0/utils/Android.bp

diff --git a/codec2/hidl/1.0/utils/Android.bp b/codec2/hidl/1.0/utils/Android.bp
index aa1f18b..1641e51 100644
--- a/codec2/hidl/1.0/utils/Android.bp
+++ b/codec2/hidl/1.0/utils/Android.bp
@@ -49,7 +49,9 @@
         "hardware.google.media.c2@1.0",
         "libhidlbase",
         "libstagefright_bufferpool@1.0",
+        "libstagefright_bufferqueue_helper",
         "libstagefright_codec2",
+        "libui",
     ],
 }
 

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.