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

Merge "Report key status change"

Browse Source
This commit is contained in:
Kongqun Yang
2015-04-02 17:18:19 +00:00
committed by Android (Google) Code Review
parent d9b274cb4a 4621028434
commit 7c003cdb0e
10 changed files with 315 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/mediadrm/include/WVDrmPlugin.h
View File

@@ -32,6 +32,7 @@ using android::status_t;
using android::String8;
using android::Vector;
using std::map;
using wvcdm::CdmKeyInformation;
using wvcdm::CdmSessionId;
using wvcdm::CdmResponseType;
using wvcdm::WvContentDecryptionModule;
@@ -143,6 +144,11 @@ class WVDrmPlugin : public android::DrmPlugin,
virtual void OnSessionExpiration(const CdmSessionId& cdmSessionId);
virtual void OnSessionKeysChange(
const CdmSessionId& session_id,
const std::vector<CdmKeyInformation>& cdm_keys_info,
bool has_new_usable_key);
virtual void OnExpirationUpdate(const CdmSessionId& cdmSessionId,
int64_t new_expiry_time);

7
libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
View File

@@ -965,6 +965,13 @@ void WVDrmPlugin::OnSessionExpiration(const CdmSessionId& cdmSessionId) {
sendEvent(kDrmPluginEventKeyExpired, 0, &sessionId, NULL);
}
void WVDrmPlugin::OnSessionKeysChange(
const CdmSessionId& session_id,
const std::vector<CdmKeyInformation>& cdm_keys_info,
bool has_new_usable_key) {
// TODO(kqyang): Glue with DrmPlugin API when it is ready.
}
void WVDrmPlugin::OnExpirationUpdate(const CdmSessionId& cdmSessionId,
int64_t new_expiry_time) {
// TODO(kqyang): Glue with DrmPlugin API when it is ready. Note that