Source release 17.1.0

oemcrypto/include/pst_report.h

@@ -1,5 +1,5 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
+// source code may only be used and distributed under the Widevine
 // License Agreement.
 
 /*********************************************************************
@@ -18,7 +18,7 @@
 #include "OEMCryptoCENC.h"
 #include "string_conversions.h"  // needed for htonll64.
 
-namespace wvcdm {
+namespace wvutil {
 
 class Unpacked_PST_Report {
  public:
@@ -84,12 +84,12 @@ class Unpacked_PST_Report {
     int64_t time;
     memcpy(&time, buffer_ +  kseconds_since_license_received_offset,
            sizeof(int64_t));
-    return ntohll64(time);
+    return wvutil::ntohll64(time);
   }
 
   // Parameter time is in host byte order.
   void set_seconds_since_license_received(int64_t time) const {
-    time = ntohll64(time);
+    time = wvutil::ntohll64(time);
     memcpy(buffer_ +  kseconds_since_license_received_offset, &time,
            sizeof(int64_t));
   }
@@ -143,6 +143,6 @@ class Unpacked_PST_Report {
   static const size_t kseconds_since_last_decrypt_offset = 40;
   static const size_t kpst_offset = 48;
 };
-}  // namespace wvcdm
+}  // namespace wvutil
 
 #endif  // PST_REPORT_H_