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

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

Merge "Initialize all members of StagefrightPluginLoader"

parents e8de773c 8a33265d

media/libstagefright/StagefrightPluginLoader.cpp

+1 −3
Original line number Diff line number Diff line
@@ -34,9 +34,7 @@ constexpr const char kCCodecPluginPath[] = "libsfplugin_ccodec.so"; 


}  // unnamed namespace



StagefrightPluginLoader::StagefrightPluginLoader(const char *libPath)

    : mCreateCodec(nullptr),

      mCreateBuilder(nullptr) {

StagefrightPluginLoader::StagefrightPluginLoader(const char *libPath) {

    if (android::base::GetIntProperty("debug.media.codec2", 0) == 0) {

        ALOGD("CCodec is disabled.");

        return;

media/libstagefright/StagefrightPluginLoader.h

+4 −4
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ private: 
    static Mutex sMutex;

    static std::unique_ptr<StagefrightPluginLoader> sInstance;



    void *mLibHandle;

    CodecBase::CreateCodecFunc mCreateCodec;

    MediaCodecListBuilderBase::CreateBuilderFunc mCreateBuilder;

    CodecBase::CreateInputSurfaceFunc mCreateInputSurface;

    void *mLibHandle{nullptr};

    CodecBase::CreateCodecFunc mCreateCodec{nullptr};

    MediaCodecListBuilderBase::CreateBuilderFunc mCreateBuilder{nullptr};

    CodecBase::CreateInputSurfaceFunc mCreateInputSurface{nullptr};

};



}  // namespace android