@gcorevideo/player 2.19.8 → 2.19.9
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.js +7 -9
- package/dist/index.css +409 -409
- package/dist/index.js +10 -16
- package/dist/plugins/index.css +1468 -1468
- package/dist/plugins/index.js +2 -4
- package/lib/Player.d.ts.map +1 -1
- package/lib/Player.js +3 -5
- package/lib/playback/hls-playback/HlsPlayback.d.ts.map +1 -1
- package/lib/playback/hls-playback/HlsPlayback.js +4 -4
- package/lib/plugins/source-controller/SourceController.d.ts.map +1 -1
- package/lib/plugins/source-controller/SourceController.js +3 -7
- package/package.json +1 -1
- package/src/Player.ts +3 -5
- package/src/playback/hls-playback/HlsPlayback.ts +10 -5
- package/src/plugins/source-controller/SourceController.ts +4 -8
- package/tsconfig.tsbuildinfo +1 -1
package/dist/plugins/index.js
CHANGED
|
@@ -40593,6 +40593,7 @@ class SourceController extends CorePlugin {
|
|
|
40593
40593
|
onReady() {
|
|
40594
40594
|
trace(`${T} onReady`, {
|
|
40595
40595
|
retrying: this.active,
|
|
40596
|
+
currentSource: this.sourcesList[this.currentSourceIndex],
|
|
40596
40597
|
});
|
|
40597
40598
|
const spinner = this.core.activeContainer?.getPlugin('spinner');
|
|
40598
40599
|
if (spinner) {
|
|
@@ -40603,6 +40604,7 @@ class SourceController extends CorePlugin {
|
|
|
40603
40604
|
else {
|
|
40604
40605
|
this.sync = noSync;
|
|
40605
40606
|
}
|
|
40607
|
+
// TODO bind to CORE_ACTIVE_CONTAINER_CHANGED
|
|
40606
40608
|
this.bindContainerEventListeners();
|
|
40607
40609
|
if (this.active) {
|
|
40608
40610
|
this.core.activeContainer?.getPlugin('poster_custom')?.disable();
|
|
@@ -40610,9 +40612,6 @@ class SourceController extends CorePlugin {
|
|
|
40610
40612
|
}
|
|
40611
40613
|
}
|
|
40612
40614
|
bindContainerEventListeners() {
|
|
40613
|
-
trace(`${T} bindContainerEventListeners`, {
|
|
40614
|
-
activePlayback: this.core.activePlayback?.name,
|
|
40615
|
-
});
|
|
40616
40615
|
this.core.activePlayback.on(Events$1.PLAYBACK_ERROR, (error) => {
|
|
40617
40616
|
trace(`${T} on PLAYBACK_ERROR`, {
|
|
40618
40617
|
error: {
|
|
@@ -40651,7 +40650,6 @@ class SourceController extends CorePlugin {
|
|
|
40651
40650
|
trace(`${T} retryPlayback enter`, {
|
|
40652
40651
|
currentSourceIndex: this.currentSourceIndex,
|
|
40653
40652
|
currentSource: this.sourcesList[this.currentSourceIndex],
|
|
40654
|
-
sourcesList: this.sourcesList,
|
|
40655
40653
|
});
|
|
40656
40654
|
this.active = true;
|
|
40657
40655
|
this.getNextMediaSource().then((nextSource) => {
|
package/lib/Player.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../src/Player.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../src/Player.ts"],"names":[],"mappings":"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"}
|
package/lib/Player.js
CHANGED
|
@@ -383,11 +383,10 @@ export class Player {
|
|
|
383
383
|
sources,
|
|
384
384
|
});
|
|
385
385
|
this.rootNode = rootNode;
|
|
386
|
-
const coreOptions = {
|
|
387
|
-
...this.config, // plugin settings
|
|
386
|
+
const coreOptions = $.extend(true, this.config, {
|
|
388
387
|
allowUserInteraction: true,
|
|
389
388
|
autoPlay: false,
|
|
390
|
-
dash: this.config.dash,
|
|
389
|
+
dash: this.config.dash,
|
|
391
390
|
debug: this.config.debug || 'none',
|
|
392
391
|
events: this.events,
|
|
393
392
|
height: rootNode.clientHeight,
|
|
@@ -400,7 +399,6 @@ export class Player {
|
|
|
400
399
|
mute: this.config.mute,
|
|
401
400
|
crossOrigin: 'anonymous', // TODO
|
|
402
401
|
hlsjsConfig: {
|
|
403
|
-
// TODO
|
|
404
402
|
debug: this.config.debug === 'all' || this.config.debug === 'hls',
|
|
405
403
|
},
|
|
406
404
|
},
|
|
@@ -411,7 +409,7 @@ export class Player {
|
|
|
411
409
|
mimeType: source ? source.mimeType : undefined,
|
|
412
410
|
sources,
|
|
413
411
|
strings: this.config.strings,
|
|
414
|
-
};
|
|
412
|
+
});
|
|
415
413
|
return coreOptions;
|
|
416
414
|
}
|
|
417
415
|
configurePlaybacks() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HlsPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/hls-playback/HlsPlayback.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,UAAU,
|
|
1
|
+
{"version":3,"file":"HlsPlayback.d.ts","sourceRoot":"","sources":["../../../src/playback/hls-playback/HlsPlayback.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Copyright 2014 Globo.com Player authors. All rights reserved.
|
|
2
2
|
// Use of this source code is governed by a BSD-style
|
|
3
3
|
// license that can be found in the LICENSE file.
|
|
4
|
-
import { Events, HTML5Video, Log, Playback, PlayerError, Utils, } from '@clappr/core';
|
|
4
|
+
import { Events, HTML5Video, Log, Playback, PlayerError, Utils, $, } from '@clappr/core';
|
|
5
5
|
import { trace } from '@gcorevideo/utils';
|
|
6
6
|
import assert from 'assert';
|
|
7
7
|
import HLSJS from 'hls.js';
|
|
@@ -239,11 +239,11 @@ export default class HlsPlayback extends HTML5Video {
|
|
|
239
239
|
this._hls = null;
|
|
240
240
|
}
|
|
241
241
|
_createHLSInstance() {
|
|
242
|
-
const config = {
|
|
243
|
-
...this.options.playback.hlsjsConfig,
|
|
242
|
+
const config = $.extend(true, {
|
|
244
243
|
maxBufferLength: 2,
|
|
245
244
|
maxMaxBufferLength: 4,
|
|
246
|
-
};
|
|
245
|
+
}, this.options.playback.hlsjsConfig);
|
|
246
|
+
trace(`${T} _createHLSInstance`, { config });
|
|
247
247
|
this._hls = new HLSJS(config);
|
|
248
248
|
}
|
|
249
249
|
_attachHLSMedia() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SourceController.d.ts","sourceRoot":"","sources":["../../../src/plugins/source-controller/SourceController.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,KAAK,IAAI,IAAI,UAAU,EACxB,MAAM,cAAc,CAAA;AA4BrB;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,gBAAiB,SAAQ,UAAU;IAuC9C,OAAO,CAAC,WAAW,CAA8B;IAEjD,OAAO,CAAC,kBAAkB,CAAI;IAE9B,OAAO,CAAC,YAAY,CAA6B;IAEjD,OAAO,CAAC,MAAM,CAAQ;IAEtB,OAAO,CAAC,IAAI,CAAiB;IAE7B,IAAI,IAAI,WAEP;IAED,IAAI,gBAAgB;;MAEnB;gBAEW,IAAI,EAAE,UAAU;IAW5B;;OAEG;IACM,UAAU;IAMnB,OAAO,CAAC,OAAO;
|
|
1
|
+
{"version":3,"file":"SourceController.d.ts","sourceRoot":"","sources":["../../../src/plugins/source-controller/SourceController.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,KAAK,IAAI,IAAI,UAAU,EACxB,MAAM,cAAc,CAAA;AA4BrB;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,gBAAiB,SAAQ,UAAU;IAuC9C,OAAO,CAAC,WAAW,CAA8B;IAEjD,OAAO,CAAC,kBAAkB,CAAI;IAE9B,OAAO,CAAC,YAAY,CAA6B;IAEjD,OAAO,CAAC,MAAM,CAAQ;IAEtB,OAAO,CAAC,IAAI,CAAiB;IAE7B,IAAI,IAAI,WAEP;IAED,IAAI,gBAAgB;;MAEnB;gBAEW,IAAI,EAAE,UAAU;IAW5B;;OAEG;IACM,UAAU;IAMnB,OAAO,CAAC,OAAO;IAqBf,OAAO,CAAC,2BAA2B;IAsCnC,OAAO,CAAC,KAAK;IAKb,OAAO,CAAC,aAAa;IA0BrB,OAAO,CAAC,kBAAkB;IAe1B,MAAM,KAAK,OAAO,WAEjB;CACF"}
|
|
@@ -98,6 +98,7 @@ export class SourceController extends CorePlugin {
|
|
|
98
98
|
onReady() {
|
|
99
99
|
trace(`${T} onReady`, {
|
|
100
100
|
retrying: this.active,
|
|
101
|
+
currentSource: this.sourcesList[this.currentSourceIndex],
|
|
101
102
|
});
|
|
102
103
|
const spinner = this.core.activeContainer?.getPlugin('spinner');
|
|
103
104
|
if (spinner) {
|
|
@@ -108,6 +109,7 @@ export class SourceController extends CorePlugin {
|
|
|
108
109
|
else {
|
|
109
110
|
this.sync = noSync;
|
|
110
111
|
}
|
|
112
|
+
// TODO bind to CORE_ACTIVE_CONTAINER_CHANGED
|
|
111
113
|
this.bindContainerEventListeners();
|
|
112
114
|
if (this.active) {
|
|
113
115
|
this.core.activeContainer?.getPlugin('poster_custom')?.disable();
|
|
@@ -115,9 +117,6 @@ export class SourceController extends CorePlugin {
|
|
|
115
117
|
}
|
|
116
118
|
}
|
|
117
119
|
bindContainerEventListeners() {
|
|
118
|
-
trace(`${T} bindContainerEventListeners`, {
|
|
119
|
-
activePlayback: this.core.activePlayback?.name,
|
|
120
|
-
});
|
|
121
120
|
this.core.activePlayback.on(ClapprEvents.PLAYBACK_ERROR, (error) => {
|
|
122
121
|
trace(`${T} on PLAYBACK_ERROR`, {
|
|
123
122
|
error: {
|
|
@@ -159,7 +158,6 @@ export class SourceController extends CorePlugin {
|
|
|
159
158
|
trace(`${T} retryPlayback enter`, {
|
|
160
159
|
currentSourceIndex: this.currentSourceIndex,
|
|
161
160
|
currentSource: this.sourcesList[this.currentSourceIndex],
|
|
162
|
-
sourcesList: this.sourcesList,
|
|
163
161
|
});
|
|
164
162
|
this.active = true;
|
|
165
163
|
this.getNextMediaSource().then((nextSource) => {
|
|
@@ -168,9 +166,7 @@ export class SourceController extends CorePlugin {
|
|
|
168
166
|
});
|
|
169
167
|
const rnd = RETRY_DELAY_BLUR * Math.random();
|
|
170
168
|
this.sync(() => {
|
|
171
|
-
trace(`${T} retryPlayback loading
|
|
172
|
-
nextSource,
|
|
173
|
-
});
|
|
169
|
+
trace(`${T} retryPlayback loading...`);
|
|
174
170
|
this.core.load(nextSource.source, nextSource.mimeType);
|
|
175
171
|
trace(`${T} retryPlayback loaded`, {
|
|
176
172
|
nextSource,
|
package/package.json
CHANGED
package/src/Player.ts
CHANGED
|
@@ -476,11 +476,10 @@ export class Player {
|
|
|
476
476
|
|
|
477
477
|
this.rootNode = rootNode
|
|
478
478
|
|
|
479
|
-
const coreOptions: CoreOptions & PluginOptions = {
|
|
480
|
-
...this.config, // plugin settings
|
|
479
|
+
const coreOptions: CoreOptions & PluginOptions = $.extend(true, this.config, {
|
|
481
480
|
allowUserInteraction: true,
|
|
482
481
|
autoPlay: false,
|
|
483
|
-
dash: this.config.dash,
|
|
482
|
+
dash: this.config.dash,
|
|
484
483
|
debug: this.config.debug || 'none',
|
|
485
484
|
events: this.events,
|
|
486
485
|
height: rootNode.clientHeight,
|
|
@@ -493,7 +492,6 @@ export class Player {
|
|
|
493
492
|
mute: this.config.mute,
|
|
494
493
|
crossOrigin: 'anonymous', // TODO
|
|
495
494
|
hlsjsConfig: {
|
|
496
|
-
// TODO
|
|
497
495
|
debug: this.config.debug === 'all' || this.config.debug === 'hls',
|
|
498
496
|
},
|
|
499
497
|
},
|
|
@@ -504,7 +502,7 @@ export class Player {
|
|
|
504
502
|
mimeType: source ? source.mimeType : undefined,
|
|
505
503
|
sources,
|
|
506
504
|
strings: this.config.strings,
|
|
507
|
-
}
|
|
505
|
+
})
|
|
508
506
|
return coreOptions
|
|
509
507
|
}
|
|
510
508
|
|
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
Playback,
|
|
10
10
|
PlayerError,
|
|
11
11
|
Utils,
|
|
12
|
+
$,
|
|
12
13
|
} from '@clappr/core'
|
|
13
14
|
import { trace } from '@gcorevideo/utils'
|
|
14
15
|
import assert from 'assert'
|
|
@@ -371,11 +372,15 @@ export default class HlsPlayback extends HTML5Video {
|
|
|
371
372
|
}
|
|
372
373
|
|
|
373
374
|
_createHLSInstance() {
|
|
374
|
-
const config =
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
375
|
+
const config = $.extend(
|
|
376
|
+
true,
|
|
377
|
+
{
|
|
378
|
+
maxBufferLength: 2,
|
|
379
|
+
maxMaxBufferLength: 4,
|
|
380
|
+
},
|
|
381
|
+
this.options.playback.hlsjsConfig,
|
|
382
|
+
)
|
|
383
|
+
trace(`${T} _createHLSInstance`, { config })
|
|
379
384
|
|
|
380
385
|
this._hls = new HLSJS(config)
|
|
381
386
|
}
|
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
} from '../../playback.types.js'
|
|
10
10
|
import {
|
|
11
11
|
type PlayerMediaSourceDesc,
|
|
12
|
-
} from '
|
|
12
|
+
} from '../../types.js'
|
|
13
13
|
import { trace } from '@gcorevideo/utils'
|
|
14
14
|
|
|
15
15
|
import { CLAPPR_VERSION } from '../build'
|
|
@@ -127,6 +127,7 @@ export class SourceController extends CorePlugin {
|
|
|
127
127
|
private onReady() {
|
|
128
128
|
trace(`${T} onReady`, {
|
|
129
129
|
retrying: this.active,
|
|
130
|
+
currentSource: this.sourcesList[this.currentSourceIndex],
|
|
130
131
|
})
|
|
131
132
|
const spinner = this.core.activeContainer?.getPlugin('spinner')
|
|
132
133
|
if (spinner) {
|
|
@@ -136,6 +137,7 @@ export class SourceController extends CorePlugin {
|
|
|
136
137
|
} else {
|
|
137
138
|
this.sync = noSync
|
|
138
139
|
}
|
|
140
|
+
// TODO bind to CORE_ACTIVE_CONTAINER_CHANGED
|
|
139
141
|
this.bindContainerEventListeners()
|
|
140
142
|
if (this.active) {
|
|
141
143
|
this.core.activeContainer?.getPlugin('poster_custom')?.disable()
|
|
@@ -144,9 +146,6 @@ export class SourceController extends CorePlugin {
|
|
|
144
146
|
}
|
|
145
147
|
|
|
146
148
|
private bindContainerEventListeners() {
|
|
147
|
-
trace(`${T} bindContainerEventListeners`, {
|
|
148
|
-
activePlayback: this.core.activePlayback?.name,
|
|
149
|
-
})
|
|
150
149
|
this.core.activePlayback.on(
|
|
151
150
|
ClapprEvents.PLAYBACK_ERROR,
|
|
152
151
|
(error: PlaybackError) => {
|
|
@@ -193,7 +192,6 @@ export class SourceController extends CorePlugin {
|
|
|
193
192
|
trace(`${T} retryPlayback enter`, {
|
|
194
193
|
currentSourceIndex: this.currentSourceIndex,
|
|
195
194
|
currentSource: this.sourcesList[this.currentSourceIndex],
|
|
196
|
-
sourcesList: this.sourcesList,
|
|
197
195
|
})
|
|
198
196
|
this.active = true
|
|
199
197
|
this.getNextMediaSource().then((nextSource: PlayerMediaSourceDesc) => {
|
|
@@ -202,9 +200,7 @@ export class SourceController extends CorePlugin {
|
|
|
202
200
|
})
|
|
203
201
|
const rnd = RETRY_DELAY_BLUR * Math.random()
|
|
204
202
|
this.sync(() => {
|
|
205
|
-
trace(`${T} retryPlayback loading
|
|
206
|
-
nextSource,
|
|
207
|
-
})
|
|
203
|
+
trace(`${T} retryPlayback loading...`)
|
|
208
204
|
this.core.load(nextSource.source, nextSource.mimeType)
|
|
209
205
|
trace(`${T} retryPlayback loaded`, {
|
|
210
206
|
nextSource,
|