Source release v2.1.3-2-789 + third_party libs

Change-Id: I8648756dab3fe1f53d6da18b83cd1294581d1abe

core/test/cdm_engine_test.cpp

@@ -34,7 +34,6 @@ wvcdm::KeyId g_key_id_unwrapped;
 wvcdm::CdmKeySystem g_key_system;
 std::string g_license_server;
 wvcdm::KeyId g_wrong_key_id;
-int g_use_full_path = 0;  // cannot use boolean in getopt_long
 
 // This is an RSA certificate message from the provisioning server.
 // The client sends this certificate to a license server for device
@@ -257,17 +256,14 @@ int main(int argc, char **argv) {
 
   int show_usage = 0;
   static const struct option long_options[] = {
-    { "use_full_path", no_argument, &g_use_full_path, 0 },
     { "keyid", required_argument, NULL, 'k' },
     { "server", required_argument, NULL, 's' },
-    { "vmodule", required_argument, NULL, 0 },
-    { "v", required_argument, NULL, 0 },
     { NULL, 0, NULL, '\0' }
   };
 
   int option_index = 0;
   int opt = 0;
-  while ((opt = getopt_long(argc, argv, "k:p:s:u", long_options, &option_index)) != -1) {
+  while ((opt = getopt_long(argc, argv, "k:s:v", long_options, &option_index)) != -1) {
     switch (opt) {
       case 'k': {
         g_key_id_pssh.clear();
@@ -279,8 +275,15 @@ int main(int argc, char **argv) {
         g_license_server.assign(optarg);
         break;
       }
-      case 'u': {
-        g_use_full_path = 1;
+      case 'v': {
+        // This option _may_ have already been consumed by wvcdm::InitLogging()
+        // above, depending on the platform-specific logging implementation.
+        // We only tell getopt about it so that it is not an error.  We ignore
+        // the option here when seen.
+        // TODO: Stop passing argv to InitLogging, and instead set the log
+        // level here through the logging API.  We should keep all command-line
+        // parsing at the application level, rather than split between various
+        // apps and various platform-specific logging implementations.
         break;
       }
       case '?': {
@@ -305,10 +308,6 @@ int main(int argc, char **argv) {
     std::cout << "configure the key id or pssh, in hex format" << std::endl;
     std::cout << std::setw(30) << std::left << "      default keyid:";
     std::cout << g_key_id_pssh << std::endl;
-
-    std::cout << std::setw(30) << std::left << "    --use_full_path";
-    std::cout << "specify server url is not a proxy server" << std::endl;
-    std::cout << std::endl;
     return 0;
   }
 

core/test/config_test_env.cpp

@@ -5,36 +5,33 @@
 namespace {
 const std::string kWidevineKeySystem = "com.widevine.alpha";
 
-// Youtube Content Protection license server data
-const std::string kYtCpLicenseServer =
+// Content Protection license server data
+const std::string kCpLicenseServer =
     "http://wv-ref-eme-player.appspot.com/proxy";
-const std::string kYtCpClientAuth = "";
-const std::string kYtCpKeyId =
-    "000000427073736800000000"                  // blob size and pssh
-    "EDEF8BA979D64ACEA3C827DCD51D21ED00000022"  // Widevine system id
-    "08011a0d7769646576696e655f7465737422"      // pssh data (streaming)
-    "0f73747265616d696e675f636c697031";
-
-const std::string kYtCpOfflineKeyId =
-    "000000407073736800000000"                  // blob size and pssh
-    "EDEF8BA979D64ACEA3C827DCD51D21ED00000020"  // Widevine system id
-    "08011a0d7769646576696e655f7465737422"      //pssh data (offline)
-    "0d6f66666c696e655f636c697031";
-
-// Youtube license server data
-const std::string kYtLicenseServer =
-    "https://www.youtube.com/api/drm/"
-    "widevine?video_id=03681262dc412c06&source=YOUTUBE";
-const std::string kYtClientAuth = "";
-const std::string kYtKeyId =
-    "000000347073736800000000"                   // blob size and pssh
-    "EDEF8BA979D64ACEA3C827DCD51D21ED00000014"   // Widevine system id
-    "0801121093789920E8D6520098577DF8F2DD5546";  // pssh data
+const std::string kCpClientAuth = "";
+const std::string kCpKeyId =
+    "00000042"  // blob size
+    "70737368"  // "pssh"
+    "00000000"  // flags
+    "edef8ba979d64acea3c827dcd51d21ed"   // Widevine system id
+    "00000022"  // pssh data size
+    // pssh data:
+    "08011a0d7769646576696e655f746573"
+    "74220f73747265616d696e675f636c69"
+    "7031";
+const std::string kCpOfflineKeyId =
+    "00000040"  // blob size
+    "70737368"  // "pssh"
+    "00000000"  // flags
+    "edef8ba979d64acea3c827dcd51d21ed"   // Widevine system id
+    "00000020"  // pssh data size
+    // pssh data:
+    "08011a0d7769646576696e655f746573"
+    "74220d6f66666c696e655f636c697031";
 
 // Google Play license server data
 const std::string kGpLicenseServer =
     "https://jmt17.google.com/video/license/GetCencLicense";
-
 // Test client authorization string.
 // NOTE: Append a userdata attribute to place a unique marker that the
 // server team can use to track down specific requests during debugging
@@ -42,6 +39,16 @@ const std::string kGpLicenseServer =
 //       "<existing-client-auth-string>&userdata=jbmr2.dev"
 const std::string kGpClientAuth =
     "?source=YOUTUBE&video_id=EGHC6OHNbOo&oauth=ya.gtsqawidevine";
+const std::string kGpKeyId =
+    "00000034"  // blob size
+    "70737368"  // "pssh"
+    "00000000"  // flags
+    "edef8ba979d64acea3c827dcd51d21ed"  // Widevine system id
+    "00000014"  // pssh data size
+    // pssh data:
+    "08011210e02562e04cd55351b14b3d74"
+    "8d36ed8e";
+const std::string kGpOfflineKeyId = kGpKeyId;
 
 const std::string kGpClientOfflineQueryParameters =
     "&offline=true";
@@ -50,16 +57,16 @@ const std::string kGpClientOfflineRenewalQueryParameters =
 const std::string kGpClientOfflineReleaseQueryParameters =
     "&offline=true&release=true";
 
-const std::string kGpKeyId =
-    "000000347073736800000000"                   // blob size and pssh
-    "edef8ba979d64acea3c827dcd51d21ed00000014"   // Widevine system id
-    "08011210e02562e04cd55351b14b3d748d36ed8e";  // pssh data
-
 // An invalid key id, expected to fail
 const std::string kWrongKeyId =
-    "000000347073736800000000"                   // blob size and pssh
-    "EDEF8BA979D64ACEA3C827DCD51D21ED00000014"   // Widevine system id
-    "0901121094889920E8D6520098577DF8F2DD5546";  // pssh data
+    "00000034"  // blob size
+    "70737368"  // "pssh"
+    "00000000"  // flags
+    "edef8ba979d64acea3c827dcd51d21ed"  // Widevine system id
+    "00000014"  // pssh data size
+    // pssh data:
+    "0901121094889920e8d6520098577df8"
+    "f2dd5546";
 
 // URL of provisioning server (returned by GetProvisioningRequest())
 const std::string kProductionProvisioningServerUrl =
@@ -67,22 +74,13 @@ const std::string kProductionProvisioningServerUrl =
     "certificateprovisioning/v1/devicecertificates/create"
     "?key=AIzaSyB-5OLKTx2iU5mko18DfdwK5611JIjbUhE";
 
-// Return production-rooted certificates that have test bit set,
-// request_license_test uses this url.
-const std::string kProductionTestProvisioningServerUrl =
-    "https://www.googleapis.com/"
-    "certificateprovisioning/v1exttest/devicecertificates/create"
-    "?key=AIzaSyB-5OLKTx2iU5mko18DfdwK5611JIjbUhE";
-
-const std::string kServerSdkLicenseServer =
-    "http://kir03fcpg174.widevine.net/widevine/cgi-bin/drm.cgi";
-
 const wvcdm::ConfigTestEnv::LicenseServerConfiguration license_servers[] = {
-  { wvcdm::kGooglePlayServer, kGpLicenseServer, kGpClientAuth, kGpKeyId,
-    kGpKeyId },
-  { wvcdm::kYouTubeContentProtectionServer, kYtCpLicenseServer,
-    kYtCpClientAuth, kYtCpKeyId, kYtCpOfflineKeyId }
+  { wvcdm::kGooglePlayServer, kGpLicenseServer,
+    kGpClientAuth, kGpKeyId, kGpOfflineKeyId },
+  { wvcdm::kContentProtectionServer, kCpLicenseServer,
+    kCpClientAuth, kCpKeyId, kCpOfflineKeyId },
 };
+
 }  // namespace
 
 namespace wvcdm {

core/test/config_test_env.h

@@ -9,7 +9,7 @@
 namespace wvcdm {
 typedef enum {
   kGooglePlayServer,
-  kYouTubeContentProtectionServer
+  kContentProtectionServer,
 } LicenseServerId;
 
 // Configures default test environment.