From bf4f332a55ccb01d821e05dd0a3c7431a46e964b Mon Sep 17 00:00:00 2001
From: Chong Zhang <chz@google.com>
Date: Wed, 22 Jan 2020 19:11:06 +0000
Subject: [PATCH] Revert "Prime cache for tone mappers in mediaserver"

This reverts commit d4fe6b1339be666fd1df2a6a7ed3ce8528ea8064.

Reason for revert:
This CL was meant to pre-init the RenderEngine to save time
on the actual thumbnail extraction. But it is using more
memory after boot.

Since HDR clips are less common at present, we'll delay the
init to first use for now.

bug: b/147047966
test: atest android.media.cts.MediaMetadataRetrieverTest

Change-Id: I5b8799bbe2f4ae496e15b5ba699203223fe3013b
---
 media/libmediaplayerservice/Android.bp             | 1 -
 media/libmediaplayerservice/MediaPlayerService.cpp | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/media/libmediaplayerservice/Android.bp b/media/libmediaplayerservice/Android.bp
index 762ed19f22..5301f5c571 100644
--- a/media/libmediaplayerservice/Android.bp
+++ b/media/libmediaplayerservice/Android.bp
@@ -39,7 +39,6 @@ cc_library_shared {
         "libpowermanager",
         "libstagefright",
         "libstagefright_foundation",
-        "libstagefright_framecapture_utils",
         "libstagefright_httplive",
         "libutils",
     ],
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index f2a38dd60f..81ffcbc1de 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -58,7 +58,6 @@
 #include <media/Metadata.h>
 #include <media/AudioTrack.h>
 #include <media/MemoryLeakTrackUtil.h>
-#include <media/stagefright/FrameCaptureProcessor.h>
 #include <media/stagefright/InterfaceUtils.h>
 #include <media/stagefright/MediaCodecConstants.h>
 #include <media/stagefright/MediaCodecList.h>
@@ -448,8 +447,6 @@ MediaPlayerService::MediaPlayerService()
     mNextConnId = 1;
 
     MediaPlayerFactory::registerBuiltinFactories();
-    // initialize the frame capture utilities
-    (void)FrameCaptureProcessor::getInstance();
 }
 
 MediaPlayerService::~MediaPlayerService()