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

Commit 2daf0ca5 authored by S Vasudev Prasad's avatar S Vasudev Prasad
Browse files

Added test methods to C2ComponentStore 

This adds test methods to C2ComponentStore where the Codec2Factory
functions are provided via static linking of the codec libraries
instead of dynamic loading them via dlopen.
This is used by codec2 fuzzers.

Test: Build libcodec2_vndk
Bug: 173672402

Change-Id: Ic7887d618728b8db64d4bfc35d61767c09c08a93
parent 70d2b4a5

media/codec2/vndk/C2Store.cpp

+85 −12
Original line number Diff line number Diff line
@@ -622,6 +622,12 @@ public: 
            std::vector<std::unique_ptr<C2SettingResult>> *const failures) override;

    C2PlatformComponentStore();



    // For testing only

    C2PlatformComponentStore(

            std::vector<std::tuple<C2String,

                                   C2ComponentFactory::CreateCodec2FactoryFunc,

                                   C2ComponentFactory::DestroyCodec2FactoryFunc>>);



    virtual ~C2PlatformComponentStore() override = default;



private:
@@ -661,6 +667,24 @@ private: 
              mComponentFactory(nullptr) {

        }



        /**

         * Creates an uninitialized component module.

         * NOTE: For testing only

         *

         * \param name[in]  component name.

         *

         * \note Only used by ComponentLoader.

         */

        ComponentModule(

                C2ComponentFactory::CreateCodec2FactoryFunc createFactory,

                C2ComponentFactory::DestroyCodec2FactoryFunc destroyFactory)

            : mInit(C2_NO_INIT),

              mLibHandle(nullptr),

              createFactory(createFactory),

              destroyFactory(destroyFactory),

              mComponentFactory(nullptr) {

        }



        /**

         * Initializes a component module with a given library path. Must be called exactly once.

         *
@@ -717,7 +741,13 @@ private: 
            std::lock_guard<std::mutex> lock(mMutex);

            std::shared_ptr<ComponentModule> localModule = mModule.lock();

            if (localModule == nullptr) {

                if(mCreateFactory) {

                    // For testing only

                    localModule = std::make_shared<ComponentModule>(mCreateFactory,

                                                                    mDestroyFactory);

                } else {

                    localModule = std::make_shared<ComponentModule>();

                }

                res = localModule->init(mLibPath);

                if (res == C2_OK) {

                    mModule = localModule;
@@ -733,10 +763,22 @@ private: 
        ComponentLoader(std::string libPath)

            : mLibPath(libPath) {}



        // For testing only

        ComponentLoader(std::tuple<C2String,

                          C2ComponentFactory::CreateCodec2FactoryFunc,

                          C2ComponentFactory::DestroyCodec2FactoryFunc> func)

            : mLibPath(std::get<0>(func)),

              mCreateFactory(std::get<1>(func)),

              mDestroyFactory(std::get<2>(func)) {}



    private:

        std::mutex mMutex; ///< mutex guarding the module

        std::weak_ptr<ComponentModule> mModule; ///< weak reference to the loaded module

        std::string mLibPath; ///< library path



        // For testing only

        C2ComponentFactory::CreateCodec2FactoryFunc mCreateFactory = nullptr;

        C2ComponentFactory::DestroyCodec2FactoryFunc mDestroyFactory = nullptr;

    };



    struct Interface : public C2InterfaceHelper {
@@ -846,12 +888,19 @@ private: 


    std::shared_ptr<C2ReflectorHelper> mReflector;

    Interface mInterface;



    // For testing only

    std::vector<std::tuple<C2String,

                          C2ComponentFactory::CreateCodec2FactoryFunc,

                          C2ComponentFactory::DestroyCodec2FactoryFunc>> mCodec2FactoryFuncs;

};



c2_status_t C2PlatformComponentStore::ComponentModule::init(

        std::string libPath) {

    ALOGV("in %s", __func__);

    ALOGV("loading dll");



    if(!createFactory) {

        mLibHandle = dlopen(libPath.c_str(), RTLD_NOW|RTLD_NODELETE);

        LOG_ALWAYS_FATAL_IF(mLibHandle == nullptr,

                "could not dlopen %s: %s", libPath.c_str(), dlerror());
@@ -865,6 +914,7 @@ c2_status_t C2PlatformComponentStore::ComponentModule::init( 
            (C2ComponentFactory::DestroyCodec2FactoryFunc)dlsym(mLibHandle, "DestroyCodec2Factory");

        LOG_ALWAYS_FATAL_IF(destroyFactory == nullptr,

                "destroyFactory is null in %s", libPath.c_str());

    }



    mComponentFactory = createFactory();

    if (mComponentFactory == nullptr) {
@@ -1065,6 +1115,22 @@ C2PlatformComponentStore::C2PlatformComponentStore() 
    emplace("libcodec2_soft_vp8enc.so");

    emplace("libcodec2_soft_vp9dec.so");

    emplace("libcodec2_soft_vp9enc.so");



}



// For testing only

C2PlatformComponentStore::C2PlatformComponentStore(

    std::vector<std::tuple<C2String,

                C2ComponentFactory::CreateCodec2FactoryFunc,

                C2ComponentFactory::DestroyCodec2FactoryFunc>> funcs)

    : mVisited(false),

      mReflector(std::make_shared<C2ReflectorHelper>()),

      mInterface(mReflector),

      mCodec2FactoryFuncs(funcs) {



    for(auto const& func: mCodec2FactoryFuncs) {

        mComponents.emplace(std::get<0>(func), func);

    }

}



c2_status_t C2PlatformComponentStore::copyBuffer(
@@ -1184,4 +1250,11 @@ std::shared_ptr<C2ComponentStore> GetCodec2PlatformComponentStore() { 
    return store;

}



// For testing only

std::shared_ptr<C2ComponentStore> GetTestComponentStore(

        std::vector<std::tuple<C2String,

        C2ComponentFactory::CreateCodec2FactoryFunc,

        C2ComponentFactory::DestroyCodec2FactoryFunc>> funcs) {

    return std::shared_ptr<C2ComponentStore>(new C2PlatformComponentStore(funcs));

}

} // namespace android

media/codec2/vndk/include/C2PlatformSupport.h

+9 −0
Original line number Diff line number Diff line
@@ -143,6 +143,15 @@ c2_status_t CreateCodec2BlockPool( 
 */

std::shared_ptr<C2ComponentStore> GetCodec2PlatformComponentStore();



/**

 * Returns the platform component store.

 * NOTE: For testing only

 * \retval nullptr if the platform component store could not be obtained

 */

std::shared_ptr<C2ComponentStore> GetTestComponentStore(

        std::vector<std::tuple<C2String, C2ComponentFactory::CreateCodec2FactoryFunc,

        C2ComponentFactory::DestroyCodec2FactoryFunc>>);



/**

 * Sets the preferred component store in this process for the sole purpose of accessing its

 * interface. If this is not called, the default IComponentStore HAL (if exists) is the preferred