Merge branch 'master-doris' into patch/v1.6.11-doris

Author: hongfeih-es

api-extractor/report/hls.js.api.md

@@ -1511,6 +1511,8 @@ export enum Events {
     // (undocumented)
     KEY_LOADING = "hlsKeyLoading",
     // (undocumented)
+    KEY_STATUSES_CHANGED = "hlsKeyStatusesChanged",
+    // (undocumented)
     LEVEL_LOADED = "hlsLevelLoaded",
     // (undocumented)
     LEVEL_LOADING = "hlsLevelLoading",
@@ -2411,6 +2413,8 @@ export interface HlsListeners {
     // (undocumented)
     [Events.KEY_LOADING]: (event: Events.KEY_LOADING, data: KeyLoadingData) => void;
     // (undocumented)
+    [Events.KEY_STATUSES_CHANGED]: (event: Events.KEY_STATUSES_CHANGED, data: KeyStatusesChangedData) => void;
+    // (undocumented)
     [Events.LEVEL_LOADED]: (event: Events.LEVEL_LOADED, data: LevelLoadedData) => void;
     // (undocumented)
     [Events.LEVEL_LOADING]: (event: Events.LEVEL_LOADING, data: LevelLoadingData) => void;
@@ -3046,6 +3050,16 @@ export interface KeyLoadingData {
     frag: Fragment;
 }
 
+// Warning: (ae-missing-release-tag) "KeyStatusesChangedData" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface KeyStatusesChangedData {
+    // (undocumented)
+    keyStatuses: MediaKeyStatusMap;
+    // (undocumented)
+    keySystem: string;
+}
+
 // Warning: (ae-missing-release-tag) "KeySystemFormats" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)

package-lock.json

@@ -1,5 +1,6 @@
 {
   "name": "hls.js",
+  "version": "1.6.8",
   "license": "Apache-2.0",
   "description": "JavaScript HLS client using MediaSourceExtension",
   "homepage": "https://github.com/video-dev/hls.js",

package.json

@@ -803,6 +803,11 @@ class EMEController extends Logger implements ComponentAPI {
           this.renewKeySession(context);
         }
       }
+
+      this.hls.trigger(Events.KEY_STATUSES_CHANGED, {
+        keySystem: context.decryptdata.keyFormat,
+        keyStatuses: keySession.keyStatuses,
+      });
     });
 
     addEventListener(context.mediaKeysSession, 'message', onmessage);

src/controller/eme-controller.ts

@@ -40,6 +40,7 @@ import type {
   InterstitialsUpdatedData,
   KeyLoadedData,
   KeyLoadingData,
+  KeyStatusesChangedData,
   LevelLoadedData,
   LevelLoadingData,
   LevelPTSUpdatedData,
@@ -220,6 +221,8 @@ export enum Events {
   PLAYOUT_LIMIT_REACHED = 'hlsPlayoutLimitReached',
   // Event DateRange cue "enter" event dispatched
   EVENT_CUE_ENTER = 'hlsEventCueEnter',
+  // HD DRM
+  KEY_STATUSES_CHANGED = 'hlsKeyStatusesChanged',
 }
 
 /**
@@ -496,6 +499,10 @@ export interface HlsListeners {
     data: {},
   ) => void;
   [Events.EVENT_CUE_ENTER]: (event: Events.EVENT_CUE_ENTER, data: {}) => void;
+  [Events.KEY_STATUSES_CHANGED]: (
+    event: Events.KEY_STATUSES_CHANGED,
+    data: KeyStatusesChangedData,
+  ) => void;
 }
 export interface HlsEventEmitter {
   on<E extends keyof HlsListeners, Context = undefined>(

src/events.ts

@@ -1417,6 +1417,7 @@ export type {
   BufferFlushingData,
   CuesParsedData,
   ErrorData,
+  KeyStatusesChangedData,
   FPSDropData,
   FPSDropLevelCappingData,
   FragBufferedData,

src/hls.ts

@@ -252,6 +252,11 @@ export interface LevelPTSUpdatedData {
   end: number;
 }
 
+export interface KeyStatusesChangedData {
+  keySystem: string;
+  keyStatuses: MediaKeyStatusMap;
+}
+
 export interface AudioTrackSwitchingData extends MediaPlaylist {}
 
 export interface AudioTrackSwitchedData extends MediaPlaylist {}

src/types/events.ts

@@ -13,6 +13,25 @@ export function sendAddTrackEvent(track: TextTrack, videoEl: HTMLMediaElement) {
   videoEl.dispatchEvent(event);
 }
 
+function containsCue(track: TextTrack, cue: VTTCue) {
+  if (!track.cues) {
+    return false;
+  }
+
+  for (let i = 0; i < track.cues.length; i++) {
+    const cueInTextTrack = track.cues[i] as VTTCue;
+    if (
+      cueInTextTrack.startTime === cue.startTime &&
+      cueInTextTrack.endTime === cue.endTime &&
+      cueInTextTrack.text === cue.text
+    ) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 export function addCueToTrack(track: TextTrack, cue: VTTCue) {
   // Sometimes there are cue overlaps on segmented vtts so the same
   // cue can appear more than once in different vtt files.
@@ -21,7 +40,8 @@ export function addCueToTrack(track: TextTrack, cue: VTTCue) {
   if (mode === 'disabled') {
     track.mode = 'hidden';
   }
-  if (track.cues && !track.cues.getCueById(cue.id)) {
+
+  if (track.cues && !containsCue(track, cue)) {
     try {
       track.addCue(cue);
       if (!track.cues.getCueById(cue.id)) {