widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c0a82d66: Merge "Fixes for b/4194032, b/4192318 and b/4190560" into honeycomb-mr1

Browse Source 
* commit 'c0a82d66b299f0fc00c85c88f5d8076f08d30aaa':
  Fixes for b/4194032, b/4192318 and b/4190560
This commit is contained in:
Jeffrey Tinker
2011-03-30 17:34:58 -07:00
committed by Android Git Automerger
parent 68d1266b52 c0a82d66b2
commit e121813fef
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proprietary/drmwvmplugin/include/WVDRMPluginAPI.h
View File

@@ -37,7 +37,7 @@ class WVDRMPluginAPI {
static WVDRMPluginAPI *create();
static void destroy(WVDRMPluginAPI *plugin);
virtual void OpenSession() = 0;
virtual void OpenSession(const char *uri) = 0;
virtual void CloseSession() = 0;
virtual bool IsSupportedMediaType(const char *uri) = 0;
@@ -77,7 +77,7 @@ class WVDRMPluginAPI {
EventType_DeviceId,
EventType_StreamId,
EventType_UserData
};
};
enum EventDestination {
EventDestination_JavaAPI,

BIN
proprietary/drmwvmplugin/lib/libwvdrm.so
View File

Binary file not shown.

4
proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp
View File

@@ -733,7 +733,7 @@ status_t WVMDrmPlugin::onOpenDecryptSession(
decryptHandle->status = DRM_NO_ERROR;
decryptHandle->decryptInfo = NULL;
mDrmPluginImpl->OpenSession();
mDrmPluginImpl->OpenSession(NULL);
result = DRM_NO_ERROR;
} else {
//LOGD("WVMDrmPlugin::onOpenDecryptSession - not Widevine media");
@@ -766,7 +766,7 @@ status_t WVMDrmPlugin::onOpenDecryptSession(
decryptHandle->status = DRM_NO_ERROR;
decryptHandle->decryptInfo = NULL;
mDrmPluginImpl->OpenSession();
mDrmPluginImpl->OpenSession(uri);
result = DRM_NO_ERROR;
} else {
//LOGD("WVMDrmPlugin::onOpenDecryptSession(uri) - not Widevine media");