commit 1426aacf633823c11aaaa1ab242334c9cff32ff3
author Marco Nelissen <marcone@google.com> Tue Feb 25 10:00:39 2020 -0800
committer Marco Nelissen <marcone@google.com> Tue Feb 25 19:54:14 2020 +0000
tree 494e55b32534ad300ff03650f4c6d56d8aa822db
parent 590a4e630d7a807f5e0ba4ff8532257fef0ed1f4

Re-enable MediaBuffer shared memory use

This was accidentally removed when converting MediaExtractorService
to AIDL, but is needed for large MediaBuffers

Bug: 147152626
Bug: 147835592
Test: CTS, manual test app

Change-Id: I403968efa4319f316aa2ba5c0d7db71a0781b883

services/mediaextractor/Android.bp

diff --git a/services/mediaextractor/Android.bp b/services/mediaextractor/Android.bp
index 3f4bab0..21bcd93 100644
--- a/services/mediaextractor/Android.bp
+++ b/services/mediaextractor/Android.bp
@@ -11,6 +11,7 @@
         "libdatasource",
         "libmedia",
         "libstagefright",
+        "libstagefright_foundation",
         "libbinder",
         "libutils",
         "liblog",

services/mediaextractor/MediaExtractorService.cpp

diff --git a/services/mediaextractor/MediaExtractorService.cpp b/services/mediaextractor/MediaExtractorService.cpp
index a6cd224..9992d1c 100644
--- a/services/mediaextractor/MediaExtractorService.cpp
+++ b/services/mediaextractor/MediaExtractorService.cpp
@@ -45,6 +45,7 @@
 
     sp<DataSource> localSource = CreateDataSourceFromIDataSource(remoteSource);
 
+    MediaBuffer::useSharedMemory();
     sp<IMediaExtractor> extractor = MediaExtractorFactory::CreateFromService(
             localSource,
             mime.get() ? mime.get()->c_str() : nullptr);