@gcorevideo/player 2.28.27 → 2.28.29

package/lib/playback/BasePlayback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BasePlayback.d.ts","sourceRoot":"","sources":["../../src/playback/BasePlayback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAU,UAAU,EAAe,MAAM,cAAc,CAAA;AAI5E;;;GAGG;AACH,qBAAa,YAAa,SAAQ,UAAU;IAC1C,IAAI,YAAY,YAEf;IAED,WAAW,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IA0BlD;;;OAGG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM;IAInB,UAAU;CAIpB"}
+{"version":3,"file":"BasePlayback.d.ts","sourceRoot":"","sources":["../../src/playback/BasePlayback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAU,UAAU,EAAe,MAAM,cAAc,CAAA;AAK5E;;;GAGG;AACH,qBAAa,YAAa,SAAQ,UAAU;IAC1C,IAAI,YAAY,YAEf;IAED,WAAW,CAAC,SAAS,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,YAAY;IA0BlD;;;OAGG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM;IAInB,UAAU;CAIpB"}

package/lib/playback/dash-playback/DashPlayback.d.ts

@@ -1,6 +1,6 @@
 import { Playback } from '@clappr/core';
-import DASHJS, { type BitrateInfo as DashBitrateInfo, IManifestInfo } from 'dashjs';
-import { QualityLevel, TimePosition, TimeValue } from '../../playback.types.js';
+import { MediaPlayerClass, IManifestInfo } from 'dashjs';
+import { QualityLevel, TimePosition, TimeValue, VTTCueInfo } from '../../playback.types.js';
 import { BasePlayback } from '../BasePlayback.js';
 import { AudioTrack } from '@clappr/core/types/base/playback/playback.js';
 type PlaybackType = typeof Playback.VOD | typeof Playback.LIVE | typeof Playback.AOD | typeof Playback.NO_OP;
@@ -10,8 +10,8 @@ type LocalTimeCorrelation = {
     remote: number;
 };
 export default class DashPlayback extends BasePlayback {
-    _levels: QualityLevel[] | null;
-    _currentLevel: number | null;
+    _levels: QualityLevel[];
+    _currentLevel: number;
     _durationExcludesAfterLiveSyncPoint: boolean;
     _isReadyState: boolean;
     _playableRegionDuration: number;
@@ -19,7 +19,7 @@ export default class DashPlayback extends BasePlayback {
     _playbackType: PlaybackType;
     _playlistType: PlaylistType | null;
     _programDateTime: TimeValue;
-    _dash: DASHJS.MediaPlayerClass | null;
+    _dash: MediaPlayerClass | null;
     _extrapolatedWindowDuration: number;
     _lastDuration: TimeValue | null;
     _lastTimeUpdate: TimePosition;
@@ -28,6 +28,10 @@ export default class DashPlayback extends BasePlayback {
     startChangeQuality: boolean;
     manifestInfo: IManifestInfo | null;
     _timeUpdateTimer: ReturnType<typeof setInterval> | null;
+    oncueenter: ((e: VTTCueInfo) => void) | null;
+    oncueexit: ((e: {
+        id: string;
+    }) => void) | null;
     get name(): string;
     get levels(): QualityLevel[];
     get currentLevel(): number;
@@ -66,7 +70,7 @@ export default class DashPlayback extends BasePlayback {
     private destroyInstance;
     destroy(): void;
     _updatePlaybackType(): void;
-    _fillLevels(levels: DashBitrateInfo[]): void;
+    private _fillLevels;
     private onLevelSwitch;
     private onLevelSwitchEnd;
     getPlaybackType(): string;
@@ -82,6 +86,21 @@ export default class DashPlayback extends BasePlayback {
      * @override
      */
     _handleTextTrackChange(): void;
+    setTextTrack(id: number): void;
+    /**
+     * @override
+     */
+    get closedCaptionsTracks(): {
+        id: number;
+        name: string;
+        track: {
+            id: number;
+            label: string;
+            language: string | null;
+            mode: string;
+        };
+    }[];
+    private getTextTracks;
 }
 export {};
 //# sourceMappingURL=DashPlayback.d.ts.map

package/lib/playback/dash-playback/DashPlayback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DashPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/dash-playback/DashPlayback.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DashPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/dash-playback/DashPlayback.ts"],"names":[],"mappings":"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"}

package/lib/playback/dash-playback/DashPlayback.js

@@ -5,7 +5,7 @@
 import { Events, Log, Playback, PlayerError, Utils, $ } from '@clappr/core';
 import { trace } from '@gcorevideo/utils';
 import assert from 'assert';
-import DASHJS from 'dashjs';
+import { MediaPlayer, } from 'dashjs';
 import { PlaybackErrorCode, } from '../../playback.types.js';
 import { isDashSource } from '../../utils/mediaSources.js';
 import { BasePlayback } from '../BasePlayback.js';
@@ -14,8 +14,8 @@ const AUTO = -1;
 const { now } = Utils;
 const T = 'playback.dash';
 export default class DashPlayback extends BasePlayback {
-    _levels = null;
-    _currentLevel = null;
+    _levels = [];
+    _currentLevel = AUTO;
     // true when the actual duration is longer than hlsjs's live sync point
     // when this is false playableRegionDuration will be the actual duration
     // when this is true playableRegionDuration will exclude the time after the sync point
@@ -49,17 +49,15 @@ export default class DashPlayback extends BasePlayback {
     startChangeQuality = false;
     manifestInfo = null;
     _timeUpdateTimer = null;
+    oncueenter = null;
+    oncueexit = null;
     get name() {
         return 'dash';
     }
     get levels() {
-        return this._levels || [];
+        return this._levels;
     }
     get currentLevel() {
-        if (this._currentLevel === null) {
-            return AUTO;
-        }
-        // 0 is a valid level ID
         return this._currentLevel;
     }
     get isReady() {
@@ -81,7 +79,7 @@ export default class DashPlayback extends BasePlayback {
         });
         dash.updateSettings(settings);
         if (id !== -1) {
-            this._dash.setQualityFor('video', id);
+            this._dash.setRepresentationForTypeByIndex('video', id);
         }
         if (this._playbackType === Playback.VOD) {
             const curr_time = this._dash.time();
@@ -95,6 +93,7 @@ export default class DashPlayback extends BasePlayback {
         }
     }
     get _startTime() {
+        // TODO review
         if (this._playbackType === Playback.LIVE &&
             this._playlistType !== 'EVENT') {
             return this._extrapolatedStartTime;
@@ -141,7 +140,7 @@ export default class DashPlayback extends BasePlayback {
         }
     }
     _setup() {
-        const dash = DASHJS.MediaPlayer().create();
+        const dash = MediaPlayer().create();
         this._dash = dash;
         this._dash.initialize();
         if (this.options.dash) {
@@ -149,6 +148,7 @@ export default class DashPlayback extends BasePlayback {
                 streaming: {
                     text: {
                         defaultEnabled: false,
+                        dispatchForManualRendering: true,
                     },
                 },
             }, this.options.dash);
@@ -157,27 +157,27 @@ export default class DashPlayback extends BasePlayback {
         this._dash.attachView(this.el);
         this._dash.setAutoPlay(false);
         this._dash.attachSource(this.options.src);
-        this._dash.on(DASHJS.MediaPlayer.events.ERROR, this._onDASHJSSError);
-        this._dash.on(DASHJS.MediaPlayer.events.PLAYBACK_ERROR, this._onPlaybackError);
-        this._dash.on(DASHJS.MediaPlayer.events.STREAM_INITIALIZED, () => {
-            const bitrates = dash.getBitrateInfoListFor('video');
+        this._dash.on(MediaPlayer.events.ERROR, this._onDASHJSSError);
+        this._dash.on(MediaPlayer.events.PLAYBACK_ERROR, this._onPlaybackError);
+        this._dash.on(MediaPlayer.events.STREAM_INITIALIZED, () => {
+            const bitrates = dash.getRepresentationsByType('video');
             this._updatePlaybackType();
             this._fillLevels(bitrates);
-            const currentLevel = dash.getQualityFor('video');
-            if (currentLevel !== -1) {
-                this.trigger(Events.PLAYBACK_BITRATE, this.getLevel(currentLevel));
+            const currentLevel = dash.getCurrentRepresentationForType('video');
+            if (currentLevel) {
+                this.trigger(Events.PLAYBACK_BITRATE, this.getLevel(currentLevel.index));
             }
-            dash.on(DASHJS.MediaPlayer.events.QUALITY_CHANGE_REQUESTED, (evt) => {
-                const newLevel = this.getLevel(evt.newQuality);
+            dash.on(MediaPlayer.events.QUALITY_CHANGE_REQUESTED, (evt) => {
+                const newLevel = this.getLevel(evt.newRepresentation.index);
                 this.onLevelSwitch(newLevel);
             });
             this.checkAudioTracks();
         });
-        this._dash.on(DASHJS.MediaPlayer.events.QUALITY_CHANGE_RENDERED, (evt) => {
-            const currentLevel = this.getLevel(evt.newQuality);
+        this._dash.on(MediaPlayer.events.QUALITY_CHANGE_RENDERED, (evt) => {
+            const currentLevel = this.getLevel(evt.newRepresentation.index);
             this.onLevelSwitchEnd(currentLevel);
         });
-        this._dash.on(DASHJS.MediaPlayer.events.METRIC_ADDED, (e) => {
+        this._dash.on(MediaPlayer.events.METRIC_ADDED, (e) => {
             // Listen for the first manifest request in order to update player UI
             if (e.metric === 'DVRInfo') {
                 // TODO fix typings
@@ -189,14 +189,27 @@ export default class DashPlayback extends BasePlayback {
                 }
             }
         });
-        this._dash.on(DASHJS.MediaPlayer.events.PLAYBACK_RATE_CHANGED, (e) => {
+        this._dash.on(MediaPlayer.events.PLAYBACK_RATE_CHANGED, (e) => {
             this.trigger(PlaybackEvents.PLAYBACK_RATE_CHANGED, e.playbackRate);
         });
-        this._dash.on(DASHJS.MediaPlayer.events.TRACK_CHANGE_RENDERED, (e) => {
+        this._dash.on(MediaPlayer.events.TRACK_CHANGE_RENDERED, (e) => {
             if (e.mediaType === 'audio') {
                 this.trigger(Events.PLAYBACK_AUDIO_CHANGED, toClapprTrack(e.newMediaInfo));
             }
         });
+        this._dash.on(MediaPlayer.events.CUE_ENTER, (e) => {
+            this.oncueenter?.({
+                end: e.end,
+                id: e.id,
+                start: e.start,
+                text: e.text,
+            });
+        });
+        this._dash.on(MediaPlayer.events.CUE_EXIT, (e) => {
+            this.oncueexit?.({
+                id: e.id,
+            });
+        });
     }
     render() {
         this._ready();
@@ -285,8 +298,7 @@ export default class DashPlayback extends BasePlayback {
         this.trigger(Events.PLAYBACK_SETTINGSUPDATE);
     }
     _onPlaybackError = (event) => {
-        // TODO
-        trace(`${T} _onPlaybackError`, { event });
+        trace(`${T} _onPlaybackError`, { type: event.type, code: event.error.code, message: event.error.message });
     };
     _onDASHJSSError = (event) => {
         this._stopTimeUpdateTimer();
@@ -294,17 +306,17 @@ export default class DashPlayback extends BasePlayback {
         const e = event.error;
         switch (e.code) {
             // TODO test handling of these errors
-            case DASHJS.MediaPlayer.errors.MANIFEST_LOADER_PARSING_FAILURE_ERROR_CODE:
-            case DASHJS.MediaPlayer.errors.MANIFEST_LOADER_LOADING_FAILURE_ERROR_CODE:
-            case DASHJS.MediaPlayer.errors.DOWNLOAD_ERROR_ID_MANIFEST_CODE:
-            case DASHJS.MediaPlayer.errors.DOWNLOAD_ERROR_ID_CONTENT_CODE:
-            case DASHJS.MediaPlayer.errors.DOWNLOAD_ERROR_ID_INITIALIZATION_CODE:
+            case MediaPlayer.errors.MANIFEST_LOADER_PARSING_FAILURE_ERROR_CODE:
+            case MediaPlayer.errors.MANIFEST_LOADER_LOADING_FAILURE_ERROR_CODE:
+            case MediaPlayer.errors.DOWNLOAD_ERROR_ID_MANIFEST_CODE:
+            case MediaPlayer.errors.DOWNLOAD_ERROR_ID_CONTENT_CODE:
+            case MediaPlayer.errors.DOWNLOAD_ERROR_ID_INITIALIZATION_CODE:
             // TODO these probably indicate a broken manifest and should be treated by removing the source
-            case DASHJS.MediaPlayer.errors.MANIFEST_ERROR_ID_NOSTREAMS_CODE:
-            case DASHJS.MediaPlayer.errors.MANIFEST_ERROR_ID_PARSE_CODE:
-            case DASHJS.MediaPlayer.errors.MANIFEST_ERROR_ID_MULTIPLEXED_CODE:
-            case DASHJS.MediaPlayer.errors.MEDIASOURCE_TYPE_UNSUPPORTED_CODE:
-            case DASHJS.MediaPlayer.errors.SEGMENT_BASE_LOADER_ERROR_CODE:
+            case MediaPlayer.errors.MANIFEST_ERROR_ID_NOSTREAMS_CODE:
+            case MediaPlayer.errors.MANIFEST_ERROR_ID_PARSE_CODE:
+            case MediaPlayer.errors.MANIFEST_ERROR_ID_MULTIPLEXED_CODE:
+            case MediaPlayer.errors.MEDIASOURCE_TYPE_UNSUPPORTED_CODE:
+            case MediaPlayer.errors.SEGMENT_BASE_LOADER_ERROR_CODE:
                 this.triggerError({
                     code: PlaybackErrorCode.MediaSourceUnavailable,
                     message: e.message,
@@ -363,7 +375,7 @@ export default class DashPlayback extends BasePlayback {
         if (!this._dash) {
             return false;
         }
-        return (this._dash?.getDVRWindowSize() >= this._minDvrSize &&
+        return (this._dash?.getDvrWindow()?.size >= this._minDvrSize &&
             this.getPlaybackType() === Playback.LIVE);
     }
     _onProgress() {
@@ -402,10 +414,17 @@ export default class DashPlayback extends BasePlayback {
     }
     destroyInstance() {
         if (this._dash) {
-            this._dash.off(DASHJS.MediaPlayer.events.ERROR, this._onDASHJSSError);
-            this._dash.off(DASHJS.MediaPlayer.events.PLAYBACK_ERROR, this._onPlaybackError);
-            this._dash.off(DASHJS.MediaPlayer.events.MANIFEST_LOADED, this.getDuration);
+            this._dash.off(MediaPlayer.events.ERROR, this._onDASHJSSError);
+            this._dash.off(MediaPlayer.events.PLAYBACK_ERROR, this._onPlaybackError);
+            this._dash.off(MediaPlayer.events.MANIFEST_LOADED, this.getDuration);
+            const tracks = this._dash.getTracksFor('text');
+            tracks.forEach(track => {
+                if (track.id) {
+                    this._dash.removeExternalSubtitleById(track.id);
+                }
+            });
             this._dash.reset();
+            this._dash.destroy();
             this._dash = null;
         }
     }
@@ -423,11 +442,10 @@ export default class DashPlayback extends BasePlayback {
         }
     }
     _fillLevels(levels) {
-        // TOOD check that levels[i].qualityIndex === i
         this._levels = levels.map((level) => {
             return {
-                level: level.qualityIndex,
-                bitrate: level.bitrate,
+                level: level.index,
+                bitrate: level.bitrateInKbit * 1000,
                 width: level.width,
                 height: level.height,
             };
@@ -451,9 +469,9 @@ export default class DashPlayback extends BasePlayback {
         return this._playbackType === Playback.VOD || this.dvrEnabled;
     }
     getLevel(quality) {
-        const ret = this.levels.find((level) => level.level === quality);
-        assert.ok(ret, 'Invalid quality level');
-        return ret;
+        const level = this.levels.find((level) => level.level === quality);
+        assert.ok(level, 'Invalid quality level');
+        return level;
     }
     setPlaybackRate(rate) {
         this._dash?.setPlaybackRate(rate);
@@ -500,6 +518,31 @@ export default class DashPlayback extends BasePlayback {
         super._handleTextTrackChange();
         this._dash?.setTextTrack(this.closedCaptionsTrackId);
     }
+    setTextTrack(id) {
+        this._dash?.setTextTrack(id);
+    }
+    /**
+     * @override
+     */
+    get closedCaptionsTracks() {
+        const tt = this.getTextTracks();
+        return tt;
+    }
+    getTextTracks() {
+        return this._dash?.getTracksFor('text').map((t, index) => ({
+            id: index,
+            name: getTextTrackLabel(t) || "",
+            track: {
+                id: index,
+                label: getTextTrackLabel(t) || "",
+                language: t.lang,
+                mode: "hidden",
+            },
+        })) || [];
+    }
+}
+function getTextTrackLabel(t) {
+    return t.labels.find((l) => !l.lang || l.lang === t.lang)?.text;
 }
 DashPlayback.canPlay = function (resource, mimeType) {
     if (!isDashSource(resource, mimeType)) {

package/lib/playback/hls-playback/HlsPlayback.d.ts

@@ -1,10 +1,9 @@
-import HLSJS, { Events as HlsEvents, type FragChangedData, type FragLoadedData, type LevelSwitchingData } from 'hls.js';
-import { QualityLevel } from '../../playback.types.js';
+import HLSJS, { Events as HlsEvents, type LevelSwitchingData } from 'hls.js';
+import { QualityLevel, VTTCueInfo } from '../../playback.types.js';
 import { PlaybackType } from '../../types.js';
 import { BasePlayback } from '../BasePlayback.js';
 import { AudioTrack } from '@clappr/core/types/base/playback/playback.js';
 export default class HlsPlayback extends BasePlayback {
-    private _ccIsSetup;
     private _ccTracksUpdated;
     private _currentFragment;
     private _currentLevel;
@@ -28,6 +27,12 @@ export default class HlsPlayback extends BasePlayback {
     private _recoveredDecodingError;
     private _segmentTargetDuration;
     private _timeUpdateTimer;
+    oncueenter: ((e: VTTCueInfo) => void) | null;
+    oncueexit: ((e: {
+        id: string;
+    }) => void) | null;
+    private cues;
+    private currentCueId;
     /**
      * @internal
      */
@@ -66,7 +71,6 @@ export default class HlsPlayback extends BasePlayback {
     private _listenHLSEvents;
     private bindCustomListeners;
     private unbindCustomListeners;
-    private _onFragmentParsingMetadata;
     protected render(): this;
     protected _ready(): void;
     private _recover;
@@ -83,10 +87,12 @@ export default class HlsPlayback extends BasePlayback {
     private _updateDvr;
     private _updateSettings;
     private _onHLSJSError;
+    private reload;
     private _keyIsDenied;
     _onTimeUpdate(): void;
     _onDurationChange(): void;
     _onProgress(): void;
+    private triggerCues;
     load(url: string): void;
     play(): void;
     pause(): void;
@@ -95,8 +101,6 @@ export default class HlsPlayback extends BasePlayback {
     private _updatePlaybackType;
     private _fillLevels;
     private _onLevelUpdated;
-    _onFragmentChanged(evt: HlsEvents.FRAG_CHANGED, data: FragChangedData): void;
-    _onFragmentLoaded(evt: HlsEvents.FRAG_LOADED, data: FragLoadedData): void;
     _onLevelSwitch(evt: HlsEvents.LEVEL_SWITCHING, data: LevelSwitchingData): void;
     _onLevelSwitched(evt: HlsEvents.LEVEL_SWITCHED, data: {
         level: number;
@@ -110,5 +114,27 @@ export default class HlsPlayback extends BasePlayback {
     switchAudioTrack(id: string): void;
     private _onAudioTracksUpdated;
     private _onAudioTrackSwitched;
+    setTextTrack(id: number): void;
+    /**
+     * @override
+     */
+    get closedCaptionsTracks(): {
+        id: number;
+        name: string;
+        track: {
+            id: number;
+            label: string;
+            language: string | undefined;
+        };
+    }[];
+    getTextTracks(): {
+        id: number;
+        name: string;
+        track: {
+            id: number;
+            label: string;
+            language: string | undefined;
+        };
+    }[];
 }
 //# sourceMappingURL=HlsPlayback.d.ts.map

package/lib/playback/hls-playback/HlsPlayback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HlsPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/hls-playback/HlsPlayback.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HlsPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/hls-playback/HlsPlayback.ts"],"names":[],"mappings":"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"}