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

Merge "Refactor GenerateKeyRequest to reduce number of parameters" into nyc-dev

Browse Source
This commit is contained in:
Rahul Frias
2016-02-11 08:36:57 +00:00
committed by Android (Google) Code Review
parent fa4cb04a00 a444571c53
commit 7c4eaef227
14 changed files with 163 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,8 +72,7 @@ CdmResponseType WvContentDecryptionModule::GenerateKeyRequest(
const std::string& init_data_type, const CdmInitData& init_data,
const CdmLicenseType license_type, CdmAppParameterMap& app_parameters,
CdmClientPropertySet* property_set, const std::string& origin,
CdmKeyMessage* key_request, CdmKeyRequestType* key_request_type,
std::string* server_url) {
CdmKeyRequest* key_request) {
CdmResponseType sts;
if (license_type == kLicenseTypeRelease) {
sts = cdm_engine_->OpenKeySetSession(key_set_id, property_set, origin,
@@ -83,7 +82,7 @@ CdmResponseType WvContentDecryptionModule::GenerateKeyRequest(
InitializationData initialization_data(init_data_type, init_data);
sts = cdm_engine_->GenerateKeyRequest(
session_id, key_set_id, initialization_data, license_type, app_parameters,
key_request, key_request_type, server_url);
key_request);
switch(license_type) {
case kLicenseTypeRelease: