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

resolved conflicts for merge of 7eea20df to master

Browse Source 
Change-Id: Ibd8b16745d36b24041856f315fbb09a6c25cf4fb
This commit is contained in:
John "Juce" Bruce
2014-04-02 18:59:05 -07:00
parent 46be6edcc3 7eea20df86
commit 31aa8eea04
19 changed files with 288 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/cdm/include/wv_content_decryption_module.h
View File

@@ -20,6 +20,9 @@ class WvContentDecryptionModule : public TimerHandler {
WvContentDecryptionModule();
virtual ~WvContentDecryptionModule();
// Static methods
static bool SupportsInitDataType(const std::string& type);
// Session related methods
virtual CdmResponseType OpenSession(
const CdmKeySystem& key_system,
@@ -30,7 +33,7 @@ class WvContentDecryptionModule : public TimerHandler {
// Construct a valid license request.
virtual CdmResponseType GenerateKeyRequest(const CdmSessionId& session_id,
const CdmKeySetId& key_set_id,
const std::string& mime_type,
const std::string& init_data_type,
const CdmInitData& init_data,
const CdmLicenseType license_type,
CdmAppParameterMap& app_parameters,