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

Commit 8a33265d authored by Pawin Vongmasa's avatar Pawin Vongmasa
Browse files

Initialize all members of StagefrightPluginLoader 

Function pointers should all be initialized to null.

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 120785121
Change-Id: If9aa3c0ebd8888ea6e0b550d55397633657802fc
parent 6b01bf3f

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