diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-12-12 15:24:46 -0800 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2014-12-15 18:28:54 +0000 |
| commit | 661a5270303392bbf22eaa459961e6ab7b26b529 (patch) | |
| tree | da831271890b6b0d615128a4cdace36a1e6487c6 /media | |
| parent | 8cffa91a76d3fa4c96268fc40fc8722a0d33dc8d (diff) | |
| download | frameworks_av-661a5270303392bbf22eaa459961e6ab7b26b529.zip frameworks_av-661a5270303392bbf22eaa459961e6ab7b26b529.tar.gz frameworks_av-661a5270303392bbf22eaa459961e6ab7b26b529.tar.bz2 | |
Fix for apps that forget to use widevine:// urls
bug: 18554455
Change-Id: I8ff08e7270c65c375205169eb068f361f2a4a727
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index 1af2713..dd79b50 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -173,6 +173,14 @@ status_t NuPlayer::GenericSource::initFromDataSource() { if (mFileMeta->findCString(kKeyMIMEType, &fileMime) && !strncasecmp(fileMime, "video/wvm", 9)) { mIsWidevine = true; + if (!mUri.empty()) { + // streaming, but the app forgot to specify widevine:// url + mWVMExtractor = static_cast<WVMExtractor *>(extractor.get()); + mWVMExtractor->setAdaptiveStreamingMode(true); + if (mUIDValid) { + mWVMExtractor->setUID(mUID); + } + } } } } |