Merge "Prime cache for tone mappers in mediaserver"

5 years ago · 5452a4dabe
parent e6cbccaef9 d4fe6b1339
commit 5452a4dabe
2 changed files with 4 additions and 0 deletions
--- a/media/libmediaplayerservice/Android.bp
+++ b/media/libmediaplayerservice/Android.bp
@ -39,6 +39,7 @@ cc_library_shared {
        "libpowermanager",
        "libstagefright",
        "libstagefright_foundation",
+        "libstagefright_framecapture_utils",
        "libstagefright_httplive",
        "libutils",
    ],
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@ -58,6 +58,7 @@
 #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>
@ -447,6 +448,8 @@ MediaPlayerService::MediaPlayerService()
    mNextConnId = 1;

    MediaPlayerFactory::registerBuiltinFactories();
+    // initialize the frame capture utilities
+    (void)FrameCaptureProcessor::getInstance();
 }

 MediaPlayerService::~MediaPlayerService()