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

Commit f29f5bd8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Iba03d8b8,Ic2bc89bb into android10-tests-dev 

* changes:
  C2 VTS: Set "default" store as preferred store
  Codec2Client: Add function to set preferred store
parents f0463aa1 03b049f5

media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ class Codec2AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        mDisableTest = false;

        ALOGV("Codec2AudioDecHidlTest SetUp");

        mClient = android::Codec2Client::CreateFromService(

            gEnv->getInstance().c_str());

            gEnv->getInstance().c_str(),

            !bool(android::Codec2Client::CreateFromService("default", true)));

        ASSERT_NE(mClient, nullptr);

        mListener.reset(new CodecListener(

            [this](std::list<std::unique_ptr<C2Work>>& workItems) {

media/codec2/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioEncTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ class Codec2AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        mDisableTest = false;

        ALOGV("Codec2AudioEncHidlTest SetUp");

        mClient = android::Codec2Client::CreateFromService(

            gEnv->getInstance().c_str());

            gEnv->getInstance().c_str(),

            !bool(android::Codec2Client::CreateFromService("default", true)));

        ASSERT_NE(mClient, nullptr);

        mListener.reset(new CodecListener(

            [this](std::list<std::unique_ptr<C2Work>>& workItems) {

media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ class Codec2VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        mDisableTest = false;

        ALOGV("Codec2VideoDecHidlTest SetUp");

        mClient = android::Codec2Client::CreateFromService(

            gEnv->getInstance().c_str());

            gEnv->getInstance().c_str(),

            !bool(android::Codec2Client::CreateFromService("default", true)));

        ASSERT_NE(mClient, nullptr);

        mListener.reset(new CodecListener(

            [this](std::list<std::unique_ptr<C2Work>>& workItems) {

media/codec2/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoEncTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ class Codec2VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
        mDisableTest = false;

        ALOGV("Codec2VideoEncHidlTest SetUp");

        mClient = android::Codec2Client::CreateFromService(

            gEnv->getInstance().c_str());

            gEnv->getInstance().c_str(),

            !bool(android::Codec2Client::CreateFromService("default", true)));

        ASSERT_NE(mClient, nullptr);

        mListener.reset(new CodecListener(

            [this](std::list<std::unique_ptr<C2Work>>& workItems) {

media/codec2/hidl/client/client.cpp

+80 −3
Original line number Diff line number Diff line
@@ -89,6 +89,69 @@ size_t getServiceIndex(char const* name) { 
    return i;

}



class Client2Store : public C2ComponentStore {

    std::shared_ptr<Codec2Client> mClient;



public:

    Client2Store(std::shared_ptr<Codec2Client> const& client)

        : mClient(client) { }



    virtual ~Client2Store() = default;



    virtual c2_status_t config_sm(

            std::vector<C2Param*> const &params,

            std::vector<std::unique_ptr<C2SettingResult>>* const failures) {

        return mClient->config(params, C2_MAY_BLOCK, failures);

    };



    virtual c2_status_t copyBuffer(

            std::shared_ptr<C2GraphicBuffer>,

            std::shared_ptr<C2GraphicBuffer>) {

        return C2_OMITTED;

    }



    virtual c2_status_t createComponent(

            C2String, std::shared_ptr<C2Component>* const component) {

        component->reset();

        return C2_OMITTED;

    }



    virtual c2_status_t createInterface(

            C2String, std::shared_ptr<C2ComponentInterface>* const interface) {

        interface->reset();

        return C2_OMITTED;

    }



    virtual c2_status_t query_sm(

            std::vector<C2Param*> const& stackParams,

            std::vector<C2Param::Index> const& heapParamIndices,

            std::vector<std::unique_ptr<C2Param>>* const heapParams) const {

        return mClient->query(stackParams, heapParamIndices, C2_MAY_BLOCK, heapParams);

    }



    virtual c2_status_t querySupportedParams_nb(

            std::vector<std::shared_ptr<C2ParamDescriptor>>* const params) const {

        return mClient->querySupportedParams(params);

    }



    virtual c2_status_t querySupportedValues_sm(

            std::vector<C2FieldSupportedValuesQuery>& fields) const {

        return mClient->querySupportedValues(fields, C2_MAY_BLOCK);

    }



    virtual C2String getName() const {

        return mClient->getName();

    }



    virtual std::shared_ptr<C2ParamReflector> getParamReflector() const {

        return mClient->getParamReflector();

    }



    virtual std::vector<std::shared_ptr<C2Component::Traits const>> listComponents() {

        return std::vector<std::shared_ptr<C2Component::Traits const>>();

    }

};



}  // unnamed namespace



// This class caches a Codec2Client object and its component traits. The client
@@ -803,10 +866,24 @@ std::vector<std::string> const& Codec2Client::GetServiceNames() { 
}



std::shared_ptr<Codec2Client> Codec2Client::CreateFromService(

        const char* name) {

        const char* name,

        bool setAsPreferredCodec2ComponentStore) {

    size_t index = getServiceIndex(name);

    return index == GetServiceNames().size() ?

            nullptr : _CreateFromIndex(index);

    if (index == GetServiceNames().size()) {

        if (setAsPreferredCodec2ComponentStore) {

            LOG(WARNING) << "CreateFromService(" << name

                         << ") -- preferred C2ComponentStore not set.";

        }

        return nullptr;

    }

    std::shared_ptr<Codec2Client> client = _CreateFromIndex(index);

    if (setAsPreferredCodec2ComponentStore) {

        SetPreferredCodec2ComponentStore(

                std::make_shared<Client2Store>(client));

        LOG(INFO) << "CreateFromService(" << name

                  << ") -- service set as preferred C2ComponentStore.";

    }

    return client;

}



std::vector<std::shared_ptr<Codec2Client>> Codec2Client::