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

Use ToVector Everywhere

Browse Source 
(This is a merge of http://go/wvgerrit/14390)

Expands usage of the ToVector() helper that kqyang@ wrote across the
entire DRM Plugin.

Bug: 20037441
Change-Id: I55112245af6fdf21ea3d3db87b1564af2f54929d
This commit is contained in:
John "Juce" Bruce
2015-06-01 16:47:13 -07:00
parent 71a1779776
commit 4fce36e91f
1 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,9 +118,7 @@ status_t WVDrmPlugin::openSession(Vector<uint8_t>& sessionId) {
if (success) { if (success) {
// Marshal Session ID // Marshal Session ID
sessionId.clear(); sessionId = ToVector(cdmSessionId);
sessionId.appendArray(reinterpret_cast<const uint8_t*>(cdmSessionId.data()),
cdmSessionId.size());
return android::OK; return android::OK;
} else { } else {
@@ -233,9 +231,7 @@ status_t WVDrmPlugin::getKeyRequest(
defaultUrl.clear(); defaultUrl.clear();
defaultUrl.setTo(cdmDefaultUrl.data(), cdmDefaultUrl.size()); defaultUrl.setTo(cdmDefaultUrl.data(), cdmDefaultUrl.size());
request.clear(); request = ToVector(keyRequest);
request.appendArray(reinterpret_cast<const uint8_t*>(keyRequest.data()),
keyRequest.size());
} }
if (keyType == kKeyType_Release) { if (keyType == kKeyType_Release) {
@@ -271,9 +267,7 @@ status_t WVDrmPlugin::provideKeyResponse(
CdmResponseType res = mCDM->AddKey(cdmSessionId, cdmResponse, &cdmKeySetId); CdmResponseType res = mCDM->AddKey(cdmSessionId, cdmResponse, &cdmKeySetId);
if (isRequest && isCdmResponseTypeSuccess(res)) { if (isRequest && isCdmResponseTypeSuccess(res)) {
keySetId.clear(); keySetId = ToVector(cdmKeySetId);
keySetId.appendArray(reinterpret_cast<const uint8_t*>(cdmKeySetId.data()),
cdmKeySetId.size());
} }
if (isRelease) { if (isRelease) {
@@ -357,11 +351,7 @@ status_t WVDrmPlugin::getProvisionRequest(const String8& cert_type,
&cdmDefaultUrl); &cdmDefaultUrl);
if (isCdmResponseTypeSuccess(res)) { if (isCdmResponseTypeSuccess(res)) {
request.clear(); request = ToVector(cdmProvisionRequest);
request.appendArray(reinterpret_cast<const uint8_t*>(
cdmProvisionRequest.data()),
cdmProvisionRequest.size());
defaultUrl.clear(); defaultUrl.clear();
defaultUrl.setTo(cdmDefaultUrl.data(), cdmDefaultUrl.size()); defaultUrl.setTo(cdmDefaultUrl.data(), cdmDefaultUrl.size());
} }
@@ -386,15 +376,8 @@ status_t WVDrmPlugin::provideProvisionResponse(
&cdmCertificate, &cdmCertificate,
&cdmWrappedKey); &cdmWrappedKey);
if (isCdmResponseTypeSuccess(res)) { if (isCdmResponseTypeSuccess(res)) {
certificate.clear(); certificate = ToVector(cdmCertificate);
certificate.appendArray( wrapped_key = ToVector(cdmWrappedKey);
reinterpret_cast<const uint8_t*>(cdmCertificate.data()),
cdmCertificate.size());
wrapped_key.clear();
wrapped_key.appendArray(
reinterpret_cast<const uint8_t*>(cdmWrappedKey.data()),
cdmWrappedKey.size());
} }
return mapCdmResponseType(res); return mapCdmResponseType(res);
@@ -436,11 +419,7 @@ status_t WVDrmPlugin::getSecureStops(List<Vector<uint8_t> >& secureStops) {
++iter) { ++iter) {
const string& cdmStop = *iter; const string& cdmStop = *iter;
Vector<uint8_t> stop; secureStops.push_back(ToVector(cdmStop));
stop.appendArray(reinterpret_cast<const uint8_t*>(cdmStop.data()),
cdmStop.size());
secureStops.push_back(stop);
} }
} }
return mapCdmResponseType(res); return mapCdmResponseType(res);