From 1426aacf633823c11aaaa1ab242334c9cff32ff3 Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Tue, 25 Feb 2020 10:00:39 -0800
Subject: [PATCH] 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                | 1 +
 services/mediaextractor/MediaExtractorService.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/services/mediaextractor/Android.bp b/services/mediaextractor/Android.bp
index 3f4bab0a90..21bcd93541 100644
--- a/services/mediaextractor/Android.bp
+++ b/services/mediaextractor/Android.bp
@@ -11,6 +11,7 @@ cc_library_shared {
         "libdatasource",
         "libmedia",
         "libstagefright",
+        "libstagefright_foundation",
         "libbinder",
         "libutils",
         "liblog",
diff --git a/services/mediaextractor/MediaExtractorService.cpp b/services/mediaextractor/MediaExtractorService.cpp
index a6cd224f15..9992d1cafd 100644
--- a/services/mediaextractor/MediaExtractorService.cpp
+++ b/services/mediaextractor/MediaExtractorService.cpp
@@ -45,6 +45,7 @@ MediaExtractorService::~MediaExtractorService() {
 
     sp<DataSource> localSource = CreateDataSourceFromIDataSource(remoteSource);
 
+    MediaBuffer::useSharedMemory();
     sp<IMediaExtractor> extractor = MediaExtractorFactory::CreateFromService(
             localSource,
             mime.get() ? mime.get()->c_str() : nullptr);