hls.js 1.5.2-0.canary.9934 → 1.5.3

package/package.json

@@ -67,10 +67,10 @@
     "@babel/plugin-proposal-object-rest-spread": "7.20.7",
     "@babel/plugin-proposal-optional-chaining": "7.21.0",
     "@babel/plugin-transform-object-assign": "7.23.3",
-    "@babel/preset-env": "7.23.8",
+    "@babel/preset-env": "7.23.7",
     "@babel/preset-typescript": "7.23.3",
     "@babel/register": "7.23.7",
-    "@microsoft/api-documenter": "7.23.19",
+    "@microsoft/api-documenter": "7.23.16",
     "@microsoft/api-extractor": "7.39.1",
     "@rollup/plugin-alias": "5.1.0",
     "@rollup/plugin-babel": "6.0.4",
@@ -78,19 +78,19 @@
     "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/plugin-replace": "5.0.5",
     "@rollup/plugin-terser": "0.4.4",
-    "@rollup/plugin-typescript": "11.1.6",
-    "@svta/common-media-library": "0.6.2",
+    "@rollup/plugin-typescript": "11.1.5",
+    "@svta/common-media-library": "0.6.1",
     "@types/chai": "4.3.11",
     "@types/chart.js": "2.9.41",
     "@types/mocha": "10.0.6",
     "@types/sinon-chai": "3.2.12",
-    "@typescript-eslint/eslint-plugin": "6.19.1",
-    "@typescript-eslint/parser": "6.19.1",
+    "@typescript-eslint/eslint-plugin": "6.17.0",
+    "@typescript-eslint/parser": "6.17.0",
     "babel-loader": "9.1.3",
     "babel-plugin-transform-remove-console": "6.9.4",
-    "chai": "4.4.1",
+    "chai": "4.3.10",
     "chart.js": "2.9.4",
-    "chromedriver": "120.0.2",
+    "chromedriver": "120.0.1",
     "doctoc": "2.2.1",
     "es-check": "7.1.1",
     "eslint": "8.56.0",
@@ -119,7 +119,7 @@
     "npm-run-all": "4.1.5",
     "prettier": "3.1.1",
     "promise-polyfill": "8.3.0",
-    "rollup": "4.9.6",
+    "rollup": "4.9.4",
     "rollup-plugin-istanbul": "5.0.0",
     "sauce-connect-launcher": "1.3.2",
     "selenium-webdriver": "4.16.0",
@@ -128,7 +128,7 @@
     "sinon-chai": "3.7.0",
     "typescript": "5.3.3",
     "url-toolkit": "2.2.5",
-    "wrangler": "3.24.0"
+    "wrangler": "3.22.4"
   },
-  "version": "1.5.2-0.canary.9934"
+  "version": "1.5.3"
 }

package/src/config.ts

@@ -17,10 +17,10 @@ import XhrLoader from './utils/xhr-loader';
 import FetchLoader, { fetchSupported } from './utils/fetch-loader';
 import Cues from './utils/cues';
 import { requestMediaKeySystemAccess } from './utils/mediakeys-helper';
+import { ILogger, logger } from './utils/logger';
 
 import type Hls from './hls';
 import type { CuesInterface } from './utils/cues';
-import type { ILogger } from './utils/logger';
 import type { MediaKeyFunc, KeySystems } from './utils/mediakeys-helper';
 import type {
   FragmentLoaderContext,
@@ -558,7 +558,6 @@ function timelineConfig(): TimelineControllerConfig {
 export function mergeConfig(
   defaultConfig: HlsConfig,
   userConfig: Partial<HlsConfig>,
-  logger: ILogger,
 ): HlsConfig {
   if (
     (userConfig.liveSyncDurationCount ||
@@ -665,7 +664,7 @@ function deepCpy(obj: any): any {
 /**
  * @ignore
  */
-export function enableStreamingMode(config: HlsConfig, logger: ILogger) {
+export function enableStreamingMode(config) {
   const currentLoader = config.loader;
   if (currentLoader !== FetchLoader && currentLoader !== XhrLoader) {
     // If a developer has configured their own loader, respect that choice

package/src/controller/abr-controller.ts

@@ -2,7 +2,7 @@ import EwmaBandWidthEstimator from '../utils/ewma-bandwidth-estimator';
 import { Events } from '../events';
 import { ErrorDetails } from '../errors';
 import { PlaylistLevelType } from '../types/loader';
-import { Logger } from '../utils/logger';
+import { logger } from '../utils/logger';
 import {
   SUPPORTED_INFO_DEFAULT,
   getMediaDecodingInfoPromise,
@@ -31,7 +31,7 @@ import type {
 } from '../types/events';
 import type { AbrComponentAPI } from '../types/component-api';
 
-class AbrController extends Logger implements AbrComponentAPI {
+class AbrController implements AbrComponentAPI {
   protected hls: Hls;
   private lastLevelLoadSec: number = 0;
   private lastLoadedFragLevel: number = -1;
@@ -48,7 +48,6 @@ class AbrController extends Logger implements AbrComponentAPI {
   public bwEstimator: EwmaBandWidthEstimator;
 
   constructor(hls: Hls) {
-    super('abr', hls.logger);
     this.hls = hls;
     this.bwEstimator = this.initEstimator();
     this.registerListeners();
@@ -56,7 +55,7 @@ class AbrController extends Logger implements AbrComponentAPI {
 
   public resetEstimator(abrEwmaDefaultEstimate?: number) {
     if (abrEwmaDefaultEstimate) {
-      this.log(`setting initial bwe to ${abrEwmaDefaultEstimate}`);
+      logger.log(`setting initial bwe to ${abrEwmaDefaultEstimate}`);
       this.hls.config.abrEwmaDefaultEstimate = abrEwmaDefaultEstimate;
     }
     this.firstSelection = -1;
@@ -356,7 +355,7 @@ class AbrController extends Logger implements AbrComponentAPI {
     }
 
     this.clearTimer();
-    this.warn(`Fragment ${frag.sn}${
+    logger.warn(`[abr] Fragment ${frag.sn}${
       part ? ' part ' + part.index : ''
     } of level ${frag.level} is loading too slowly;
       Time to underbuffer: ${bufferStarvationDelay.toFixed(3)} s
@@ -480,8 +479,8 @@ class AbrController extends Logger implements AbrComponentAPI {
     }
     const firstLevel = this.hls.firstLevel;
     const clamped = Math.min(Math.max(firstLevel, minAutoLevel), maxAutoLevel);
-    this.warn(
-      `Could not find best starting auto level. Defaulting to first in playlist ${firstLevel} clamped to ${clamped}`,
+    logger.warn(
+      `[abr] Could not find best starting auto level. Defaulting to first in playlist ${firstLevel} clamped to ${clamped}`,
     );
     return clamped;
   }
@@ -592,8 +591,8 @@ class AbrController extends Logger implements AbrComponentAPI {
           ? Math.min(currentFragDuration, config.maxLoadingDelay)
           : config.maxLoadingDelay;
         maxStarvationDelay = maxLoadingDelay - bitrateTestDelay;
-        this.info(
-          `bitrate test took ${Math.round(
+        logger.info(
+          `[abr] bitrate test took ${Math.round(
             1000 * bitrateTestDelay,
           )}ms, set first fragment max fetchDuration to ${Math.round(
             1000 * maxStarvationDelay,
@@ -612,8 +611,8 @@ class AbrController extends Logger implements AbrComponentAPI {
       bwFactor,
       bwUpFactor,
     );
-    this.info(
-      `${
+    logger.info(
+      `[abr] ${
         bufferStarvationDelay ? 'rebuffering expected' : 'buffer is empty'
       }, optimal quality level ${bestLevel}`,
     );
@@ -692,7 +691,7 @@ class AbrController extends Logger implements AbrComponentAPI {
         : videoRanges[0];
       currentFrameRate = minFramerate;
       currentBw = Math.max(currentBw, minBitrate);
-      this.log(`picked start tier ${JSON.stringify(startTier)}`);
+      logger.log(`[abr] picked start tier ${JSON.stringify(startTier)}`);
     } else {
       currentCodecSet = level?.codecSet;
       currentVideoRange = level?.videoRange;
@@ -742,19 +741,19 @@ class AbrController extends Logger implements AbrComponentAPI {
             const levels = this.hls.levels;
             const index = levels.indexOf(levelInfo);
             if (decodingInfo.error) {
-              this.warn(
-                `MediaCapabilities decodingInfo error: "${
+              logger.warn(
+                `[abr] MediaCapabilities decodingInfo error: "${
                   decodingInfo.error
                 }" for level ${index} ${JSON.stringify(decodingInfo)}`,
               );
             } else if (!decodingInfo.supported) {
-              this.warn(
-                `Unsupported MediaCapabilities decodingInfo result for level ${index} ${JSON.stringify(
+              logger.warn(
+                `[abr] Unsupported MediaCapabilities decodingInfo result for level ${index} ${JSON.stringify(
                   decodingInfo,
                 )}`,
               );
               if (index > -1 && levels.length > 1) {
-                this.log(`Removing unsupported level ${index}`);
+                logger.log(`[abr] Removing unsupported level ${index}`);
                 this.hls.removeLevel(index);
               }
             }
@@ -773,7 +772,8 @@ class AbrController extends Logger implements AbrComponentAPI {
         (!upSwitch &&
           currentFrameRate > 0 &&
           currentFrameRate < levelInfo.frameRate) ||
-        !levelInfo.supportedResult?.decodingInfoResults?.[0].smooth
+        (levelInfo.supportedResult &&
+          !levelInfo.supportedResult.decodingInfoResults?.[0].smooth)
       ) {
         levelsSkipped.push(i);
         continue;
@@ -832,8 +832,8 @@ class AbrController extends Logger implements AbrComponentAPI {
           (forcedAutoLevel === -1 || forcedAutoLevel !== loadLevel)
         ) {
           if (levelsSkipped.length) {
-            this.trace(
-              `Skipped level(s) ${levelsSkipped.join(
+            logger.trace(
+              `[abr] Skipped level(s) ${levelsSkipped.join(
                 ',',
               )} of ${maxAutoLevel} max with CODECS and VIDEO-RANGE:"${
                 levels[levelsSkipped[0]].codecs
@@ -842,8 +842,8 @@ class AbrController extends Logger implements AbrComponentAPI {
               }" ${currentVideoRange}`,
             );
           }
-          this.info(
-            `switch candidate:${selectionBaseLevel}->${i} adjustedbw(${Math.round(
+          logger.info(
+            `[abr] switch candidate:${selectionBaseLevel}->${i} adjustedbw(${Math.round(
               adjustedbw,
             )})-bitrate=${Math.round(
               adjustedbw - bitrate,

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

@@ -71,27 +71,30 @@ class AudioStreamController
       hls,
       fragmentTracker,
       keyLoader,
-      'audio-stream-controller',
+      '[audio-stream-controller]',
       PlaylistLevelType.AUDIO,
     );
-    this.registerListeners();
+    this._registerListeners();
   }
 
   protected onHandlerDestroying() {
-    this.unregisterListeners();
+    this._unregisterListeners();
     super.onHandlerDestroying();
     this.mainDetails = null;
     this.bufferedTrack = null;
     this.switchingTrack = null;
   }
 
-  protected registerListeners() {
-    super.registerListeners();
+  private _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.LEVEL_LOADED, this.onLevelLoaded, this);
     hls.on(Events.AUDIO_TRACKS_UPDATED, this.onAudioTracksUpdated, this);
     hls.on(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
     hls.on(Events.AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
+    hls.on(Events.ERROR, this.onError, this);
     hls.on(Events.BUFFER_RESET, this.onBufferReset, this);
     hls.on(Events.BUFFER_CREATED, this.onBufferCreated, this);
     hls.on(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
@@ -100,16 +103,16 @@ class AudioStreamController
     hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
   }
 
-  protected unregisterListeners() {
+  private _unregisterListeners() {
     const { hls } = this;
-    if (!hls) {
-      return;
-    }
-    super.unregisterListeners();
+    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.LEVEL_LOADED, this.onLevelLoaded, this);
     hls.off(Events.AUDIO_TRACKS_UPDATED, this.onAudioTracksUpdated, this);
     hls.off(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
     hls.off(Events.AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
+    hls.off(Events.ERROR, this.onError, this);
     hls.off(Events.BUFFER_RESET, this.onBufferReset, this);
     hls.off(Events.BUFFER_CREATED, this.onBufferCreated, this);
     hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
@@ -710,7 +713,7 @@ class AudioStreamController
     this.fragBufferedComplete(frag, part);
   }
 
-  protected onError(event: Events.ERROR, data: ErrorData) {
+  private onError(event: Events.ERROR, data: ErrorData) {
     if (data.fatal) {
       this.state = State.ERROR;
       return;

package/src/controller/audio-track-controller.ts

@@ -33,7 +33,7 @@ class AudioTrackController extends BasePlaylistController {
   private selectDefaultTrack: boolean = true;
 
   constructor(hls: Hls) {
-    super(hls, 'audio-track-controller');
+    super(hls, '[audio-track-controller]');
     this.registerListeners();
   }
 

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

@@ -5,7 +5,7 @@ import { computeReloadInterval, mergeDetails } from '../utils/level-helper';
 import { ErrorData } from '../types/events';
 import { getRetryDelay, isTimeoutError } from '../utils/error-helper';
 import { NetworkErrorAction } from './error-controller';
-import { Logger } from '../utils/logger';
+import { logger } from '../utils/logger';
 import type { LevelDetails } from '../loader/level-details';
 import type { MediaPlaylist } from '../types/media-playlist';
 import type {
@@ -14,17 +14,17 @@ import type {
   TrackLoadedData,
 } from '../types/events';
 
-export default class BasePlaylistController
-  extends Logger
-  implements NetworkComponentAPI
-{
+export default class BasePlaylistController implements NetworkComponentAPI {
   protected hls: Hls;
   protected timer: number = -1;
   protected requestScheduled: number = -1;
   protected canLoad: boolean = false;
+  protected log: (msg: any) => void;
+  protected warn: (msg: any) => void;
 
   constructor(hls: Hls, logPrefix: string) {
-    super(logPrefix, hls.logger);
+    this.log = logger.log.bind(logger, `${logPrefix}:`);
+    this.warn = logger.warn.bind(logger, `${logPrefix}:`);
     this.hls = hls;
   }
 
@@ -65,7 +65,7 @@ export default class BasePlaylistController
         try {
           uri = new self.URL(attr.URI, previous.url).href;
         } catch (error) {
-          this.warn(
+          logger.warn(
             `Could not construct new URL for Rendition Report: ${error}`,
           );
           uri = attr.URI || '';

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,6 +97,12 @@ export default class BaseStreamController
   protected startFragRequested: boolean = false;
   protected decrypter: Decrypter;
   protected initPTS: RationalTimestamp[] = [];
+  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,
@@ -108,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() {
@@ -208,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);
@@ -224,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();
@@ -237,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(
@@ -304,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,
@@ -329,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() {
@@ -503,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
@@ -512,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, {
@@ -667,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;
@@ -707,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),
             )}`,
@@ -766,7 +748,7 @@ export default class BaseStreamController
     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))}`,
     );
@@ -1568,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() {
@@ -1003,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,7 +5,6 @@ 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';
@@ -166,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) {
@@ -176,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);
     }
   }
 
@@ -228,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) {
       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.
    */