Fixes for b/4194032, b/4192318 and b/4190560
Found in online/offline testing with heartbeat server: b/4194032 - when streaming playback is stopped the streaming license is not removed b/4192318 - streaming licenses are allowing offline playback b/4190560 - offline heartbeats stopping video playback Change-Id: Iacf31f559d6b374752ca1b7f2b93d4ec8a4d7440
This commit is contained in:
@@ -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,
|
||||||
|
|||||||
Binary file not shown.
@@ -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");
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user