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

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

Merge "Update clear key plugin appData to void*" into pi-dev

parents 79890542 f872751f

drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp

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


status_t ClearKeyCasFactory::createPlugin(

        int32_t CA_system_id,

        uint64_t appData,

        void *appData,

        CasPluginCallback callback,

        CasPlugin **plugin) {

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


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

ClearKeyCasPlugin::ClearKeyCasPlugin(

        uint64_t appData, CasPluginCallback callback)

        void *appData, CasPluginCallback callback)

    : mCallback(callback), mAppData(appData) {

    ALOGV("CTOR");

}

drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.h

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

    virtual status_t createPlugin(

            int32_t CA_system_id,

            uint64_t appData,

            void *appData,

            CasPluginCallback callback,

            CasPlugin **plugin) override;

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


class ClearKeyCasPlugin : public CasPlugin {

public:

    ClearKeyCasPlugin(uint64_t appData, CasPluginCallback callback);

    ClearKeyCasPlugin(void *appData, CasPluginCallback callback);

    virtual ~ClearKeyCasPlugin();



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

    std::unique_ptr<KeyFetcher> mKeyFetcher;

    CasPluginCallback mCallback;

    uint64_t mAppData;

    void* mAppData;

};



class ClearKeyDescramblerPlugin : public DescramblerPlugin {

drm/mediacas/plugins/mock/MockCasPlugin.cpp

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


status_t MockCasFactory::createPlugin(

        int32_t CA_system_id,

        uint64_t /*appData*/,

        void* /*appData*/,

        CasPluginCallback /*callback*/,

        CasPlugin **plugin) {

    if (!isSystemIdSupported(CA_system_id)) {

drm/mediacas/plugins/mock/MockCasPlugin.h

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

    virtual status_t createPlugin(

            int32_t CA_system_id,

            uint64_t appData,

            void *appData,

            CasPluginCallback callback,

            CasPlugin **plugin) override;

};