@codercms/web-player 0.0.155 → 0.0.157
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/Loaders/NativeLoader.d.ts +0 -1
- package/dist/core/Loaders/NativeLoader.js +8 -7
- package/dist/core/Loaders/NativeLoader.js.map +1 -1
- package/dist/core/PlaylistPlayer.d.ts +1 -0
- package/dist/core/PlaylistPlayer.js +9 -0
- package/dist/core/PlaylistPlayer.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,7 +6,6 @@ export declare class NativeLoader extends BaseLoader {
|
|
|
6
6
|
private readonly _onAudioTrackAddedOrRemovedCb;
|
|
7
7
|
private _virtualQualityLevels?;
|
|
8
8
|
private _virtualCurrLevel?;
|
|
9
|
-
private _pendingAudioTrackChangeId?;
|
|
10
9
|
constructor(el: HTMLMediaElement);
|
|
11
10
|
getAutoQualityLevelId(): number;
|
|
12
11
|
load(params: LoadParams): Promise<void>;
|
|
@@ -6,7 +6,6 @@ export class NativeLoader extends BaseLoader {
|
|
|
6
6
|
_onAudioTrackAddedOrRemovedCb;
|
|
7
7
|
_virtualQualityLevels;
|
|
8
8
|
_virtualCurrLevel;
|
|
9
|
-
_pendingAudioTrackChangeId;
|
|
10
9
|
constructor(el) {
|
|
11
10
|
super(el);
|
|
12
11
|
this._onAudioTrackChangeCb = this._onAudioTrackChange.bind(this);
|
|
@@ -73,6 +72,7 @@ export class NativeLoader extends BaseLoader {
|
|
|
73
72
|
virtualQualityLevel = virtualQualityLevels.find((lvl) => lvl.url === params.url);
|
|
74
73
|
}
|
|
75
74
|
}
|
|
75
|
+
const pendingAudioTrackChangeId = params.audioTrack;
|
|
76
76
|
this.el.src = loadUrl;
|
|
77
77
|
try {
|
|
78
78
|
this.el.load();
|
|
@@ -105,10 +105,16 @@ export class NativeLoader extends BaseLoader {
|
|
|
105
105
|
if (params.startPosition !== undefined) {
|
|
106
106
|
this.el.currentTime = params.startPosition;
|
|
107
107
|
}
|
|
108
|
-
this._pendingAudioTrackChangeId = params.audioTrack;
|
|
109
108
|
if (!paused) {
|
|
110
109
|
await this.el.play();
|
|
111
110
|
}
|
|
111
|
+
// For some reason playback stucks in MS Edge if audio track changed right after loading
|
|
112
|
+
// so rely on timeupdate event to be safe
|
|
113
|
+
if (pendingAudioTrackChangeId !== undefined) {
|
|
114
|
+
this.el.addEventListener('timeupdate', () => {
|
|
115
|
+
this.switchAudioTrack(pendingAudioTrackChangeId);
|
|
116
|
+
}, { once: true });
|
|
117
|
+
}
|
|
112
118
|
}
|
|
113
119
|
_onAudioTrackAddedOrRemoved = () => {
|
|
114
120
|
const tracks = [];
|
|
@@ -124,11 +130,6 @@ export class NativeLoader extends BaseLoader {
|
|
|
124
130
|
});
|
|
125
131
|
}
|
|
126
132
|
this.emitter.emit(LoaderEvents.AudioTracksUpdated, tracks);
|
|
127
|
-
if (this._pendingAudioTrackChangeId !== undefined) {
|
|
128
|
-
const audioTrack = this._pendingAudioTrackChangeId;
|
|
129
|
-
this._pendingAudioTrackChangeId = undefined;
|
|
130
|
-
this.switchAudioTrack(audioTrack);
|
|
131
|
-
}
|
|
132
133
|
};
|
|
133
134
|
_onAudioTrackChange = () => {
|
|
134
135
|
const trackList = this.el.audioTracks;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NativeLoader.js","sourceRoot":"","sources":["NativeLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAmB,MAAM,sCAAsC,CAAC;AACjG,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAK7D,MAAM,OAAO,YAAa,SAAQ,UAAU;IAClC,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC;IAEjB,qBAAqB,CAAC;IACtB,6BAA6B,CAAC;IAEvC,qBAAqB,CAAiC;IACtD,iBAAiB,CAAU;
|
|
1
|
+
{"version":3,"file":"NativeLoader.js","sourceRoot":"","sources":["NativeLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,7 @@ export declare class PlaylistPlayer<ItemImpl extends PlaylistItemInterface> {
|
|
|
33
33
|
protected _player: VideoPlayer | null;
|
|
34
34
|
protected _playlist: Playlist<ItemImpl> | null;
|
|
35
35
|
protected _loadedItem: ItemImpl | null;
|
|
36
|
+
protected _loadingItemCnt: number;
|
|
36
37
|
protected _onPlaylistSetCb: (item: ItemImpl) => Promise<void>;
|
|
37
38
|
protected _onPlaylistEmptiedCb: () => void;
|
|
38
39
|
protected _handleHTMLPlayEventCb: () => Promise<void>;
|
|
@@ -18,6 +18,7 @@ export class PlaylistPlayer {
|
|
|
18
18
|
_player = null;
|
|
19
19
|
_playlist = null;
|
|
20
20
|
_loadedItem = null;
|
|
21
|
+
_loadingItemCnt = 0;
|
|
21
22
|
_onPlaylistSetCb = this._onPlaylistSet.bind(this);
|
|
22
23
|
_onPlaylistEmptiedCb = this._onPlaylistEmptied.bind(this);
|
|
23
24
|
_handleHTMLPlayEventCb = this._handleHTMLPlayEvent.bind(this);
|
|
@@ -40,6 +41,7 @@ export class PlaylistPlayer {
|
|
|
40
41
|
if (!this._player) {
|
|
41
42
|
throw Error('Player is not attached');
|
|
42
43
|
}
|
|
44
|
+
this._loadingItemCnt++;
|
|
43
45
|
this.emitter.emit(PlaylistPlayerEvents.PlaylistItemBeforeLoading, item, loadParams);
|
|
44
46
|
if (!loadParams) {
|
|
45
47
|
loadParams = item.getLoadParams();
|
|
@@ -58,6 +60,9 @@ export class PlaylistPlayer {
|
|
|
58
60
|
// throw e;
|
|
59
61
|
return;
|
|
60
62
|
}
|
|
63
|
+
finally {
|
|
64
|
+
this._loadingItemCnt--;
|
|
65
|
+
}
|
|
61
66
|
this._loadedItem = item;
|
|
62
67
|
}
|
|
63
68
|
async preloadCurrent(loadParams) {
|
|
@@ -88,6 +93,10 @@ export class PlaylistPlayer {
|
|
|
88
93
|
if (!this._playlist) {
|
|
89
94
|
return;
|
|
90
95
|
}
|
|
96
|
+
// Skip if already loading item
|
|
97
|
+
if (this._loadingItemCnt > 0) {
|
|
98
|
+
return;
|
|
99
|
+
}
|
|
91
100
|
if (!this._loadedItem) {
|
|
92
101
|
let curr = this._playlist.getCurrent();
|
|
93
102
|
if (!curr) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlaylistPlayer.js","sourceRoot":"","sources":["PlaylistPlayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,cAAc,EAA8B,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAG9D,MAAM,CAAN,IAAY,oBAWX;AAXD,WAAY,oBAAoB;IAC/B,wEAAgD,CAAA;IAChD,wEAAgD,CAAA;IAEhD,4EAAoD,CAAA;IACpD,4EAAoD,CAAA;IAEpD,sFAA8D,CAAA;IAC9D,0EAAkD,CAAA;IAClD,wEAAgD,CAAA;IAChD,sFAA8D,CAAA;AAC/D,CAAC,EAXW,oBAAoB,KAApB,oBAAoB,QAW/B;AA4BD,MAAM,OAAO,cAAc;IAChB,OAAO,GAAG,IAAI,YAAY,EAAqC,CAAC;IAEvD,IAAI,CAAqB;IAElC,OAAO,GAAuB,IAAI,CAAC;IACnC,SAAS,GAA8B,IAAI,CAAC;IAE5C,WAAW,GAAoB,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"PlaylistPlayer.js","sourceRoot":"","sources":["PlaylistPlayer.ts"],"names":[],"mappings":"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"}
|