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 | |
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')
-rw-r--r-- | media/libstagefright/DataSource.cpp | 40 | ||||
-rw-r--r-- | media/libstagefright/NuMediaExtractor.cpp | 24 | ||||
-rw-r--r-- | media/libstagefright/WVMExtractor.cpp | 12 |
3 files changed, 59 insertions, 17 deletions
diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp index aba95bc..3400724 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -133,27 +133,45 @@ void DataSource::RegisterDefaultSniffers() { // static sp<DataSource> DataSource::CreateFromURI( const char *uri, const KeyedVector<String8, String8> *headers) { + bool isWidevine = !strncasecmp("widevine://", uri, 11); + sp<DataSource> source; if (!strncasecmp("file://", uri, 7)) { source = new FileSource(uri + 7); } else if (!strncasecmp("http://", uri, 7) - || !strncasecmp("https://", uri, 8)) { + || !strncasecmp("https://", uri, 8) + || isWidevine) { sp<HTTPBase> httpSource = HTTPBase::Create(); + + String8 tmp; + if (isWidevine) { + tmp = String8("http://"); + tmp.append(uri + 11); + + uri = tmp.string(); + } + if (httpSource->connect(uri, headers) != OK) { return NULL; } - String8 cacheConfig; - bool disconnectAtHighwatermark; - if (headers != NULL) { - KeyedVector<String8, String8> copy = *headers; - NuCachedSource2::RemoveCacheSpecificHeaders( - ©, &cacheConfig, &disconnectAtHighwatermark); - } + if (!isWidevine) { + String8 cacheConfig; + bool disconnectAtHighwatermark; + if (headers != NULL) { + KeyedVector<String8, String8> copy = *headers; + NuCachedSource2::RemoveCacheSpecificHeaders( + ©, &cacheConfig, &disconnectAtHighwatermark); + } - source = new NuCachedSource2( - httpSource, - cacheConfig.isEmpty() ? NULL : cacheConfig.string()); + source = new NuCachedSource2( + httpSource, + cacheConfig.isEmpty() ? NULL : cacheConfig.string()); + } else { + // We do not want that prefetching, caching, datasource wrapper + // in the widevine:// case. + source = httpSource; + } # if CHROMIUM_AVAILABLE } else if (!strncasecmp("data:", uri, 5)) { diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp index 8758c93..a1d95e6 100644 --- a/media/libstagefright/NuMediaExtractor.cpp +++ b/media/libstagefright/NuMediaExtractor.cpp @@ -21,6 +21,7 @@ #include <media/stagefright/NuMediaExtractor.h> #include "include/ESDS.h" +#include "include/WVMExtractor.h" #include <media/stagefright/foundation/ABuffer.h> #include <media/stagefright/foundation/ADebug.h> @@ -58,13 +59,32 @@ status_t NuMediaExtractor::setDataSource( return -EINVAL; } - sp<DataSource> dataSource = DataSource::CreateFromURI(path, headers); + sp<DataSource> dataSource = + DataSource::CreateFromURI(path, headers); if (dataSource == NULL) { return -ENOENT; } - mImpl = MediaExtractor::Create(dataSource); + if (!strncasecmp("widevine://", path, 11)) { + String8 mimeType; + float confidence; + sp<AMessage> dummy; + bool success = SniffWVM(dataSource, &mimeType, &confidence, &dummy); + + if (!success + || strcasecmp( + mimeType.string(), MEDIA_MIMETYPE_CONTAINER_WVM)) { + return ERROR_UNSUPPORTED; + } + + sp<WVMExtractor> extractor = new WVMExtractor(dataSource); + extractor->setAdaptiveStreamingMode(true); + + mImpl = extractor; + } else { + mImpl = MediaExtractor::Create(dataSource); + } if (mImpl == NULL) { return ERROR_UNSUPPORTED; 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"); } |