Source release 19.5.0

cdm/include/cdm.h

@@ -12,6 +12,8 @@
 #include <string>
 #include <vector>
 
+#include "cdm_version.h"
+
 // Uncomment this line when making static CDM builds.  This will be edited by
 // release scripts.
 //#define CDM_STATIC 1
@@ -35,7 +37,7 @@
 #  endif  // defined(_WIN32)
 #endif  // defined(CDM_STATIC)
 
-namespace widevine {
+namespace CDM_NAMESPACE {
 
 class CDM_EXPORT ITimerClient {
  public:
@@ -954,6 +956,6 @@ class CDM_EXPORT Cdm : public ITimerClient {
   Cdm() {}
 };
 
-}  // namespace widevine
+}  // namespace CDM_NAMESPACE
 
 #endif  // WVCDM_CDM_CDM_H_

cdm/include/cdm_version.h

@@ -10,7 +10,7 @@
 #  define CDM_VERSION_MAJOR 19
 #endif
 #ifndef CDM_VERSION_MINOR
-#  define CDM_VERSION_MINOR 4
+#  define CDM_VERSION_MINOR 5
 #endif
 #ifndef CDM_VERSION_PATCH
 #  define CDM_VERSION_PATCH 0
@@ -22,4 +22,8 @@
   CDM_VERSION_STR(CDM_VERSION_MAJOR, CDM_VERSION_MINOR, CDM_VERSION_PATCH, \
                   CDM_VERSION_TAG)
 
+#ifndef CDM_NAMESPACE
+#  define CDM_NAMESPACE widevine
+#endif  // defined(CDM_NAMESPACE)
+
 #define EME_VERSION "https://www.w3.org/TR/2017/REC-encrypted-media-20170918"

cdm/include/logger_global.h

@@ -7,7 +7,7 @@
 
 #include "cdm.h"
 
-namespace widevine {
+namespace CDM_NAMESPACE {
 extern Cdm::ILogger* g_logger;
 }
 

cdm/include/properties_ce.h

@@ -10,7 +10,7 @@
 #  include <gtest/gtest.h>
 #endif
 
-namespace widevine {
+namespace CDM_NAMESPACE {
 
 class PropertiesCE {
  public:
@@ -30,6 +30,6 @@ class PropertiesCE {
 #endif
 };
 
-}  // namespace widevine
+}  // namespace CDM_NAMESPACE
 
 #endif  // WVCDM_CDM_PROPERTIES_CE_H_

cdm/include/read_client_info.h

@@ -6,7 +6,9 @@
 
 #include <string>
 
-namespace widevine {
+#include "cdm_version.h"
+
+namespace CDM_NAMESPACE {
 
 // 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
@@ -27,6 +29,6 @@ bool ReadClientInformation(std::string* company_name, std::string* model_name,
                            std::string* platform, std::string* form_factor,
                            std::string* version);
 
-}  // namespace widevine
+}  // namespace CDM_NAMESPACE
 
 #endif  // WVCDM_CDM_READ_CLIENT_INFO_H_

cdm/include/stderr_logger.h

@@ -13,7 +13,7 @@
 
 #include "cdm.h"
 
-namespace widevine {
+namespace CDM_NAMESPACE {
 class StderrLogger : public Cdm::ILogger {
  public:
   StderrLogger() {}
@@ -23,6 +23,6 @@ class StderrLogger : public Cdm::ILogger {
     std::cerr << message << std::endl << std::flush;
   }
 };
-}  // namespace widevine
+}  // namespace CDM_NAMESPACE
 
 #endif  // WVCDM_CDM_STDERR_LOGGER_H_