hls.js 1.5.5-0.canary.9997 → 1.5.5

package/src/controller/base-stream-controller.ts

@@ -1,15 +1,12 @@
 import TaskLoop from '../task-loop';
 import { FragmentState } from './fragment-tracker';
 import { Bufferable, BufferHelper, BufferInfo } from '../utils/buffer-helper';
+import { logger } from '../utils/logger';
 import { Events } from '../events';
 import { ErrorDetails, ErrorTypes } from '../errors';
 import { ChunkMetadata } from '../types/transmuxer';
 import { appendUint8Array } from '../utils/mp4-tools';
 import { alignStream } from '../utils/discontinuities';
-import {
-  isFullSegmentEncryption,
-  getAesModeFromFullSegmentMethod,
-} from '../utils/encryption-methods-util';
 import {
   findFragmentByPDT,
   findFragmentByPTS,
@@ -100,8 +97,12 @@ export default class BaseStreamController
   protected startFragRequested: boolean = false;
   protected decrypter: Decrypter;
   protected initPTS: RationalTimestamp[] = [];
-  protected buffering: boolean = true;
-  private loadingParts: boolean = false;
+  protected onvseeking: EventListener | null = null;
+  protected onvended: EventListener | null = null;
+
+  private readonly logPrefix: string = '';
+  protected log: (msg: any) => void;
+  protected warn: (msg: any) => void;
 
   constructor(
     hls: Hls,
@@ -110,32 +111,18 @@ export default class BaseStreamController
     logPrefix: string,
     playlistType: PlaylistLevelType,
   ) {
-    super(logPrefix, hls.logger);
+    super();
     this.playlistType = playlistType;
+    this.logPrefix = logPrefix;
+    this.log = logger.log.bind(logger, `${logPrefix}:`);
+    this.warn = logger.warn.bind(logger, `${logPrefix}:`);
     this.hls = hls;
     this.fragmentLoader = new FragmentLoader(hls.config);
     this.keyLoader = keyLoader;
     this.fragmentTracker = fragmentTracker;
     this.config = hls.config;
     this.decrypter = new Decrypter(hls.config);
-  }
-
-  protected registerListeners() {
-    const { hls } = this;
-    hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-    hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
     hls.on(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
-    hls.on(Events.ERROR, this.onError, this);
-  }
-
-  protected unregisterListeners() {
-    const { hls } = this;
-    hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-    hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.off(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
-    hls.off(Events.ERROR, this.onError, this);
   }
 
   protected doTick() {
@@ -163,14 +150,6 @@ export default class BaseStreamController
     this.state = State.STOPPED;
   }
 
-  public pauseBuffering() {
-    this.buffering = false;
-  }
-
-  public resumeBuffering() {
-    this.buffering = true;
-  }
-
   protected _streamEnded(
     bufferInfo: BufferInfo,
     levelDetails: LevelDetails,
@@ -218,8 +197,10 @@ export default class BaseStreamController
     data: MediaAttachedData,
   ) {
     const media = (this.media = this.mediaBuffer = data.media);
-    media.addEventListener('seeking', this.onMediaSeeking);
-    media.addEventListener('ended', this.onMediaEnded);
+    this.onvseeking = this.onMediaSeeking.bind(this) as EventListener;
+    this.onvended = this.onMediaEnded.bind(this) as EventListener;
+    media.addEventListener('seeking', this.onvseeking);
+    media.addEventListener('ended', this.onvended);
     const config = this.config;
     if (this.levels && config.autoStartLoad && this.state === State.STOPPED) {
       this.startLoad(config.startPosition);
@@ -234,9 +215,10 @@ export default class BaseStreamController
     }
 
     // remove video listeners
-    if (media) {
-      media.removeEventListener('seeking', this.onMediaSeeking);
-      media.removeEventListener('ended', this.onMediaEnded);
+    if (media && this.onvseeking && this.onvended) {
+      media.removeEventListener('seeking', this.onvseeking);
+      media.removeEventListener('ended', this.onvended);
+      this.onvseeking = this.onvended = null;
     }
     if (this.keyLoader) {
       this.keyLoader.detach();
@@ -247,11 +229,7 @@ export default class BaseStreamController
     this.stopLoad();
   }
 
-  protected onManifestLoading() {}
-
-  protected onError(event: Events.ERROR, data: ErrorData) {}
-
-  protected onMediaSeeking = () => {
+  protected onMediaSeeking() {
     const { config, fragCurrent, media, mediaBuffer, state } = this;
     const currentTime: number = media ? media.currentTime : 0;
     const bufferInfo = BufferHelper.bufferInfo(
@@ -305,21 +283,6 @@ export default class BaseStreamController
       );
 
       this.lastCurrentTime = currentTime;
-      if (!this.loadingParts) {
-        const bufferEnd = Math.max(bufferInfo.end, currentTime);
-        const shouldLoadParts = this.shouldLoadParts(
-          this.getLevelDetails(),
-          bufferEnd,
-        );
-        if (shouldLoadParts) {
-          this.log(
-            `LL-Part loading ON after seeking to ${currentTime.toFixed(
-              2,
-            )} with buffer @${bufferEnd.toFixed(2)}`,
-          );
-          this.loadingParts = shouldLoadParts;
-        }
-      }
     }
 
     // in case seeking occurs although no media buffered, adjust startPosition and nextLoadPosition to seek target
@@ -329,17 +292,12 @@ export default class BaseStreamController
 
     // Async tick to speed up processing
     this.tickImmediate();
-  };
+  }
 
-  protected onMediaEnded = () => {
+  protected onMediaEnded() {
     // reset startPosition and lastCurrentTime to restart playback @ stream beginning
     this.startPosition = this.lastCurrentTime = 0;
-    if (this.playlistType === PlaylistLevelType.MAIN) {
-      this.hls.trigger(Events.MEDIA_ENDED, {
-        stalled: false,
-      });
-    }
-  };
+  }
 
   protected onManifestLoaded(
     event: Events.MANIFEST_LOADED,
@@ -354,7 +312,7 @@ export default class BaseStreamController
     this.stopLoad();
     super.onHandlerDestroying();
     // @ts-ignore
-    this.hls = this.onMediaSeeking = this.onMediaEnded = null;
+    this.hls = null;
   }
 
   protected onHandlerDestroyed() {
@@ -528,7 +486,7 @@ export default class BaseStreamController
           payload.byteLength > 0 &&
           decryptData?.key &&
           decryptData.iv &&
-          isFullSegmentEncryption(decryptData.method)
+          decryptData.method === 'AES-128'
         ) {
           const startTime = self.performance.now();
           // decrypt init segment data
@@ -537,7 +495,6 @@ export default class BaseStreamController
               new Uint8Array(payload),
               decryptData.key.buffer,
               decryptData.iv.buffer,
-              getAesModeFromFullSegmentMethod(decryptData.method),
             )
             .catch((err) => {
               hls.trigger(Events.ERROR, {
@@ -692,7 +649,7 @@ export default class BaseStreamController
     if (frag.encrypted && !frag.decryptdata?.key) {
       this.log(
         `Loading key for ${frag.sn} of [${details.startSN}-${details.endSN}], ${
-          this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track'
+          this.logPrefix === '[stream-controller]' ? 'level' : 'track'
         } ${frag.level}`,
       );
       this.state = State.KEY_LOADING;
@@ -716,23 +673,8 @@ export default class BaseStreamController
       this.keyLoader.loadClear(frag, details.encryptedFragments);
     }
 
-    const fragPrevious = this.fragPrevious;
-    if (
-      frag.sn !== 'initSegment' &&
-      (!fragPrevious || frag.sn !== fragPrevious.sn)
-    ) {
-      const shouldLoadParts = this.shouldLoadParts(level.details, frag.end);
-      if (shouldLoadParts !== this.loadingParts) {
-        this.log(
-          `LL-Part loading ${
-            shouldLoadParts ? 'ON' : 'OFF'
-          } loading sn ${fragPrevious?.sn}->${frag.sn}`,
-        );
-        this.loadingParts = shouldLoadParts;
-      }
-    }
     targetBufferTime = Math.max(frag.start, targetBufferTime || 0);
-    if (this.loadingParts && frag.sn !== 'initSegment') {
+    if (this.config.lowLatencyMode && frag.sn !== 'initSegment') {
       const partList = details.partList;
       if (partList && progressCallback) {
         if (targetBufferTime > frag.end && details.fragmentHint) {
@@ -747,7 +689,7 @@ export default class BaseStreamController
             } of playlist [${details.startSN}-${
               details.endSN
             }] parts [0-${partIndex}-${partList.length - 1}] ${
-              this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track'
+              this.logPrefix === '[stream-controller]' ? 'level' : 'track'
             }: ${frag.level}, target: ${parseFloat(
               targetBufferTime.toFixed(3),
             )}`,
@@ -803,22 +745,10 @@ export default class BaseStreamController
       }
     }
 
-    if (frag.sn !== 'initSegment' && this.loadingParts) {
-      this.log(
-        `LL-Part loading OFF after next part miss @${targetBufferTime.toFixed(
-          2,
-        )}`,
-      );
-      this.loadingParts = false;
-    } else if (!frag.url) {
-      // Selected fragment hint for part but not loading parts
-      return Promise.resolve(null);
-    }
-
     this.log(
       `Loading fragment ${frag.sn} cc: ${frag.cc} ${
         details ? 'of [' + details.startSN + '-' + details.endSN + '] ' : ''
-      }${this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track'}: ${
+      }${this.logPrefix === '[stream-controller]' ? 'level' : 'track'}: ${
         frag.level
       }, target: ${parseFloat(targetBufferTime.toFixed(3))}`,
     );
@@ -942,50 +872,9 @@ export default class BaseStreamController
     if (part) {
       part.stats.parsing.end = now;
     }
-    // See if part loading should be disabled/enabled based on buffer and playback position.
-    if (frag.sn !== 'initSegment') {
-      const levelDetails = this.getLevelDetails();
-      const loadingPartsAtEdge = levelDetails && frag.sn > levelDetails.endSN;
-      const shouldLoadParts =
-        loadingPartsAtEdge || this.shouldLoadParts(levelDetails, frag.end);
-      if (shouldLoadParts !== this.loadingParts) {
-        this.log(
-          `LL-Part loading ${
-            shouldLoadParts ? 'ON' : 'OFF'
-          } after parsing segment ending @${frag.end.toFixed(2)}`,
-        );
-        this.loadingParts = shouldLoadParts;
-      }
-    }
-
     this.updateLevelTiming(frag, part, level, chunkMeta.partial);
   }
 
-  private shouldLoadParts(
-    details: LevelDetails | undefined,
-    bufferEnd: number,
-  ): boolean {
-    if (this.config.lowLatencyMode) {
-      if (!details) {
-        return this.loadingParts;
-      }
-      if (details?.partList) {
-        // Buffer must be ahead of first part + duration of parts after last segment
-        // and playback must be at or past segment adjacent to part list
-        const firstPart = details.partList[0];
-        const safePartStart =
-          firstPart.end + (details.fragmentHint?.duration || 0);
-        if (
-          bufferEnd >= safePartStart &&
-          this.lastCurrentTime > firstPart.start - firstPart.fragment.duration
-        ) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
   protected getCurrentContext(
     chunkMeta: ChunkMetadata,
   ): { frag: Fragment; part: Part | null; level: Level } | null {
@@ -1167,8 +1056,7 @@ export default class BaseStreamController
     // find fragment index, contiguous with end of buffer position
     const { config } = this;
     const start = fragments[0].start;
-    const canLoadParts = config.lowLatencyMode && !!levelDetails.partList;
-    let frag: Fragment | null = null;
+    let frag;
 
     if (levelDetails.live) {
       const initialLiveManifestSize = config.initialLiveManifestSize;
@@ -1188,10 +1076,6 @@ export default class BaseStreamController
           this.startPosition === -1) ||
         pos < start
       ) {
-        if (canLoadParts && !this.loadingParts) {
-          this.log(`LL-Part loading ON for initial live fragment`);
-          this.loadingParts = true;
-        }
         frag = this.getInitialLiveFragment(levelDetails, fragments);
         this.startPosition = this.nextLoadPosition = frag
           ? this.hls.liveSyncPosition || frag.start
@@ -1204,7 +1088,7 @@ export default class BaseStreamController
 
     // If we haven't run into any special cases already, just load the fragment most closely matching the requested position
     if (!frag) {
-      const end = this.loadingParts
+      const end = config.lowLatencyMode
         ? levelDetails.partEnd
         : levelDetails.fragmentEnd;
       frag = this.getFragmentAtPosition(pos, end, levelDetails);
@@ -1387,7 +1271,7 @@ export default class BaseStreamController
     const partList = levelDetails.partList;
 
     const loadingParts = !!(
-      this.loadingParts &&
+      config.lowLatencyMode &&
       partList?.length &&
       fragmentHint
     );
@@ -1666,7 +1550,7 @@ export default class BaseStreamController
           errorAction.resolved = true;
         }
       } else {
-        this.warn(
+        logger.warn(
           `${data.details} reached or exceeded max retry (${retryCount})`,
         );
         return;

package/src/controller/buffer-controller.ts

@@ -1,5 +1,5 @@
 import { Events } from '../events';
-import { Logger } from '../utils/logger';
+import { logger } from '../utils/logger';
 import { ErrorDetails, ErrorTypes } from '../errors';
 import { BufferHelper } from '../utils/buffer-helper';
 import {
@@ -42,7 +42,7 @@ interface BufferedChangeEvent extends Event {
   readonly removedRanges?: TimeRanges;
 }
 
-export default class BufferController extends Logger implements ComponentAPI {
+export default class BufferController implements ComponentAPI {
   // The level details used to determine duration, target-duration and live
   private details: LevelDetails | null = null;
   // cache the self generated object url to detect hijack of video tag
@@ -82,10 +82,17 @@ export default class BufferController extends Logger implements ComponentAPI {
   public pendingTracks: TrackSet = {};
   public sourceBuffer!: SourceBuffers;
 
+  protected log: (msg: any) => void;
+  protected warn: (msg: any, obj?: any) => void;
+  protected error: (msg: any, obj?: any) => void;
+
   constructor(hls: Hls) {
-    super('buffer-controller', hls.logger);
     this.hls = hls;
+    const logPrefix = '[buffer-controller]';
     this.appendSource = hls.config.preferManagedMediaSource;
+    this.log = logger.log.bind(logger, logPrefix);
+    this.warn = logger.warn.bind(logger, logPrefix);
+    this.error = logger.error.bind(logger, logPrefix);
     this._initSourceBuffer();
     this.registerListeners();
   }
@@ -103,12 +110,6 @@ export default class BufferController extends Logger implements ComponentAPI {
     this.lastMpegAudioChunk = null;
     // @ts-ignore
     this.hls = null;
-    // @ts-ignore
-    this._onMediaSourceOpen = this._onMediaSourceClose = null;
-    // @ts-ignore
-    this._onMediaSourceEnded = null;
-    // @ts-ignore
-    this._onStartStreaming = this._onEndStreaming = null;
   }
 
   protected registerListeners() {
@@ -295,7 +296,6 @@ export default class BufferController extends Logger implements ComponentAPI {
       this.resetBuffer(type);
     });
     this._initSourceBuffer();
-    this.hls.resumeBuffering();
   }
 
   private resetBuffer(type: SourceBufferName) {
@@ -1004,7 +1004,7 @@ export default class BufferController extends Logger implements ComponentAPI {
   private _onMediaEmptied = () => {
     const { mediaSrc, _objectUrl } = this;
     if (mediaSrc !== _objectUrl) {
-      this.error(
+      logger.error(
         `Media element src was set while attaching MediaSource (${_objectUrl} > ${mediaSrc})`,
       );
     }

package/src/controller/cap-level-controller.ts

@@ -12,6 +12,7 @@ import type {
   LevelsUpdatedData,
 } from '../types/events';
 import StreamController from './stream-controller';
+import { logger } from '../utils/logger';
 import type { ComponentAPI } from '../types/component-api';
 import type Hls from '../hls';
 
@@ -151,7 +152,7 @@ class CapLevelController implements ComponentAPI {
         const hls = this.hls;
         const maxLevel = this.getMaxLevel(levels.length - 1);
         if (maxLevel !== this.autoLevelCapping) {
-          hls.logger.log(
+          logger.log(
             `Setting autoLevelCapping to ${maxLevel}: ${levels[maxLevel].height}p@${levels[maxLevel].bitrate} for media ${this.mediaWidth}x${this.mediaHeight}`,
           );
         }

package/src/controller/cmcd-controller.ts

@@ -5,9 +5,9 @@ import { CmcdObjectType } from '@svta/common-media-library/cmcd/CmcdObjectType';
 import { CmcdStreamingFormat } from '@svta/common-media-library/cmcd/CmcdStreamingFormat';
 import { appendCmcdHeaders } from '@svta/common-media-library/cmcd/appendCmcdHeaders';
 import { appendCmcdQuery } from '@svta/common-media-library/cmcd/appendCmcdQuery';
-import type { CmcdEncodeOptions } from '@svta/common-media-library/cmcd/CmcdEncodeOptions';
 import { uuid } from '@svta/common-media-library/utils/uuid';
 import { BufferHelper } from '../utils/buffer-helper';
+import { logger } from '../utils/logger';
 import type { ComponentAPI } from '../types/component-api';
 import type { Fragment } from '../loader/fragment';
 import type { BufferCreatedData, MediaAttachedData } from '../types/events';
@@ -165,7 +165,7 @@ export default class CMCDController implements ComponentAPI {
       data.su = this.buffering;
     }
 
-    // TODO: Implement rtp, nrr, dl
+    // TODO: Implement rtp, nrr, nor, dl
 
     const { includeKeys } = this;
     if (includeKeys) {
@@ -175,18 +175,14 @@ export default class CMCDController implements ComponentAPI {
       }, {});
     }
 
-    const options: CmcdEncodeOptions = {
-      baseUrl: context.url,
-    };
-
     if (this.useHeaders) {
       if (!context.headers) {
         context.headers = {};
       }
 
-      appendCmcdHeaders(context.headers, data, options);
+      appendCmcdHeaders(context.headers, data);
     } else {
-      context.url = appendCmcdQuery(context.url, data, options);
+      context.url = appendCmcdQuery(context.url, data);
     }
   }
 
@@ -200,7 +196,7 @@ export default class CMCDController implements ComponentAPI {
         su: !this.initialized,
       });
     } catch (error) {
-      this.hls.logger.warn('Could not generate manifest CMCD data.', error);
+      logger.warn('Could not generate manifest CMCD data.', error);
     }
   };
 
@@ -227,29 +223,12 @@ export default class CMCDController implements ComponentAPI {
         data.bl = this.getBufferLength(ot);
       }
 
-      const next = this.getNextFrag(fragment);
-      if (next) {
-        if (next.url && next.url !== fragment.url) {
-          data.nor = next.url;
-        }
-      }
-
       this.apply(context, data);
     } catch (error) {
-      this.hls.logger.warn('Could not generate segment CMCD data.', error);
+      logger.warn('Could not generate segment CMCD data.', error);
     }
   };
 
-  private getNextFrag(fragment: Fragment): Fragment | undefined {
-    const levelDetails = this.hls.levels[fragment.level]?.details;
-    if (levelDetails) {
-      const index = (fragment.sn as number) - levelDetails.startSN;
-      return levelDetails.fragments[index + 1];
-    }
-
-    return undefined;
-  }
-
   /**
    * The CMCD object type.
    */

package/src/controller/content-steering-controller.ts

@@ -3,7 +3,7 @@ import { Level } from '../types/level';
 import { reassignFragmentLevelIndexes } from '../utils/level-helper';
 import { AttrList } from '../utils/attr-list';
 import { ErrorActionFlags, NetworkErrorAction } from './error-controller';
-import { Logger } from '../utils/logger';
+import { logger } from '../utils/logger';
 import {
   PlaylistContextType,
   type Loader,
@@ -48,11 +48,9 @@ export type UriReplacement = {
 
 const PATHWAY_PENALTY_DURATION_MS = 300000;
 
-export default class ContentSteeringController
-  extends Logger
-  implements NetworkComponentAPI
-{
+export default class ContentSteeringController implements NetworkComponentAPI {
   private readonly hls: Hls;
+  private log: (msg: any) => void;
   private loader: Loader<LoaderContext> | null = null;
   private uri: string | null = null;
   private pathwayId: string = '.';
@@ -68,8 +66,8 @@ export default class ContentSteeringController
   private penalizedPathways: { [pathwayId: string]: number } = {};
 
   constructor(hls: Hls) {
-    super('content-steering', hls.logger);
     this.hls = hls;
+    this.log = logger.log.bind(logger, `[content-steering]:`);
     this.registerListeners();
   }
 
@@ -205,7 +203,7 @@ export default class ContentSteeringController
         errorAction.resolved = this.pathwayId !== errorPathway;
       }
       if (!errorAction.resolved) {
-        this.warn(
+        logger.warn(
           `Could not resolve ${data.details} ("${
             data.error.message
           }") with content-steering for Pathway: ${errorPathway} levels: ${
@@ -444,7 +442,7 @@ export default class ContentSteeringController
       ) => {
         this.log(`Loaded steering manifest: "${url}"`);
         const steeringData = response.data as SteeringManifest;
-        if (steeringData?.VERSION !== 1) {
+        if (steeringData.VERSION !== 1) {
           this.log(`Steering VERSION ${steeringData.VERSION} not supported!`);
           return;
         }

package/src/controller/eme-controller.ts

@@ -5,7 +5,7 @@
  */
 import { Events } from '../events';
 import { ErrorTypes, ErrorDetails } from '../errors';
-import { Logger } from '../utils/logger';
+import { logger } from '../utils/logger';
 import {
   getKeySystemsForConfig,
   getSupportedMediaKeySystemConfigurations,
@@ -41,6 +41,9 @@ import type {
   LoaderConfiguration,
   LoaderContext,
 } from '../types/loader';
+
+const LOGGER_PREFIX = '[eme]';
+
 interface KeySystemAccessPromises {
   keySystemAccess: Promise<MediaKeySystemAccess>;
   mediaKeys?: Promise<MediaKeys>;
@@ -65,7 +68,7 @@ export interface MediaKeySessionContext {
  * @class
  * @constructor
  */
-class EMEController extends Logger implements ComponentAPI {
+class EMEController implements ComponentAPI {
   public static CDMCleanupPromise: Promise<void> | void;
 
   private readonly hls: Hls;
@@ -87,9 +90,15 @@ class EMEController extends Logger implements ComponentAPI {
   private setMediaKeysQueue: Promise<void>[] = EMEController.CDMCleanupPromise
     ? [EMEController.CDMCleanupPromise]
     : [];
+  private onMediaEncrypted = this._onMediaEncrypted.bind(this);
+  private onWaitingForKey = this._onWaitingForKey.bind(this);
+
+  private debug: (msg: any) => void = logger.debug.bind(logger, LOGGER_PREFIX);
+  private log: (msg: any) => void = logger.log.bind(logger, LOGGER_PREFIX);
+  private warn: (msg: any) => void = logger.warn.bind(logger, LOGGER_PREFIX);
+  private error: (msg: any) => void = logger.error.bind(logger, LOGGER_PREFIX);
 
   constructor(hls: Hls) {
-    super('eme', hls.logger);
     this.hls = hls;
     this.config = hls.config;
     this.registerListeners();
@@ -104,9 +113,13 @@ class EMEController extends Logger implements ComponentAPI {
     config.licenseXhrSetup = config.licenseResponseCallback = undefined;
     config.drmSystems = config.drmSystemOptions = {};
     // @ts-ignore
-    this.hls = this.config = this.keyIdToKeySessionPromise = null;
+    this.hls =
+      this.onMediaEncrypted =
+      this.onWaitingForKey =
+      this.keyIdToKeySessionPromise =
+        null as any;
     // @ts-ignore
-    this.onMediaEncrypted = this.onWaitingForKey = null;
+    this.config = null;
   }
 
   private registerListeners() {
@@ -510,7 +523,7 @@ class EMEController extends Logger implements ComponentAPI {
     return this.attemptKeySystemAccess(keySystemsToAttempt);
   }
 
-  private onMediaEncrypted = (event: MediaEncryptedEvent) => {
+  private _onMediaEncrypted(event: MediaEncryptedEvent) {
     const { initDataType, initData } = event;
     this.debug(`"${event.type}" event: init data type: "${initDataType}"`);
 
@@ -626,11 +639,11 @@ class EMEController extends Logger implements ComponentAPI {
         );
     }
     keySessionContextPromise.catch((error) => this.handleError(error));
-  };
+  }
 
-  private onWaitingForKey = (event: Event) => {
+  private _onWaitingForKey(event: Event) {
     this.log(`"${event.type}" event`);
-  };
+  }
 
   private attemptSetMediaKeys(
     keySystem: KeySystems,

package/src/controller/error-controller.ts

@@ -8,7 +8,7 @@ import {
 } from '../utils/error-helper';
 import { findFragmentByPTS } from './fragment-finders';
 import { HdcpLevel, HdcpLevels } from '../types/level';
-import { Logger } from '../utils/logger';
+import { logger } from '../utils/logger';
 import type Hls from '../hls';
 import type { RetryConfig } from '../config';
 import type { NetworkComponentAPI } from '../types/component-api';
@@ -50,17 +50,19 @@ type PenalizedRendition = {
 
 type PenalizedRenditions = { [key: number]: PenalizedRendition };
 
-export default class ErrorController
-  extends Logger
-  implements NetworkComponentAPI
-{
+export default class ErrorController implements NetworkComponentAPI {
   private readonly hls: Hls;
   private playlistError: number = 0;
   private penalizedRenditions: PenalizedRenditions = {};
+  private log: (msg: any) => void;
+  private warn: (msg: any) => void;
+  private error: (msg: any) => void;
 
   constructor(hls: Hls) {
-    super('error-controller', hls.logger);
     this.hls = hls;
+    this.log = logger.log.bind(logger, `[info]:`);
+    this.warn = logger.warn.bind(logger, `[warning]:`);
+    this.error = logger.error.bind(logger, `[error]:`);
     this.registerListeners();
   }