diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-12-15 21:21:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-15 21:21:41 +0000 |
| commit | 9f932418856844c6b8242d4c921654d0cc6af754 (patch) | |
| tree | 359457f5fadee5eeb72f600e0a74a597724a16de /media/libmediaplayerservice | |
| parent | 2aa82e786be2e986be1ecb48d72b095b040efe9a (diff) | |
| parent | 661a5270303392bbf22eaa459961e6ab7b26b529 (diff) | |
| download | frameworks_av-9f932418856844c6b8242d4c921654d0cc6af754.zip frameworks_av-9f932418856844c6b8242d4c921654d0cc6af754.tar.gz frameworks_av-9f932418856844c6b8242d4c921654d0cc6af754.tar.bz2 | |
Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-dev
Diffstat (limited to 'media/libmediaplayerservice')
| -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); + } + } } } } |