From 509471b058b911921575038d738a38e1817f6530 Mon Sep 17 00:00:00 2001 From: "John \"Juce\" Bruce" Date: Fri, 24 Apr 2015 15:17:03 -0700 Subject: [PATCH] Fix Case on InitDataResemblesPSSH() (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 --- libwvdrmengine/mediadrm/include/WVDrmPlugin.h | 2 +- libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libwvdrmengine/mediadrm/include/WVDrmPlugin.h b/libwvdrmengine/mediadrm/include/WVDrmPlugin.h index 9d6d7da0..46429d01 100644 --- a/libwvdrmengine/mediadrm/include/WVDrmPlugin.h +++ b/libwvdrmengine/mediadrm/include/WVDrmPlugin.h @@ -274,7 +274,7 @@ class WVDrmPlugin : public android::DrmPlugin, status_t mapOEMCryptoResult(OEMCryptoResult res); - bool InitDataResemblesPSSH(const Vector& initData); + bool initDataResemblesPSSH(const Vector& initData); status_t unprovision(const std::string& origin); diff --git a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp index 7365d1f5..3491f2f7 100644 --- a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp +++ b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp @@ -191,7 +191,7 @@ status_t WVDrmPlugin::getKeyRequest( CdmInitData processedInitData; if (initData.size() > 0 && WvContentDecryptionModule::IsCenc(cdmInitDataType) && - !InitDataResemblesPSSH(initData)) { + !initDataResemblesPSSH(initData)) { // This data was passed in the old format, pre-unwrapped. We need to wrap // the init data in a new PSSH header. static const uint8_t psshPrefix[] = { @@ -1005,7 +1005,7 @@ status_t WVDrmPlugin::mapOEMCryptoResult(OEMCryptoResult res) { } } -bool WVDrmPlugin::InitDataResemblesPSSH(const Vector& initData) { +bool WVDrmPlugin::initDataResemblesPSSH(const Vector& initData) { const uint8_t* const initDataArray = initData.array(); // Extract the size field