allow for HLS playlists

videojs · Dec 11, 2023 · 2904088 · 2904088
1 parent 1a85807
commit 2904088
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 27 deletions.
diff --git a/src/dash-playlist-loader.js b/src/dash-playlist-loader.js
@@ -22,7 +22,6 @@ import containerRequest from './util/container-request.js';
 import {toUint8} from '@videojs/vhs-utils/es/byte-helpers';
 import logger from './util/logger';
 import {merge} from './util/vjs-compat';
-import { arrayBufferToHexString } from './util/string.js';
 
 const { EventTarget } = videojs;
 
@@ -314,7 +313,6 @@ export default class DashPlaylistLoader extends EventTarget {
     this.vhs_ = vhs;
     this.withCredentials = withCredentials;
     this.addMetadataToTextTrack = options.addMetadataToTextTrack;
-    this.keyStatusMap_ = new Map();
 
     if (!srcUrlOrPlaylist) {
       throw new Error('A non-empty playlist URL or object is required');
@@ -474,7 +472,6 @@ export default class DashPlaylistLoader extends EventTarget {
     }
 
     this.off();
-    this.keyStatusMap_.clear();
   }
 
   hasPendingRequest() {
@@ -928,29 +925,18 @@ export default class DashPlaylistLoader extends EventTarget {
     }
   }
 
-  excludeNonUsablePlaylists() {
-    this.mainPlaylistLoader_.main.playlists.forEach((playlist) => {
-      if (!playlist.contentProtection.mp4protection ||
-        !playlist.contentProtection.mp4protection.attributes['cenc:default_KID']) {
-        return;
-      }
-      const playlistKID = playlist.contentProtection.mp4protection.attributes['cenc:default_KID'].replace(/-/g, '');
-      const hasUsableKeystatus = this.keyStatusMap_.has(playlistKID) && this.keyStatusMap_.get(playlistKID) === 'usable';
-
-      if (!hasUsableKeystatus) {
-        playlist.excludeUntil = Infinity;
-        playlist.lastExcludeReason_ = 'non-usable';
-      } else {
-        delete playlist.excludeUntil;
-        delete playlist.lastExcludeReason_;
-      }
-    });
-  }
-
-  addKeyStatus(keyId, status) {
-    // 32 digit keyId hex string.
-    const keyIdHexString = arrayBufferToHexString(keyId).slice(0, 32);
-
-    this.keyStatusMap_.set(keyIdHexString, status);
+  /**
+   * Returns the default_KID from a DASH playlist.
+   *
+   * @param {playlist} playlist to fetch the default_KID from.
+   * @return a 32 digit hex string that represents the keyId of the encrypted playlist.
+   */
+  getKID(playlist) {
+    if (playlist.contentProtection &&
+      playlist.contentProtection.mp4protection &&
+      playlist.contentProtection.mp4protection.attributes['cenc:default_KID']) {
+      // default KID is a 32 digit hext string separated by '-'.
+      return playlist.contentProtection.mp4protection.attributes['cenc:default_KID'].replace(/-/g, '');
+    }
   }
 }
diff --git a/src/playlist-controller.js b/src/playlist-controller.js
@@ -28,6 +28,7 @@ import logger from './util/logger';
 import {merge, createTimeRanges} from './util/vjs-compat';
 import { addMetadata, createMetadataTrackIfNotExists, addDateRangeMetadata } from './util/text-tracks';
 import ContentSteeringController from './content-steering-controller';
+import { arrayBufferToHexString } from './util/string.js';
 
 const ABORT_EARLY_EXCLUSION_SECONDS = 10;
 
@@ -235,6 +236,7 @@ export class PlaylistController extends videojs.EventTarget {
     this.sourceUpdater_ = new SourceUpdater(this.mediaSource);
     this.inbandTextTracks_ = {};
     this.timelineChangeController_ = new TimelineChangeController();
+    this.keyStatusMap_ = new Map();
 
     const segmentLoaderSettings = {
       vhs: this.vhs_,
@@ -1708,6 +1710,7 @@ export class PlaylistController extends videojs.EventTarget {
     this.mainPlaylistLoader_.dispose();
     this.mainSegmentLoader_.dispose();
     this.contentSteeringController_.dispose();
+    this.keyStatusMap_.clear();
 
     if (this.loadOnPlay_) {
       this.tech_.off('play', this.loadOnPlay_);
@@ -2380,4 +2383,31 @@ export class PlaylistController extends videojs.EventTarget {
 
     this.switchMedia_(nextPlaylist, 'content-steering');
   }
+
+  excludeNonUsablePlaylistsByKID() {
+    this.mainPlaylistLoader_.main.playlists.forEach((playlist) => {
+      const keyId = this.mainPlaylistLoader_.getKID(playlist);
+      // If the playlist doesn't have a keyID lets not exclude it.
+
+      if (!keyId) {
+        return;
+      }
+      const hasUsableKeystatus = this.keyStatusMap_.has(keyId) && this.keyStatusMap_.get(keyId) === 'usable';
+
+      if (!hasUsableKeystatus) {
+        playlist.excludeUntil = Infinity;
+        playlist.lastExcludeReason_ = 'non-usable';
+      } else {
+        delete playlist.excludeUntil;
+        delete playlist.lastExcludeReason_;
+      }
+    });
+  }
+
+  addKeyStatus(keyId, status) {
+    // 32 digit keyId hex string.
+    const keyIdHexString = arrayBufferToHexString(keyId).slice(0, 32);
+
+    this.keyStatusMap_.set(keyIdHexString, status);
+  }
 }
diff --git a/src/playlist-loader.js b/src/playlist-loader.js
@@ -1194,4 +1194,20 @@ export default class PlaylistLoader extends EventTarget {
 
     return attributes;
   }
+
+  /**
+   * Returns the key ID from a playlist.
+   *
+   * @param {playlist} playlist to fetch the key ID from.
+   * @return a 32 digit hex string that represents the keyId of the encrypted playlist.
+   */
+  getKID(playlist) {
+    // Currently we only parse the keyId for widevine in HLS so only look there.
+    if (playlist.contentProtection &&
+      playlist.contentProtection['com.widevine.alpha'] &&
+      playlist.contentProtection['com.widevine.alpha'].attributes.keyId) {
+      // default KID is a 32 digit hext string often separated by '-'.
+      return playlist.contentProtection['com.widevine.alpha'].attributes.keyId.replace(/-/g, '');
+    }
+  }
 }