summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/Drm.cpp
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2015-03-16 13:39:29 -0700
committerJeff Tinker <jtinker@google.com>2015-03-16 15:39:03 -0700
commitd072c909d87f8150433860f6de4c11df6e09e2f9 (patch)
tree57ddf1e47d3ce322e10214991e01b509aeeb1155 /media/libmediaplayerservice/Drm.cpp
parenteb0ee0e842d3b8294aa6c0b797eaf7aff3fd2f89 (diff)
downloadframeworks_av-d072c909d87f8150433860f6de4c11df6e09e2f9.zip
frameworks_av-d072c909d87f8150433860f6de4c11df6e09e2f9.tar.gz
frameworks_av-d072c909d87f8150433860f6de4c11df6e09e2f9.tar.bz2
Report key request message type for unprefixed EME
bug: 19771299 Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6
Diffstat (limited to 'media/libmediaplayerservice/Drm.cpp')
-rw-r--r--media/libmediaplayerservice/Drm.cpp6
1 files changed, 4 insertions, 2 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,