diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-03-24 00:05:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-24 00:05:44 +0000 |
| commit | ec648447b7dcab701c436a54bd38a1abd8037be1 (patch) | |
| tree | a83bc7a008f5671316e18095b15f9fb7b746fd81 /media/libmediaplayerservice | |
| parent | 4c36d6f48f4eecacc148317f775f65961a4f03d2 (diff) | |
| parent | d072c909d87f8150433860f6de4c11df6e09e2f9 (diff) | |
| download | frameworks_av-ec648447b7dcab701c436a54bd38a1abd8037be1.zip frameworks_av-ec648447b7dcab701c436a54bd38a1abd8037be1.tar.gz frameworks_av-ec648447b7dcab701c436a54bd38a1abd8037be1.tar.bz2 | |
Merge "Report key request message type for unprefixed EME"
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/Drm.cpp | 6 | ||||
| -rw-r--r-- | media/libmediaplayerservice/Drm.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/Drm.cpp b/media/libmediaplayerservice/Drm.cpp index d4f6fab..49e01d1 100644 --- a/media/libmediaplayerservice/Drm.cpp +++ b/media/libmediaplayerservice/Drm.cpp @@ -358,7 +358,8 @@ status_t Drm::getKeyRequest(Vector<uint8_t> const &sessionId, Vector<uint8_t> const &initData, String8 const &mimeType, DrmPlugin::KeyType keyType, KeyedVector<String8, String8> const &optionalParameters, - Vector<uint8_t> &request, String8 &defaultUrl) { + Vector<uint8_t> &request, String8 &defaultUrl, + DrmPlugin::KeyRequestType *keyRequestType) { Mutex::Autolock autoLock(mLock); if (mInitCheck != OK) { @@ -372,7 +373,8 @@ status_t Drm::getKeyRequest(Vector<uint8_t> const &sessionId, DrmSessionManager::Instance()->useSession(sessionId); return mPlugin->getKeyRequest(sessionId, initData, mimeType, keyType, - optionalParameters, request, defaultUrl); + optionalParameters, request, defaultUrl, + keyRequestType); } status_t Drm::provideKeyResponse(Vector<uint8_t> const &sessionId, diff --git a/media/libmediaplayerservice/Drm.h b/media/libmediaplayerservice/Drm.h index 0cea639..7e8f246 100644 --- a/media/libmediaplayerservice/Drm.h +++ b/media/libmediaplayerservice/Drm.h @@ -53,7 +53,8 @@ struct Drm : public BnDrm, Vector<uint8_t> const &initData, String8 const &mimeType, DrmPlugin::KeyType keyType, KeyedVector<String8, String8> const &optionalParameters, - Vector<uint8_t> &request, String8 &defaultUrl); + Vector<uint8_t> &request, String8 &defaultUrl, + DrmPlugin::KeyRequestType *keyRequestType); virtual status_t provideKeyResponse(Vector<uint8_t> const &sessionId, Vector<uint8_t> const &response, |