Source release 17.1.1

cdm/include/cdm.h

@@ -12,20 +12,28 @@
 #include <string>
 #include <vector>
 
+// Uncomment this line when making static CDM builds.  This will be edited by
+// release scripts.
+//#define CDM_STATIC 1
+
 // Define CDM_EXPORT to export functionality across shared library boundaries.
-#if defined(_WIN32)
-#  if defined(CDM_IMPLEMENTATION)
-#    define CDM_EXPORT __declspec(dllexport)
-#  else
-#    define CDM_EXPORT __declspec(dllimport)
-#  endif  // defined(CDM_IMPLEMENTATION)
-#else     // defined(_WIN32)
-#  if defined(CDM_IMPLEMENTATION)
-#    define CDM_EXPORT __attribute__((visibility("default")))
-#  else
-#    define CDM_EXPORT
-#  endif
-#endif  // defined(_WIN32)
+#if defined(CDM_STATIC)
+#  define CDM_EXPORT
+#else
+#  if defined(_WIN32)
+#    if defined(CDM_IMPLEMENTATION)
+#      define CDM_EXPORT __declspec(dllexport)
+#    else
+#      define CDM_EXPORT __declspec(dllimport)
+#    endif  // defined(CDM_IMPLEMENTATION)
+#  else     // defined(_WIN32)
+#    if defined(CDM_IMPLEMENTATION)
+#      define CDM_EXPORT __attribute__((visibility("default")))
+#    else
+#      define CDM_EXPORT
+#    endif
+#  endif  // defined(_WIN32)
+#endif  // defined(CDM_STATIC)
 
 namespace widevine {
 

cdm/include/cdm_version.h

@@ -13,7 +13,7 @@
 #  define CDM_VERSION_MINOR 1
 #endif
 #ifndef CDM_VERSION_PATCH
-#  define CDM_VERSION_PATCH 0
+#  define CDM_VERSION_PATCH 1
 #endif
 #ifndef CDM_VERSION_TAG
 #  define CDM_VERSION_TAG ""

cdm/include/compiler_detection.h

@@ -5,7 +5,7 @@
 #define WVCDM_CDM_COMPILER_DETECTION_H_
 
 // This file makes some best-effort attempts to detect details about the
-// compilation environment used by CacheBuildInfo.
+// compilation environment used by SetClientInfo.
 
 #if defined(CDM_DISABLE_LOGGING)
 #  define LOGGING_MESSAGE "Logging Disabled"

cdm/include/properties_ce.h

@@ -19,6 +19,7 @@ class PropertiesCE {
   // If this is set to an empty string, (which is the default) then PropertiesCE
   // will report that there is no Sandbox ID in use.
   static void SetSandboxId(const std::string& sandbox_id);
+  static bool ClientInfoIsValid();
 
  private:
   static void SetSecureOutputType(Cdm::SecureOutputType secure_output_type);

cdm/include/read_client_info.h

@@ -0,0 +1,32 @@
+// Copyright 2022 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine License
+// Agreement.
+#ifndef WVCDM_CDM_READ_CLIENT_INFO_H_
+#define WVCDM_CDM_READ_CLIENT_INFO_H_
+
+#include <string>
+
+namespace widevine {
+
+// This function must be implemented by partners who wish to use run-time client
+// information. (i.e. Those that set 'client_info_source' to 'runtime' in their
+// platform's properties.) These partners must set 'read_client_info_path' to
+// a GYP target that contains an implementation of this function. This function
+// will be called by the CE CDM during Cdm::initialize() to retrieve the client
+// information at runtime.
+//
+// This function should fill in each of the strings with the relevant piece of
+// client information and return true. If for any reason the platform cannot
+// fill in all the strings or an error occurs, the function should return false.
+//
+// For a definition of each string's meaning, see the client info property
+// documentation in platform_properties.gypi.
+bool ReadClientInformation(std::string* company_name, std::string* model_name,
+                           std::string* model_year, std::string* product_name,
+                           std::string* device_name, std::string* arch_name,
+                           std::string* platform, std::string* form_factor,
+                           std::string* version);
+
+}  // namespace widevine
+
+#endif  // WVCDM_CDM_READ_CLIENT_INFO_H_