Skip to content

Commit 8a9b39a

Browse files
authored
Merge branch 'master' into issue/6088-cmcd-nor
2 parents a119cc6 + 6b2bb87 commit 8a9b39a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1108
-713
lines changed

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

Lines changed: 46 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export interface AbrComponentAPI extends ComponentAPI {
2525
// Warning: (ae-missing-release-tag) "AbrController" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
2626
//
2727
// @public (undocumented)
28-
export class AbrController implements AbrComponentAPI {
28+
export class AbrController extends Logger implements AbrComponentAPI {
2929
constructor(hls: Hls);
3030
// (undocumented)
3131
bwEstimator: EwmaBandWidthEstimator;
@@ -162,6 +162,8 @@ export class AudioStreamController extends BaseStreamController implements Netwo
162162
// (undocumented)
163163
onBufferReset(): void;
164164
// (undocumented)
165+
protected onError(event: Events.ERROR, data: ErrorData): void;
166+
// (undocumented)
165167
onFragBuffered(event: Events.FRAG_BUFFERED, data: FragBufferedData): void;
166168
// (undocumented)
167169
protected onHandlerDestroying(): void;
@@ -176,9 +178,13 @@ export class AudioStreamController extends BaseStreamController implements Netwo
176178
// (undocumented)
177179
protected onTickEnd(): void;
178180
// (undocumented)
181+
protected registerListeners(): void;
182+
// (undocumented)
179183
protected resetLoadingState(): void;
180184
// (undocumented)
181185
startLoad(startPosition: number): void;
186+
// (undocumented)
187+
protected unregisterListeners(): void;
182188
}
183189

184190
// Warning: (ae-missing-release-tag) "AudioTrackController" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -250,7 +256,7 @@ export interface BackBufferData {
250256
// Warning: (ae-missing-release-tag) "BasePlaylistController" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
251257
//
252258
// @public (undocumented)
253-
export class BasePlaylistController implements NetworkComponentAPI {
259+
export class BasePlaylistController extends Logger implements NetworkComponentAPI {
254260
constructor(hls: Hls, logPrefix: string);
255261
// (undocumented)
256262
protected canLoad: boolean;
@@ -265,8 +271,6 @@ export class BasePlaylistController implements NetworkComponentAPI {
265271
// (undocumented)
266272
protected loadPlaylist(hlsUrlParameters?: HlsUrlParameters): void;
267273
// (undocumented)
268-
protected log: (msg: any) => void;
269-
// (undocumented)
270274
protected playlistLoaded(index: number, data: LevelLoadedData | AudioTrackLoadedData | TrackLoadedData, previousDetails?: LevelDetails): void;
271275
// (undocumented)
272276
protected requestScheduled: number;
@@ -282,8 +286,6 @@ export class BasePlaylistController implements NetworkComponentAPI {
282286
protected switchParams(playlistUri: string, previous: LevelDetails | undefined): HlsUrlParameters | undefined;
283287
// (undocumented)
284288
protected timer: number;
285-
// (undocumented)
286-
protected warn: (msg: any) => void;
287289
}
288290

289291
// Warning: (ae-missing-release-tag) "BaseSegment" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -419,8 +421,6 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
419421
// (undocumented)
420422
protected _loadInitSegment(frag: Fragment, level: Level): void;
421423
// (undocumented)
422-
protected log: (msg: any) => void;
423-
// (undocumented)
424424
mapToInitFragWhenRequired(frag: Fragment | null): typeof frag;
425425
// (undocumented)
426426
protected media: HTMLMediaElement | null;
@@ -431,6 +431,8 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
431431
// (undocumented)
432432
protected nextLoadPosition: number;
433433
// (undocumented)
434+
protected onError(event: Events.ERROR, data: ErrorData): void;
435+
// (undocumented)
434436
protected onFragmentOrKeyLoadError(filterType: PlaylistLevelType, data: ErrorData): void;
435437
// (undocumented)
436438
protected onHandlerDestroyed(): void;
@@ -439,20 +441,18 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
439441
// (undocumented)
440442
protected onManifestLoaded(event: Events.MANIFEST_LOADED, data: ManifestLoadedData): void;
441443
// (undocumented)
444+
protected onManifestLoading(): void;
445+
// (undocumented)
442446
protected onMediaAttached(event: Events.MEDIA_ATTACHED, data: MediaAttachedData): void;
443447
// (undocumented)
444448
protected onMediaDetaching(): void;
445449
// (undocumented)
446-
protected onMediaEnded(): void;
450+
protected onMediaEnded: () => void;
447451
// (undocumented)
448-
protected onMediaSeeking(): void;
452+
protected onMediaSeeking: () => void;
449453
// (undocumented)
450454
protected onTickEnd(): void;
451455
// (undocumented)
452-
protected onvended: EventListener | null;
453-
// (undocumented)
454-
protected onvseeking: EventListener | null;
455-
// (undocumented)
456456
protected playlistType: PlaylistLevelType;
457457
// (undocumented)
458458
protected recoverWorkerError(data: ErrorData): void;
@@ -461,6 +461,8 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
461461
// (undocumented)
462462
protected reduceMaxBufferLength(threshold: number): boolean;
463463
// (undocumented)
464+
protected registerListeners(): void;
465+
// (undocumented)
464466
protected removeUnbufferedFrags(start?: number): void;
465467
// (undocumented)
466468
protected resetFragmentErrors(filterType: PlaylistLevelType): void;
@@ -504,9 +506,9 @@ export class BaseStreamController extends TaskLoop implements NetworkComponentAP
504506
// (undocumented)
505507
protected transmuxer: TransmuxerInterface | null;
506508
// (undocumented)
507-
protected waitForCdnTuneIn(details: LevelDetails): boolean | 0;
509+
protected unregisterListeners(): void;
508510
// (undocumented)
509-
protected warn: (msg: any) => void;
511+
protected waitForCdnTuneIn(details: LevelDetails): boolean | 0;
510512
}
511513

512514
// Warning: (ae-missing-release-tag) "BufferAppendedData" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -558,7 +560,7 @@ export interface BufferCodecsData {
558560
// Warning: (ae-missing-release-tag) "BufferController" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
559561
//
560562
// @public (undocumented)
561-
export class BufferController implements ComponentAPI {
563+
export class BufferController extends Logger implements ComponentAPI {
562564
constructor(hls: Hls);
563565
// (undocumented)
564566
protected appendChangeType(type: any, mimeType: any): void;
@@ -577,16 +579,12 @@ export class BufferController implements ComponentAPI {
577579
// (undocumented)
578580
destroy(): void;
579581
// (undocumented)
580-
protected error: (msg: any, obj?: any) => void;
581-
// (undocumented)
582582
flushBackBuffer(currentTime: number, targetDuration: number, targetBackBufferPosition: number): void;
583583
// (undocumented)
584584
flushFrontBuffer(currentTime: number, targetDuration: number, targetFrontBufferPosition: number): void;
585585
// (undocumented)
586586
hasSourceTypes(): boolean;
587587
// (undocumented)
588-
protected log: (msg: any) => void;
589-
// (undocumented)
590588
media: HTMLMediaElement | null;
591589
// (undocumented)
592590
mediaSource: MediaSource | null;
@@ -626,8 +624,6 @@ export class BufferController implements ComponentAPI {
626624
protected unregisterListeners(): void;
627625
// (undocumented)
628626
updateSeekableRange(levelDetails: any): void;
629-
// (undocumented)
630-
protected warn: (msg: any, obj?: any) => void;
631627
}
632628

633629
// Warning: (ae-missing-release-tag) "BufferControllerConfig" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
@@ -799,7 +795,7 @@ export interface ComponentAPI {
799795
// Warning: (ae-missing-release-tag) "ContentSteeringController" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
800796
//
801797
// @public (undocumented)
802-
export class ContentSteeringController implements NetworkComponentAPI {
798+
export class ContentSteeringController extends Logger implements NetworkComponentAPI {
803799
constructor(hls: Hls);
804800
// (undocumented)
805801
clearTimeout(): void;
@@ -926,7 +922,7 @@ export const enum ElementaryStreamTypes {
926922
// Warning: (ae-missing-release-tag) "EMEController" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
927923
//
928924
// @public
929-
export class EMEController implements ComponentAPI {
925+
export class EMEController extends Logger implements ComponentAPI {
930926
constructor(hls: Hls);
931927
// (undocumented)
932928
static CDMCleanupPromise: Promise<void> | void;
@@ -968,7 +964,7 @@ export const enum ErrorActionFlags {
968964
// Warning: (ae-missing-release-tag) "ErrorController" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
969965
//
970966
// @public (undocumented)
971-
export class ErrorController implements NetworkComponentAPI {
967+
export class ErrorController extends Logger implements NetworkComponentAPI {
972968
constructor(hls: Hls);
973969
// (undocumented)
974970
destroy(): void;
@@ -1608,6 +1604,7 @@ class Hls implements HlsEventEmitter {
16081604
// Warning: (ae-setter-with-docs) The doc comment for the property "loadLevel" must appear on the getter, not the setter.
16091605
set loadLevel(newLevel: number);
16101606
loadSource(url: string): void;
1607+
readonly logger: ILogger;
16111608
get lowLatencyMode(): boolean;
16121609
// Warning: (ae-setter-with-docs) The doc comment for the property "lowLatencyMode" must appear on the getter, not the setter.
16131610
set lowLatencyMode(mode: boolean);
@@ -2653,6 +2650,25 @@ export class LoadStats implements LoaderStats {
26532650
total: number;
26542651
}
26552652

2653+
// Warning: (ae-missing-release-tag) "Logger" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
2654+
//
2655+
// @public (undocumented)
2656+
export class Logger implements ILogger {
2657+
constructor(label: string, logger: ILogger);
2658+
// (undocumented)
2659+
debug: ILogFunction;
2660+
// (undocumented)
2661+
error: ILogFunction;
2662+
// (undocumented)
2663+
info: ILogFunction;
2664+
// (undocumented)
2665+
log: ILogFunction;
2666+
// (undocumented)
2667+
trace: ILogFunction;
2668+
// (undocumented)
2669+
warn: ILogFunction;
2670+
}
2671+
26562672
// Warning: (ae-missing-release-tag) "MainPlaylistType" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)
26572673
//
26582674
// @public (undocumented)
@@ -3211,7 +3227,11 @@ export class SubtitleStreamController extends BaseStreamController implements Ne
32113227
// (undocumented)
32123228
onSubtitleTrackSwitch(event: Events.SUBTITLE_TRACK_SWITCH, data: TrackSwitchedData): void;
32133229
// (undocumented)
3230+
protected registerListeners(): void;
3231+
// (undocumented)
32143232
startLoad(startPosition: number): void;
3233+
// (undocumented)
3234+
protected unregisterListeners(): void;
32153235
}
32163236

32173237
// Warning: (ae-missing-release-tag) "SubtitleTrackController" is part of the package's API, but it is missing a release tag (@alpha, @beta, @public, or @internal)

0 commit comments

Comments
 (0)