am 6141ac4b: am 9b1d8119: Merge "Allows sharing of keys between sessions" into klp-dev

* commit '6141ac4bc6983b140c1f29171552e1f2aa11dea0':
  Allows sharing of keys between sessions
This commit is contained in:
Jeff Tinker
2013-10-11 10:07:30 -07:00
committed by Android Git Automerger
14 changed files with 308 additions and 34 deletions

View File

@@ -21,7 +21,7 @@ class WvContentDecryptionModule {
// Session related methods
virtual CdmResponseType OpenSession(
const CdmKeySystem& key_system,
const CdmClientPropertySet* property_set,
CdmClientPropertySet* property_set,
CdmSessionId* session_id);
virtual CdmResponseType CloseSession(const CdmSessionId& session_id);
@@ -84,6 +84,7 @@ class WvContentDecryptionModule {
WvCdmEventListener* listener);
private:
uint32_t GenerateSessionSharingId();
// instance variables
UniquePtr<CdmEngine> cdm_engine_;