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

Commit 87546c5c authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Update clear key plugin appData to void*" into pi-dev am: 8a21f4aa 

am: 2f20a93d

Change-Id: I9dcca586079b6bde271da6d48ac34cf6d47b069b
parents 7a31095b 2f20a93d

drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -55,7 +55,7 @@ status_t ClearKeyCasFactory::queryPlugins( 




status_t ClearKeyCasFactory::createPlugin(

status_t ClearKeyCasFactory::createPlugin(

        int32_t CA_system_id,

        int32_t CA_system_id,

        uint64_t appData,

        void *appData,

        CasPluginCallback callback,

        CasPluginCallback callback,

        CasPlugin **plugin) {

        CasPlugin **plugin) {

    if (!isSystemIdSupported(CA_system_id)) {

    if (!isSystemIdSupported(CA_system_id)) {
@@ -83,7 +83,7 @@ status_t ClearKeyDescramblerFactory::createPlugin( 




///////////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////////

ClearKeyCasPlugin::ClearKeyCasPlugin(

ClearKeyCasPlugin::ClearKeyCasPlugin(

        uint64_t appData, CasPluginCallback callback)

        void *appData, CasPluginCallback callback)

    : mCallback(callback), mAppData(appData) {

    : mCallback(callback), mAppData(appData) {

    ALOGV("CTOR");

    ALOGV("CTOR");

}

}

drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ public: 
            std::vector<CasPluginDescriptor> *descriptors) const override;

            std::vector<CasPluginDescriptor> *descriptors) const override;

    virtual status_t createPlugin(

    virtual status_t createPlugin(

            int32_t CA_system_id,

            int32_t CA_system_id,

            uint64_t appData,

            void *appData,

            CasPluginCallback callback,

            CasPluginCallback callback,

            CasPlugin **plugin) override;

            CasPlugin **plugin) override;

};

};
@@ -62,7 +62,7 @@ public: 




class ClearKeyCasPlugin : public CasPlugin {

class ClearKeyCasPlugin : public CasPlugin {

public:

public:

    ClearKeyCasPlugin(uint64_t appData, CasPluginCallback callback);

    ClearKeyCasPlugin(void *appData, CasPluginCallback callback);

    virtual ~ClearKeyCasPlugin();

    virtual ~ClearKeyCasPlugin();





    virtual status_t setPrivateData(

    virtual status_t setPrivateData(
@@ -94,7 +94,7 @@ private: 
    Mutex mKeyFetcherLock;

    Mutex mKeyFetcherLock;

    std::unique_ptr<KeyFetcher> mKeyFetcher;

    std::unique_ptr<KeyFetcher> mKeyFetcher;

    CasPluginCallback mCallback;

    CasPluginCallback mCallback;

    uint64_t mAppData;

    void* mAppData;

};

};





class ClearKeyDescramblerPlugin : public DescramblerPlugin {

class ClearKeyDescramblerPlugin : public DescramblerPlugin {

drm/mediacas/plugins/mock/MockCasPlugin.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ status_t MockCasFactory::queryPlugins( 




status_t MockCasFactory::createPlugin(

status_t MockCasFactory::createPlugin(

        int32_t CA_system_id,

        int32_t CA_system_id,

        uint64_t /*appData*/,

        void* /*appData*/,

        CasPluginCallback /*callback*/,

        CasPluginCallback /*callback*/,

        CasPlugin **plugin) {

        CasPlugin **plugin) {

    if (!isSystemIdSupported(CA_system_id)) {

    if (!isSystemIdSupported(CA_system_id)) {

drm/mediacas/plugins/mock/MockCasPlugin.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -39,7 +39,7 @@ public: 
            std::vector<CasPluginDescriptor> *descriptors) const override;

            std::vector<CasPluginDescriptor> *descriptors) const override;

    virtual status_t createPlugin(

    virtual status_t createPlugin(

            int32_t CA_system_id,

            int32_t CA_system_id,

            uint64_t appData,

            void *appData,

            CasPluginCallback callback,

            CasPluginCallback callback,

            CasPlugin **plugin) override;

            CasPlugin **plugin) override;

};

};