diff options
Diffstat (limited to 'drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp')
| -rw-r--r-- | drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp b/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp index 50acc1dab5..1558e8b8da 100644 --- a/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp +++ b/drm/mediacas/plugins/clearkey/ClearKeyCasPlugin.cpp @@ -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"); } @@ -347,6 +347,9 @@ ssize_t ClearKeyCasSession::decrypt( return ERROR_CAS_CANNOT_HANDLE; } + scramblingControl = (DescramblerPlugin::ScramblingControl) + (scramblingControl & DescramblerPlugin::kScrambling_Mask_Key); + AES_KEY contentKey; if (scramblingControl != DescramblerPlugin::kScrambling_Unscrambled) { |