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/libstagefright/WVMExtractor.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/libstagefright/WVMExtractor.cpp')
| -rw-r--r-- | media/libstagefright/WVMExtractor.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/media/libstagefright/WVMExtractor.cpp b/media/libstagefright/WVMExtractor.cpp index dac8106..effe336 100644 --- a/media/libstagefright/WVMExtractor.cpp +++ b/media/libstagefright/WVMExtractor.cpp @@ -59,10 +59,14 @@ WVMExtractor::WVMExtractor(const sp<DataSource> &source) "_ZN7android11GetInstanceENS_2spINS_10DataSourceEEE"); if (getInstanceFunc) { - CHECK(source->DrmInitialization(MEDIA_MIMETYPE_CONTAINER_WVM) != NULL); - mImpl = (*getInstanceFunc)(source); - CHECK(mImpl != NULL); - setDrmFlag(true); + if (source->DrmInitialization( + MEDIA_MIMETYPE_CONTAINER_WVM) != NULL) { + mImpl = (*getInstanceFunc)(source); + CHECK(mImpl != NULL); + setDrmFlag(true); + } else { + ALOGE("Drm manager failed to initialize."); + } } else { ALOGE("Failed to locate GetInstance in libwvm.so"); } |