Snap for 4831764 from 64b2d6a1d0f02360cf19553de54aa44996eeec9e to qt-release
Change-Id: I1e97a0934da51521d99c39b060b4a9fb7184371d
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",
],
}
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.