chore: Cleanup after HLS key rotation PR (#4664)

See PR #4568, which was merged without feedback addressed.
shaka-project · Nov 8, 2022 · 5bde080 · 5bde080
1 parent 3846eea
commit 5bde080
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/lib/hls/hls_parser.js b/lib/hls/hls_parser.js
@@ -381,9 +381,7 @@ shaka.hls.HlsParser = class {
     if (!keysAreEqual(stream.keyIds, keyIds)) {
       stream.keyIds = keyIds;
       stream.drmInfos = drmInfos;
-      if (this.manifest_) {
-        this.playerInterface_.filter(this.manifest_);
-      }
+      this.playerInterface_.newDrmInfo(stream);
     }
 
     const segments = this.createSegments_(
@@ -1985,6 +1983,12 @@ shaka.hls.HlsParser = class {
   /**
    * @param {!shaka.hls.Playlist} playlist
    * @param {string} mimeType
+   * @return {{
+   *   drmInfos: !Array.<shaka.extern.DrmInfo>,
+   *   keyIds: !Set.<string>,
+   *   encrypted: boolean,
+   *   aesEncrypted: boolean
+   * }}
    * @private
    */
   parseDrmInfo_(playlist, mimeType) {
@@ -2005,7 +2009,6 @@ shaka.hls.HlsParser = class {
     const drmInfos = [];
     const keyIds = new Set();
 
-    // TODO: May still need changes to support key rotation.
     for (const drmTag of drmTags) {
       const method = drmTag.getRequiredAttrValue('METHOD');
       if (method != 'NONE') {