Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bc6f60e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Prime cache for tone mappers in mediaserver""

parents f5614e2f bf4f332a

media/libmediaplayerservice/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ cc_library_shared { 
        "libpowermanager",

        "libstagefright",

        "libstagefright_foundation",

        "libstagefright_framecapture_utils",

        "libstagefright_httplive",

        "libutils",

    ],

media/libmediaplayerservice/MediaPlayerService.cpp

+0 −3
Original line number Diff line number Diff line
@@ -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()