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

am ccc0ebc4: am ec3cf9d1: am 54155e3d: am 9a9da0e0: Update license and content server URLs due to server migration.

Browse Source 
* commit 'ccc0ebc470f2178339ff7c18a38ff2f763011edc':
  Update license and content server URLs due to server migration.
This commit is contained in:
Jeff Tinker
2014-06-19 00:40:40 +00:00
committed by Android Git Automerger
parent 2a5754f338 ccc0ebc470
commit 8a8feb747c
5 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
proprietary/samplePlayer/readme
View File

@@ -17,7 +17,7 @@ demo is installed to out/target/product/stingray/system/app/WidevineSamplePlayer
[Download content for offline testing:] [Download content for offline testing:]
View http://seawwws001.shibboleth.tv/android/oem.html source for asset names. View http://pmweb.widevine.net/html/android/oem.html source for asset names.
For example: For example:

2
proprietary/samplePlayer/src/com/widevine/demo/SettingsActivity.java
View File

@@ -18,7 +18,7 @@ import android.content.Context;
public class SettingsActivity extends Activity { public class SettingsActivity extends Activity {
// public static String CONTENT_PAGE = "/sdcard/Widevine/config.xml"; // public static String CONTENT_PAGE = "/sdcard/Widevine/config.xml";
public static String CONTENT_PAGE = "http://seawwws001.shibboleth.tv/android/oem.html"; public static String CONTENT_PAGE = "http://pmweb.widevine.net/html/android/oem.html";
private Context context; private Context context;
private Button updateButton; private Button updateButton;

2
proprietary/samplePlayer/src/com/widevine/demo/WidevineDrm.java
View File

@@ -44,7 +44,7 @@ public class WidevineDrm {
public static class Settings { public static class Settings {
public static String WIDEVINE_MIME_TYPE = "video/wvm"; public static String WIDEVINE_MIME_TYPE = "video/wvm";
public static String DRM_SERVER_URI = "https://wstfcps005.shibboleth.tv/widevine/cypherpc/cgi-bin/GetEMMs.cgi"; public static String DRM_SERVER_URI = "https://license.uat.widevine.com/getlicense/widevine";
public static String DEVICE_ID = "device12345"; // use a unique device ID public static String DEVICE_ID = "device12345"; // use a unique device ID
public static String PORTAL_NAME = "OEM"; public static String PORTAL_NAME = "OEM";

3
proprietary/streamcontrol/test/TestPlayer.cpp
View File

@@ -34,8 +34,7 @@ using namespace android;
#define DEFAULT_BLOCK_SIZE 16*1024 #define DEFAULT_BLOCK_SIZE 16*1024
#define DEFAULT_PLAYBACK_BUFFER_SIZE 0*1024*1024 #define DEFAULT_PLAYBACK_BUFFER_SIZE 0*1024*1024
#define DEFAULT_START_TIME "now" #define DEFAULT_START_TIME "now"
#define DEFAULT_DRM_URL "http://wstfcps005.shibboleth.tv/widevine/cypherpc/cgi-bin/GetEMMs.cgi" #define DEFAULT_DRM_URL "https://license.uat.widevine.com/getlicense/widevine"
#define DEFAULT_DRM_ACK_URL "http://wstfcps005.shibboleth.tv/widevine/cypherpc/cgi-bin/Ack.cgi"
#define SHOW_BITRATE 1 #define SHOW_BITRATE 1