widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Update license and content server URLs due to server migration."

Browse Source 
This reverts commit a53677d27c.

Change-Id: I9afbc9aa95cc0cf518ef1fd378dccdc5874afaa4
This commit is contained in:
Jeff Tinker
2014-06-17 17:59:40 +00:00
parent a53677d27c
commit 2a5754f338
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
proprietary/drmwvmplugin/test/TestPlugin.cpp
View File

@@ -81,8 +81,12 @@ void WVMDrmPluginTest::Run()
String8 url;
// Remote asset with widevine:// protocol
url = String8("widevine://commondatastorage.googleapis.com/wvmedia/bbb_base_480p_3br_tp.wvm");
// Remote asset
url = String8("http://seawwws001.cdn.shibboleth.tv/videos/content/bbb_ffmpeg_hc_single_480p.wvm");
TestAsset(plugin, url);
// Remote asset using widevine:// protocol
url = String8("widevine://seawwws001.cdn.shibboleth.tv/videos/content/bbb_ffmpeg_hc_single_480p.wvm");
TestAsset(plugin, url);
// Local asset using URL syntax
@@ -97,6 +101,10 @@ void WVMDrmPluginTest::Run()
url = String8("/sdcard/Widevine/inception_base_360p_single.wvm");
TestAsset(plugin, url, true);
// Remote asset with query parameters
url = String8("http://seawwws001.cdn.shibboleth.tv/videos/content/bbb_ffmpeg_hc_single_480p.wvm?a=b");
TestAsset(plugin, url);
// Shut down and clean up
if (plugin->terminate(0) != DRM_NO_ERROR) {
fprintf(stderr, "onTerminate failed!\n");
@@ -135,7 +143,7 @@ void WVMDrmPluginTest::TestAcquireRights(IDrmEngine *plugin, String8 &url,
String8 mimeType("video/wvm");
DrmInfoRequest rightsAcquisitionInfo(DrmInfoRequest::TYPE_RIGHTS_ACQUISITION_INFO, mimeType);
rightsAcquisitionInfo.put(String8("WVDRMServerKey"), String8(
"https://license.uat.widevine.com/getlicense/widevine"));
"https://staging.shibboleth.tv/widevine/cypherpc/cgi-bin/GetEMMs.cgi"));
rightsAcquisitionInfo.put(String8("WVAssetURIKey"), url);
if (useOpenFd) {