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

Fix Case on InitDataResemblesPSSH()

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

This was Google-cased, not Android-cased like the rest of the file
it's in.

Change-Id: I79ecf490212428de9a668d49d6feca678379f3ae
This commit is contained in:
John "Juce" Bruce
2015-04-24 15:17:03 -07:00
parent c4d9c1036e
commit 509471b058
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/mediadrm/include/WVDrmPlugin.h
View File

@@ -274,7 +274,7 @@ class WVDrmPlugin : public android::DrmPlugin,
status_t mapOEMCryptoResult(OEMCryptoResult res); status_t mapOEMCryptoResult(OEMCryptoResult res);
bool InitDataResemblesPSSH(const Vector<uint8_t>& initData); bool initDataResemblesPSSH(const Vector<uint8_t>& initData);
status_t unprovision(const std::string& origin); status_t unprovision(const std::string& origin);

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

@@ -191,7 +191,7 @@ status_t WVDrmPlugin::getKeyRequest(
CdmInitData processedInitData; CdmInitData processedInitData;
if (initData.size() > 0 && if (initData.size() > 0 &&
WvContentDecryptionModule::IsCenc(cdmInitDataType) && WvContentDecryptionModule::IsCenc(cdmInitDataType) &&
!InitDataResemblesPSSH(initData)) { !initDataResemblesPSSH(initData)) {
// This data was passed in the old format, pre-unwrapped. We need to wrap // This data was passed in the old format, pre-unwrapped. We need to wrap
// the init data in a new PSSH header. // the init data in a new PSSH header.
static const uint8_t psshPrefix[] = { static const uint8_t psshPrefix[] = {
@@ -1005,7 +1005,7 @@ status_t WVDrmPlugin::mapOEMCryptoResult(OEMCryptoResult res) {
} }
} }
bool WVDrmPlugin::InitDataResemblesPSSH(const Vector<uint8_t>& initData) { bool WVDrmPlugin::initDataResemblesPSSH(const Vector<uint8_t>& initData) {
const uint8_t* const initDataArray = initData.array(); const uint8_t* const initDataArray = initData.array();
// Extract the size field // Extract the size field