From fa7e3b620abde1dcfed20c6f44e00f73705033d7 Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Wed, 10 Aug 2011 11:48:10 -0700 Subject: [PATCH] Fixed 4271507: updated asset url, portal name and EMM url. Change-Id: Iaef5a4644d2f64e4e8169ddbe64262a451402a65 --- proprietary/drmwvmplugin/test/TestPlugin.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/proprietary/drmwvmplugin/test/TestPlugin.cpp b/proprietary/drmwvmplugin/test/TestPlugin.cpp index 3135eb4e..24839c23 100644 --- a/proprietary/drmwvmplugin/test/TestPlugin.cpp +++ b/proprietary/drmwvmplugin/test/TestPlugin.cpp @@ -88,19 +88,19 @@ void WVMDrmPluginTest::Run() String8 url; // Remote asset - url = String8("http://seawwws001.cdn.shibboleth.tv/videos/qa/adventures_d_ch_444169.wvm"); + 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/qa/adventures_d_ch_444169.wvm"); + url = String8("widevine://seawwws001.cdn.shibboleth.tv/videos/content/bbb_ffmpeg_hc_single_480p.wvm"); TestAsset(plugin, url); // Local asset - url = String8("file:///sdcard/Widevine/trailers_d_ch_444169.wvm"); + url = String8("file:///sdcard/Widevine/inception_base_360p_single.wvm"); TestAsset(plugin, url); // Remote asset with query parameters - url = String8("http://seawwws001.cdn.shibboleth.tv/videos/qa/adventures_d_ch_444169.wvm?a=b"); + 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 @@ -120,7 +120,7 @@ void WVMDrmPluginTest::TestRegister(IDrmEngine *plugin) String8 mimeType("video/wvm"); DrmInfoRequest registrationInfo(DrmInfoRequest::TYPE_REGISTRATION_INFO, mimeType); - registrationInfo.put(String8("WVPortalKey"), String8("YouTube")); + registrationInfo.put(String8("WVPortalKey"), String8("OEM")); DrmInfo *info = plugin->acquireDrmInfo(0, ®istrationInfo); if (info == NULL) { @@ -136,10 +136,11 @@ void WVMDrmPluginTest::TestAcquireRights(IDrmEngine *plugin, String8 &url, int p String8 mimeType("video/wvm"); DrmInfoRequest rightsAcquisitionInfo(DrmInfoRequest::TYPE_RIGHTS_ACQUISITION_INFO, mimeType); - rightsAcquisitionInfo.put(String8("WVDRMServerKey"), String8("http://wstfcps005.shibboleth.tv/widevine/cypherpc/cgi-bin/GetEMMs.cgi")); + rightsAcquisitionInfo.put(String8("WVDRMServerKey"), String8( + "https://staging.shibboleth.tv/widevine/cypherpc/cgi-bin/GetEMMs.cgi")); rightsAcquisitionInfo.put(String8("WVAssetURIKey"), url); rightsAcquisitionInfo.put(String8("WVDeviceIDKey"), String8("device1234")); - rightsAcquisitionInfo.put(String8("WVPortalKey"), String8("YouTube")); + rightsAcquisitionInfo.put(String8("WVPortalKey"), String8("OEM")); if (playbackMode) { char num[4]; sprintf(num, "%d", playbackMode);