@gcorevideo/player 2.28.27 → 2.28.28

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

@@ -1,5 +1,5 @@
 import { Playback } from '@clappr/core';
-import DASHJS, { type BitrateInfo as DashBitrateInfo, IManifestInfo } from 'dashjs';
+import { IManifestInfo, MediaPlayerClass, Representation } from 'dashjs';
 import { QualityLevel, TimePosition, TimeValue } from '../../playback.types.js';
 import { BasePlayback } from '../BasePlayback.js';
 import { AudioTrack } from '@clappr/core/types/base/playback/playback.js';
@@ -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;
@@ -66,7 +66,7 @@ export default class DashPlayback extends BasePlayback {
     private destroyInstance;
     destroy(): void;
     _updatePlaybackType(): void;
-    _fillLevels(levels: DashBitrateInfo[]): void;
+    _fillLevels(levels: Representation[]): void;
     private onLevelSwitch;
     private onLevelSwitchEnd;
     getPlaybackType(): string;

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
@@ -53,13 +53,9 @@ export default class DashPlayback extends BasePlayback {
         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 +77,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();
@@ -141,7 +137,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) {
@@ -154,30 +150,31 @@ export default class DashPlayback extends BasePlayback {
             }, this.options.dash);
             this._dash.updateSettings(settings);
         }
+        assert.ok(this.el instanceof HTMLMediaElement, 'el must be an HTMLMediaElement');
         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,10 +186,10 @@ 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));
             }
@@ -294,17 +291,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 +360,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,9 +399,9 @@ 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);
             this._dash.reset();
             this._dash = null;
         }
@@ -423,11 +420,12 @@ export default class DashPlayback extends BasePlayback {
         }
     }
     _fillLevels(levels) {
-        // TOOD check that levels[i].qualityIndex === i
+        // TOOD check that levels[i].index === i
+        trace(`${T} _fillLevels`, { levels });
         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 +449,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcorevideo/player",
-  "version": "2.28.27",
+  "version": "2.28.28",
   "description": "Gcore JavaScript video player",
   "main": "dist/index.js",
   "type": "module",
@@ -61,7 +61,7 @@
     "@clappr/core": "^0.13.0",
     "@gcorevideo/utils": "^0.7.1",
     "@sentry/types": "^8.47.0",
-    "dashjs": "^4.7.4",
+    "dashjs": "^5.1.1",
     "hls.js": "^1.6.15",
     "human-format": "^1.2.1",
     "mousetrap": "^1.6.5",

package/src/playback/dash-playback/DashPlayback.ts

@@ -6,13 +6,20 @@
 import { Events, Log, Playback, PlayerError, Utils, $ } from '@clappr/core'
 import { trace } from '@gcorevideo/utils'
 import assert from 'assert'
-import DASHJS, {
+import {
   ErrorEvent as DashErrorEvent,
   MediaPlayerErrorEvent,
   PlaybackErrorEvent as DashPlaybackErrorEvent,
   type BitrateInfo as DashBitrateInfo,
   MetricEvent as DashMetricEvent,
   IManifestInfo,
+  MediaPlayerClass,
+  MediaPlayer,
+  PlaybackRateChangedEvent,
+  TrackChangeRenderedEvent,
+  MediaInfo,
+  Representation,
+  QualityChangeRenderedEvent,
 } from 'dashjs'
 
 import {
@@ -47,9 +54,9 @@ type LocalTimeCorrelation = {
 const T = 'playback.dash'
 
 export default class DashPlayback extends BasePlayback {
-  _levels: QualityLevel[] | null = null
+  _levels: QualityLevel[] = []
 
-  _currentLevel: number | null = null
+  _currentLevel: number = AUTO
 
   // true when the actual duration is longer than hlsjs's live sync point
   // when this is false playableRegionDuration will be the actual duration
@@ -78,7 +85,7 @@ export default class DashPlayback extends BasePlayback {
 
   _programDateTime: TimeValue = 0
 
-  _dash: DASHJS.MediaPlayerClass | null = null
+  _dash: MediaPlayerClass | null = null
 
   _extrapolatedWindowDuration: number = 0
 
@@ -105,14 +112,10 @@ export default class DashPlayback extends BasePlayback {
   }
 
   get levels(): QualityLevel[] {
-    return this._levels || []
+    return this._levels
   }
 
   get currentLevel(): number {
-    if (this._currentLevel === null) {
-      return AUTO
-    }
-    // 0 is a valid level ID
     return this._currentLevel
   }
 
@@ -143,7 +146,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()
@@ -226,7 +229,7 @@ export default class DashPlayback extends BasePlayback {
   }
 
   _setup() {
-    const dash = DASHJS.MediaPlayer().create()
+    const dash = MediaPlayer().create()
     this._dash = dash
     this._dash.initialize()
 
@@ -245,29 +248,30 @@ export default class DashPlayback extends BasePlayback {
       this._dash.updateSettings(settings)
     }
 
+    assert.ok(this.el instanceof HTMLMediaElement, 'el must be an HTMLMediaElement')
     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(MediaPlayer.events.ERROR, this._onDASHJSSError)
     this._dash.on(
-      DASHJS.MediaPlayer.events.PLAYBACK_ERROR,
+      MediaPlayer.events.PLAYBACK_ERROR,
       this._onPlaybackError,
     )
 
-    this._dash.on(DASHJS.MediaPlayer.events.STREAM_INITIALIZED, () => {
-      const bitrates = dash.getBitrateInfoListFor('video')
+    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)
       })
 
@@ -275,15 +279,15 @@ export default class DashPlayback extends BasePlayback {
     })
 
     this._dash.on(
-      DASHJS.MediaPlayer.events.QUALITY_CHANGE_RENDERED,
-      (evt: DASHJS.QualityChangeRenderedEvent) => {
-        const currentLevel = this.getLevel(evt.newQuality)
+      MediaPlayer.events.QUALITY_CHANGE_RENDERED,
+      (evt: QualityChangeRenderedEvent) => {
+        const currentLevel = this.getLevel(evt.newRepresentation.index)
         this.onLevelSwitchEnd(currentLevel)
       },
     )
 
     this._dash.on(
-      DASHJS.MediaPlayer.events.METRIC_ADDED,
+      MediaPlayer.events.METRIC_ADDED,
       (e: DashMetricEvent) => {
         // Listen for the first manifest request in order to update player UI
         if ((e.metric as string) === 'DVRInfo') {
@@ -302,14 +306,14 @@ export default class DashPlayback extends BasePlayback {
     )
 
     this._dash.on(
-      DASHJS.MediaPlayer.events.PLAYBACK_RATE_CHANGED,
-      (e: DASHJS.PlaybackRateChangedEvent) => {
+      MediaPlayer.events.PLAYBACK_RATE_CHANGED,
+      (e: PlaybackRateChangedEvent) => {
         this.trigger(PlaybackEvents.PLAYBACK_RATE_CHANGED, e.playbackRate)
       },
     )
 
-    this._dash.on(DASHJS.MediaPlayer.events.TRACK_CHANGE_RENDERED, (e: any) => {
-      if ((e as DASHJS.TrackChangeRenderedEvent).mediaType === 'audio') {
+    this._dash.on(MediaPlayer.events.TRACK_CHANGE_RENDERED, (e: any) => {
+      if ((e as TrackChangeRenderedEvent).mediaType === 'audio') {
         this.trigger(
           Events.PLAYBACK_AUDIO_CHANGED,
           toClapprTrack(e.newMediaInfo),
@@ -442,17 +446,17 @@ export default class DashPlayback extends BasePlayback {
     const e = (event as MediaPlayerErrorEvent).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,
@@ -525,7 +529,7 @@ export default class DashPlayback extends BasePlayback {
       return false
     }
     return (
-      this._dash?.getDVRWindowSize() >= this._minDvrSize &&
+      this._dash?.getDvrWindow()?.size >= this._minDvrSize &&
       this.getPlaybackType() === Playback.LIVE
     )
   }
@@ -572,13 +576,13 @@ export default class DashPlayback extends BasePlayback {
 
   private destroyInstance() {
     if (this._dash) {
-      this._dash.off(DASHJS.MediaPlayer.events.ERROR, this._onDASHJSSError)
+      this._dash.off(MediaPlayer.events.ERROR, this._onDASHJSSError)
       this._dash.off(
-        DASHJS.MediaPlayer.events.PLAYBACK_ERROR,
+        MediaPlayer.events.PLAYBACK_ERROR,
         this._onPlaybackError,
       )
       this._dash.off(
-        DASHJS.MediaPlayer.events.MANIFEST_LOADED,
+        MediaPlayer.events.MANIFEST_LOADED,
         this.getDuration,
       )
       this._dash.reset()
@@ -601,12 +605,13 @@ export default class DashPlayback extends BasePlayback {
     }
   }
 
-  _fillLevels(levels: DashBitrateInfo[]) {
-    // TOOD check that levels[i].qualityIndex === i
+  _fillLevels(levels: Representation[]) {
+    // TOOD check that levels[i].index === i
+    trace(`${T} _fillLevels`, { levels })
     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,
       }
@@ -635,10 +640,10 @@ export default class DashPlayback extends BasePlayback {
     return this._playbackType === Playback.VOD || this.dvrEnabled
   }
 
-  private getLevel(quality: number) {
-    const ret = this.levels.find((level) => level.level === quality)
-    assert.ok(ret, 'Invalid quality level')
-    return ret
+  private getLevel(quality: number): QualityLevel {
+    const level = this.levels.find((level) => level.level === quality)
+    assert.ok(level, 'Invalid quality level')
+    return level
   }
 
   setPlaybackRate(rate: number) {
@@ -707,7 +712,7 @@ DashPlayback.canPlay = function (resource, mimeType) {
   return typeof ctor === 'function'
 }
 
-function toClapprTrack(t: DASHJS.MediaInfo): AudioTrack {
+function toClapprTrack(t: MediaInfo): AudioTrack {
   return {
     id: t.id,
     kind: t.roles && t.roles?.length > 0 ? t.roles[0] : 'main', // TODO

package/src/playback/hls-playback/HlsPlayback.ts

@@ -305,7 +305,7 @@ export default class HlsPlayback extends BasePlayback {
     // added/removed every 5.
     this._extrapolatedWindowNumSegments =
       !this.options.playback ||
-      typeof this.options.playback.extrapolatedWindowNumSegments === 'undefined'
+        typeof this.options.playback.extrapolatedWindowNumSegments === 'undefined'
         ? 2
         : this.options.playback.extrapolatedWindowNumSegments
 
@@ -527,7 +527,7 @@ export default class HlsPlayback extends BasePlayback {
   }
 
   // this playback manages the src on the video element itself
-  protected override _setupSrc(srcUrl: string) {} // eslint-disable-line no-unused-vars
+  protected override _setupSrc(srcUrl: string) { } // eslint-disable-line no-unused-vars
 
   private _startTimeUpdateTimer() {
     if (this._timeUpdateTimer) {
@@ -592,7 +592,7 @@ export default class HlsPlayback extends BasePlayback {
     // assume live if time within 3 seconds of end of stream
     this.dvrEnabled && this._updateDvr(time < this.getDuration() - 3)
     time += this._startTime
-    ;(this.el as HTMLMediaElement).currentTime = time
+      ; (this.el as HTMLMediaElement).currentTime = time
   }
 
   seekToLivePoint() {
@@ -781,12 +781,12 @@ export default class HlsPlayback extends BasePlayback {
           start: Math.max(
             0,
             (this.el as HTMLMediaElement).buffered.start(i) -
-              this._playableRegionStartTime,
+            this._playableRegionStartTime,
           ),
           end: Math.max(
             0,
             (this.el as HTMLMediaElement).buffered.end(i) -
-              this._playableRegionStartTime,
+            this._playableRegionStartTime,
           ),
         },
       ]
@@ -826,7 +826,7 @@ export default class HlsPlayback extends BasePlayback {
     if (!this._hls) {
       return
     }
-    ;(this.el as HTMLMediaElement).pause()
+    ; (this.el as HTMLMediaElement).pause()
     if (this.dvrEnabled) {
       this._updateDvr(true)
     }
@@ -942,7 +942,7 @@ export default class HlsPlayback extends BasePlayback {
               Math.max(
                 fragments[0].start,
                 previousPlayableRegionStartTime +
-                  this._extrapolatedWindowDuration,
+                this._extrapolatedWindowDuration,
               ) * 1000,
           }
         }