commit 661a5270303392bbf22eaa459961e6ab7b26b529
author Jeff Tinker <jtinker@google.com> Fri Dec 12 15:24:46 2014 -0800
committer Jeff Tinker <jtinker@google.com> Mon Dec 15 18:28:54 2014 +0000
tree da831271890b6b0d615128a4cdace36a1e6487c6
parent 8cffa91a76d3fa4c96268fc40fc8722a0d33dc8d

Fix for apps that forget to use widevine:// urls

bug: 18554455

Change-Id: I8ff08e7270c65c375205169eb068f361f2a4a727

media/libmediaplayerservice/nuplayer/GenericSource.cpp

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 @@
             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);
+                  }
+                }
             }
         }
     }