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

resolved conflicts for merge of ab95cf27 to master

Browse Source 
Change-Id: I194f2a00507a8469b3f15bd2d629d41dc07c1b45
This commit is contained in:
John "Juce" Bruce
2014-03-28 16:30:31 -07:00
parent 5e0b7328e7 ab95cf27f1
commit f23c54d834
16 changed files with 317 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/cdm/src/wv_content_decryption_module.cpp
View File

@@ -49,6 +49,7 @@ CdmResponseType WvContentDecryptionModule::CloseSession(
CdmResponseType WvContentDecryptionModule::GenerateKeyRequest(
const CdmSessionId& session_id,
const CdmKeySetId& key_set_id,
const std::string& mime_type,
const CdmInitData& init_data,
const CdmLicenseType license_type,
CdmAppParameterMap& app_parameters,
@@ -60,9 +61,10 @@ CdmResponseType WvContentDecryptionModule::GenerateKeyRequest(
if (sts != NO_ERROR)
return sts;
}
sts = cdm_engine_->GenerateKeyRequest(session_id, key_set_id, init_data,
license_type, app_parameters,
key_request, server_url);
sts = cdm_engine_->GenerateKeyRequest(session_id, key_set_id, mime_type,
init_data, license_type,
app_parameters, key_request,
server_url);
switch(license_type) {
case kLicenseTypeRelease: