diff options
author | Andreas Huber <andih@google.com> | 2012-04-13 14:54:36 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2012-04-17 11:22:11 -0700 |
commit | 1608735ef488ecd8c3c012a3b0d4b1d4ef3d93c7 (patch) | |
tree | c77756706095cdb6852e56392e8365bcaa7d9232 /media/libmediaplayerservice/Crypto.cpp | |
parent | a98db787397633155fd71b06ecaa765a7ad20cf2 (diff) | |
download | frameworks_av-1608735ef488ecd8c3c012a3b0d4b1d4ef3d93c7.zip frameworks_av-1608735ef488ecd8c3c012a3b0d4b1d4ef3d93c7.tar.gz frameworks_av-1608735ef488ecd8c3c012a3b0d4b1d4ef3d93c7.tar.bz2 |
Support widevine:// URLs in NuMediaExtractor / java MediaExtractor.
Allow anyone to talk to drm services.
Change-Id: I5c2f3c419d01de30c3d6e2bc85b1fe5c9c37b392
related-to-bug: 6276111
Diffstat (limited to 'media/libmediaplayerservice/Crypto.cpp')
-rw-r--r-- | media/libmediaplayerservice/Crypto.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/Crypto.cpp b/media/libmediaplayerservice/Crypto.cpp index 4491f2b..574ae71 100644 --- a/media/libmediaplayerservice/Crypto.cpp +++ b/media/libmediaplayerservice/Crypto.cpp @@ -32,6 +32,7 @@ namespace android { Crypto::Crypto() : mInitCheck(NO_INIT), mLibHandle(NULL), + mFactory(NULL), mPlugin(NULL) { mInitCheck = init(); } @@ -57,6 +58,8 @@ status_t Crypto::init() { mLibHandle = dlopen("libdrmdecrypt.so", RTLD_NOW); if (mLibHandle == NULL) { + ALOGE("Unable to locate libdrmdecrypt.so"); + return ERROR_UNSUPPORTED; } @@ -66,6 +69,12 @@ status_t Crypto::init() { if (createCryptoFactory == NULL || ((mFactory = createCryptoFactory()) == NULL)) { + if (createCryptoFactory == NULL) { + ALOGE("Unable to find symbol 'createCryptoFactory'."); + } else { + ALOGE("createCryptoFactory() failed."); + } + dlclose(mLibHandle); mLibHandle = NULL; |