Merge "Handle key rotation" into qt-dev am: 862cb96e77

am: 5b8fc4a05b Change-Id: I0bbf6b0e12cde87c768d1b6408b7ef05801d7a3d
2019-05-03 23:00:50 -07:00
parent cee0887d20 5b8fc4a05b
commit 4bd6f2bed0
5 changed files with 183 additions and 2 deletions
--- a/libwvdrmengine/cdm/core/include/initialization_data.h
+++ b/libwvdrmengine/cdm/core/include/initialization_data.h
@@ -34,6 +34,7 @@ class InitializationData {
  CdmHlsMethod hls_method() const { return hls_method_; }
  std::vector<video_widevine::WidevinePsshData_EntitledKey> ExtractWrappedKeys()
      const;
+  bool contains_entitled_keys() const { return contains_entitled_keys_; }

 private:
  bool SelectWidevinePssh(const CdmInitData& init_data,
@@ -86,6 +87,7 @@ class InitializationData {
  bool is_hls_;
  bool is_webm_;
  bool is_audio_;
+  bool contains_entitled_keys_;

  std::vector<uint8_t> hls_iv_;
  CdmHlsMethod hls_method_;