diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-12-15 22:36:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-15 22:36:00 +0000 |
| commit | 42818cca55fa4e4faca5b5686c7930070c2bf434 (patch) | |
| tree | 359457f5fadee5eeb72f600e0a74a597724a16de /media | |
| parent | 06f9952190357426445344090b4e20b8758a118a (diff) | |
| parent | 9f932418856844c6b8242d4c921654d0cc6af754 (diff) | |
| download | frameworks_av-42818cca55fa4e4faca5b5686c7930070c2bf434.zip frameworks_av-42818cca55fa4e4faca5b5686c7930070c2bf434.tar.gz frameworks_av-42818cca55fa4e4faca5b5686c7930070c2bf434.tar.bz2 | |
am 9f932418: Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-dev
* commit '9f932418856844c6b8242d4c921654d0cc6af754':
Fix for apps that forget to use widevine:// urls
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); + } + } } } } |