Source release 14.0.0

core/include/initialization_data.h

@@ -15,7 +15,8 @@ class WvCdmEngineTest;
 class InitializationData {
  public:
   InitializationData(const std::string& type = std::string(),
-                     const CdmInitData& data = CdmInitData());
+                     const CdmInitData& data = CdmInitData(),
+                     const std::string& oec_version = std::string());
 
   bool is_supported() const { return is_cenc_ || is_webm_ || is_hls_; }
   bool is_cenc() const { return is_cenc_; }
@@ -28,13 +29,22 @@ class InitializationData {
   const CdmInitData& data() const { return data_; }
   std::vector<uint8_t> hls_iv() const { return hls_iv_; }
   CdmHlsMethod hls_method() const { return hls_method_; }
-  std::vector<video_widevine::SubLicense> ExtractEmbeddedKeys() const;
-  const std::string ExtractGroupMasterKeyId() const;
+  // TODO(jfore): Perhaps this should be a generic structure with the ids for
+  // any type of licensing?
+  std::vector<video_widevine::SubLicense> ExtractSublicenseKeys() const;
+  std::vector<video_widevine::WidevinePsshData_EntitledKey> ExtractWrappedKeys()
+      const;
 
  private:
-  // Parse a blob of multiple concatenated PSSH atoms to extract the first
-  // Widevine PSSH.
-  bool ExtractWidevinePssh(const CdmInitData& init_data, CdmInitData* output);
+  bool SelectWidevinePssh(const CdmInitData& init_data,
+                          bool prefer_entitlements,
+                          CdmInitData* output);
+  // Helpers used by SelectWidevinePssh().
+  bool ExtractWidevinePsshs(const CdmInitData& init_data,
+                            std::vector<CdmInitData>* psshs);
+  bool ExtractWidevinePsshData(const uint8_t* data,
+                               size_t length,
+                               CdmInitData* output);
 
   bool ExtractHlsAttributes(const std::string& attribute_list,
                             CdmHlsMethod* method, std::vector<uint8_t>* iv,
@@ -54,6 +64,9 @@ class InitializationData {
   static std::vector<std::string> ExtractKeyFormatVersions(
       const std::string& key_format_versions);
 
+  static bool DetectEntitlementPreference(
+      const std::string& oec_version_string);
+
 // For testing only:
 #if defined(UNIT_TEST)
   FRIEND_TEST(HlsAttributeExtractionTest, ExtractAttribute);