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

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

Browse Source
This commit is contained in:
Jeffrey Tinker
2011-03-30 16:14:46 -07:00
committed by Android (Google) Code Review
parent c78c1461df 7c606db261
commit c0a82d66b2
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 WVDRMPluginAPI *create();
static void destroy(WVDRMPluginAPI *plugin); static void destroy(WVDRMPluginAPI *plugin);
virtual void OpenSession() = 0; virtual void OpenSession(const char *uri) = 0;
virtual void CloseSession() = 0; virtual void CloseSession() = 0;
virtual bool IsSupportedMediaType(const char *uri) = 0; virtual bool IsSupportedMediaType(const char *uri) = 0;
@@ -77,7 +77,7 @@ class WVDRMPluginAPI {
EventType_DeviceId, EventType_DeviceId,
EventType_StreamId, EventType_StreamId,
EventType_UserData EventType_UserData
}; };
enum EventDestination { enum EventDestination {
EventDestination_JavaAPI, 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->status = DRM_NO_ERROR;
decryptHandle->decryptInfo = NULL; decryptHandle->decryptInfo = NULL;
mDrmPluginImpl->OpenSession(); mDrmPluginImpl->OpenSession(NULL);
result = DRM_NO_ERROR; result = DRM_NO_ERROR;
} else { } else {
//LOGD("WVMDrmPlugin::onOpenDecryptSession - not Widevine media"); //LOGD("WVMDrmPlugin::onOpenDecryptSession - not Widevine media");
@@ -766,7 +766,7 @@ status_t WVMDrmPlugin::onOpenDecryptSession(
decryptHandle->status = DRM_NO_ERROR; decryptHandle->status = DRM_NO_ERROR;
decryptHandle->decryptInfo = NULL; decryptHandle->decryptInfo = NULL;
mDrmPluginImpl->OpenSession(); mDrmPluginImpl->OpenSession(uri);
result = DRM_NO_ERROR; result = DRM_NO_ERROR;
} else { } else {
//LOGD("WVMDrmPlugin::onOpenDecryptSession(uri) - not Widevine media"); //LOGD("WVMDrmPlugin::onOpenDecryptSession(uri) - not Widevine media");

BIN
proprietary/streamcontrol/lib/libWVStreamControlAPI.so
View File

Binary file not shown.