hls.js 1.5.2-0.canary.9924 → 1.5.2

package/src/hls.ts

@@ -8,7 +8,7 @@ import KeyLoader from './loader/key-loader';
 import StreamController from './controller/stream-controller';
 import { isMSESupported, isSupported } from './is-supported';
 import { getMediaSource } from './utils/mediasource-helper';
-import { enableLogs, type ILogger } from './utils/logger';
+import { logger, enableLogs } from './utils/logger';
 import { enableStreamingMode, hlsDefaultConfig, mergeConfig } from './config';
 import { EventEmitter } from 'eventemitter3';
 import { Events } from './events';
@@ -59,11 +59,6 @@ export default class Hls implements HlsEventEmitter {
    */
   public readonly userConfig: Partial<HlsConfig>;
 
-  /**
-   * The logger functions used by this player instance, configured on player instantiation.
-   */
-  public readonly logger: ILogger;
-
   private coreComponents: ComponentAPI[];
   private networkControllers: NetworkComponentAPI[];
   private started: boolean = false;
@@ -147,19 +142,12 @@ export default class Hls implements HlsEventEmitter {
    * @param userConfig - Configuration options applied over `Hls.DefaultConfig`
    */
   constructor(userConfig: Partial<HlsConfig> = {}) {
-    const logger = (this.logger = enableLogs(
-      userConfig.debug || false,
-      'Hls instance',
-    ));
-    const config = (this.config = mergeConfig(
-      Hls.DefaultConfig,
-      userConfig,
-      logger,
-    ));
+    enableLogs(userConfig.debug || false, 'Hls instance');
+    const config = (this.config = mergeConfig(Hls.DefaultConfig, userConfig));
     this.userConfig = userConfig;
 
     if (config.progressive) {
-      enableStreamingMode(config, logger);
+      enableStreamingMode(config);
     }
 
     // core controllers and network loaders
@@ -332,7 +320,7 @@ export default class Hls implements HlsEventEmitter {
       try {
         return this.emit(event, event, eventObject);
       } catch (error) {
-        this.logger.error(
+        logger.error(
           'An internal error happened while handling event ' +
             event +
             '. Error message: "' +
@@ -366,7 +354,7 @@ export default class Hls implements HlsEventEmitter {
    * Dispose of the instance
    */
   destroy() {
-    this.logger.log('destroy');
+    logger.log('destroy');
     this.trigger(Events.DESTROYING, undefined);
     this.detachMedia();
     this.removeAllListeners();
@@ -389,7 +377,7 @@ export default class Hls implements HlsEventEmitter {
    * Attaches Hls.js to a media element
    */
   attachMedia(media: HTMLMediaElement) {
-    this.logger.log('attachMedia');
+    logger.log('attachMedia');
     this._media = media;
     this.trigger(Events.MEDIA_ATTACHING, { media: media });
   }
@@ -398,7 +386,7 @@ export default class Hls implements HlsEventEmitter {
    * Detach Hls.js from the media
    */
   detachMedia() {
-    this.logger.log('detachMedia');
+    logger.log('detachMedia');
     this.trigger(Events.MEDIA_DETACHING, undefined);
     this._media = null;
   }
@@ -419,7 +407,7 @@ export default class Hls implements HlsEventEmitter {
     ));
     this._autoLevelCapping = -1;
     this._maxHdcpLevel = null;
-    this.logger.log(`loadSource:${loadingSource}`);
+    logger.log(`loadSource:${loadingSource}`);
     if (
       media &&
       loadedSource &&
@@ -440,7 +428,7 @@ export default class Hls implements HlsEventEmitter {
    * Defaults to -1 (None: starts from earliest point)
    */
   startLoad(startPosition: number = -1) {
-    this.logger.log(`startLoad(${startPosition})`);
+    logger.log(`startLoad(${startPosition})`);
     this.started = true;
     this.networkControllers.forEach((controller) => {
       controller.startLoad(startPosition);
@@ -451,7 +439,7 @@ export default class Hls implements HlsEventEmitter {
    * Stop loading of any stream data.
    */
   stopLoad() {
-    this.logger.log('stopLoad');
+    logger.log('stopLoad');
     this.started = false;
     this.networkControllers.forEach((controller) => {
       controller.stopLoad();
@@ -487,7 +475,7 @@ export default class Hls implements HlsEventEmitter {
    * Swap through possible audio codecs in the stream (for example to switch from stereo to 5.1)
    */
   swapAudioCodec() {
-    this.logger.log('swapAudioCodec');
+    logger.log('swapAudioCodec');
     this.streamController.swapAudioCodec();
   }
 
@@ -498,7 +486,7 @@ export default class Hls implements HlsEventEmitter {
    * Automatic recovery of media-errors by this process is configurable.
    */
   recoverMediaError() {
-    this.logger.log('recoverMediaError');
+    logger.log('recoverMediaError');
     const media = this._media;
     this.detachMedia();
     if (media) {
@@ -529,7 +517,7 @@ export default class Hls implements HlsEventEmitter {
    * Set quality level index immediately. This will flush the current buffer to replace the quality asap. That means playback will interrupt at least shortly to re-buffer and re-sync eventually. Set to -1 for automatic level selection.
    */
   set currentLevel(newLevel: number) {
-    this.logger.log(`set currentLevel:${newLevel}`);
+    logger.log(`set currentLevel:${newLevel}`);
     this.levelController.manualLevel = newLevel;
     this.streamController.immediateLevelSwitch();
   }
@@ -548,7 +536,7 @@ export default class Hls implements HlsEventEmitter {
    * @param newLevel - Pass -1 for automatic level selection
    */
   set nextLevel(newLevel: number) {
-    this.logger.log(`set nextLevel:${newLevel}`);
+    logger.log(`set nextLevel:${newLevel}`);
     this.levelController.manualLevel = newLevel;
     this.streamController.nextLevelSwitch();
   }
@@ -567,7 +555,7 @@ export default class Hls implements HlsEventEmitter {
    * @param newLevel - Pass -1 for automatic level selection
    */
   set loadLevel(newLevel: number) {
-    this.logger.log(`set loadLevel:${newLevel}`);
+    logger.log(`set loadLevel:${newLevel}`);
     this.levelController.manualLevel = newLevel;
   }
 
@@ -598,7 +586,7 @@ export default class Hls implements HlsEventEmitter {
    * Sets "first-level", see getter.
    */
   set firstLevel(newLevel: number) {
-    this.logger.log(`set firstLevel:${newLevel}`);
+    logger.log(`set firstLevel:${newLevel}`);
     this.levelController.firstLevel = newLevel;
   }
 
@@ -623,7 +611,7 @@ export default class Hls implements HlsEventEmitter {
    * (determined from download of first segment)
    */
   set startLevel(newLevel: number) {
-    this.logger.log(`set startLevel:${newLevel}`);
+    logger.log(`set startLevel:${newLevel}`);
     // if not in automatic start level detection, ensure startLevel is greater than minAutoLevel
     if (newLevel !== -1) {
       newLevel = Math.max(newLevel, this.minAutoLevel);
@@ -698,7 +686,7 @@ export default class Hls implements HlsEventEmitter {
    */
   set autoLevelCapping(newLevel: number) {
     if (this._autoLevelCapping !== newLevel) {
-      this.logger.log(`set autoLevelCapping:${newLevel}`);
+      logger.log(`set autoLevelCapping:${newLevel}`);
       this._autoLevelCapping = newLevel;
       this.levelController.checkMaxAutoUpdated();
     }
@@ -1044,7 +1032,7 @@ export type {
   TSDemuxerConfig,
 } from './config';
 export type { MediaKeySessionContext } from './controller/eme-controller';
-export type { ILogger, Logger } from './utils/logger';
+export type { ILogger } from './utils/logger';
 export type {
   PathwayClone,
   SteeringManifest,

package/src/loader/fragment-loader.ts

@@ -336,11 +336,8 @@ function createLoaderContext(
   if (Number.isFinite(start) && Number.isFinite(end)) {
     let byteRangeStart = start;
     let byteRangeEnd = end;
-    if (
-      frag.sn === 'initSegment' &&
-      isMethodFullSegmentAesCbc(frag.decryptdata?.method)
-    ) {
-      // MAP segment encrypted with method 'AES-128' or 'AES-256' (cbc), when served with HTTP Range,
+    if (frag.sn === 'initSegment' && frag.decryptdata?.method === 'AES-128') {
+      // MAP segment encrypted with method 'AES-128', when served with HTTP Range,
       // has the unencrypted size specified in the range.
       // Ref: https://tools.ietf.org/html/draft-pantos-hls-rfc8216bis-08#section-6.3.6
       const fragmentLen = end - start;
@@ -375,10 +372,6 @@ function createGapLoadError(frag: Fragment, part?: Part): LoadError {
   return new LoadError(errorData);
 }
 
-function isMethodFullSegmentAesCbc(method) {
-  return method === 'AES-128' || method === 'AES-256';
-}
-
 export class LoadError extends Error {
   public readonly data: FragLoadFailResult;
   constructor(data: FragLoadFailResult) {

package/src/loader/key-loader.ts

@@ -194,8 +194,6 @@ export default class KeyLoader implements ComponentAPI {
         }
         return this.loadKeyEME(keyInfo, frag);
       case 'AES-128':
-      case 'AES-256':
-      case 'AES-256-CTR':
         return this.loadKeyHTTP(keyInfo, frag);
       default:
         return Promise.reject(

package/src/loader/level-key.ts

@@ -2,7 +2,6 @@ import {
   changeEndianness,
   convertDataUriToArrayBytes,
 } from '../utils/keysystem-util';
-import { isFullSegmentEncryption } from '../utils/encryption-methods-util';
 import { KeySystemFormats } from '../utils/mediakeys-helper';
 import { mp4pssh } from '../utils/mp4-tools';
 import { logger } from '../utils/logger';
@@ -52,14 +51,13 @@ export class LevelKey implements DecryptData {
     this.keyFormatVersions = formatversions;
     this.iv = iv;
     this.encrypted = method ? method !== 'NONE' : false;
-    this.isCommonEncryption =
-      this.encrypted && !isFullSegmentEncryption(method);
+    this.isCommonEncryption = this.encrypted && method !== 'AES-128';
   }
 
   public isSupported(): boolean {
     // If it's Segment encryption or No encryption, just select that key system
     if (this.method) {
-      if (isFullSegmentEncryption(this.method) || this.method === 'NONE') {
+      if (this.method === 'AES-128' || this.method === 'NONE') {
         return true;
       }
       if (this.keyFormat === 'identity') {
@@ -90,15 +88,16 @@ export class LevelKey implements DecryptData {
       return null;
     }
 
-    if (isFullSegmentEncryption(this.method) && this.uri && !this.iv) {
+    if (this.method === 'AES-128' && this.uri && !this.iv) {
       if (typeof sn !== 'number') {
         // We are fetching decryption data for a initialization segment
-        // If the segment was encrypted with AES-128/256
+        // If the segment was encrypted with AES-128
         // It must have an IV defined. We cannot substitute the Segment Number in.
-        logger.warn(
-          `missing IV for initialization segment with method="${this.method}" - compliance issue`,
-        );
-
+        if (this.method === 'AES-128' && !this.iv) {
+          logger.warn(
+            `missing IV for initialization segment with method="${this.method}" - compliance issue`,
+          );
+        }
         // Explicitly set sn to resulting value from implicit conversions 'initSegment' values for IV generation.
         sn = 0;
       }

package/src/remux/mp4-remuxer.ts

@@ -29,7 +29,6 @@ import type { TrackSet } from '../types/track';
 import type { SourceBufferName } from '../types/buffer';
 import type { Fragment } from '../loader/fragment';
 import type { HlsConfig } from '../config';
-import type { TypeSupported } from '../utils/codecs';
 
 const MAX_SILENT_FRAME_DURATION = 10 * 1000; // 10 seconds
 const AAC_SAMPLES_PER_FRAME = 1024;
@@ -42,7 +41,7 @@ let safariWebkitVersion: number | null = null;
 export default class MP4Remuxer implements Remuxer {
   private observer: HlsEventEmitter;
   private config: HlsConfig;
-  private typeSupported: TypeSupported;
+  private typeSupported: any;
   private ISGenerated: boolean = false;
   private _initPTS: RationalTimestamp | null = null;
   private _initDTS: RationalTimestamp | null = null;
@@ -928,7 +927,7 @@ export default class MP4Remuxer implements Remuxer {
           for (let j = 0; j < missing; j++) {
             const newStamp = Math.max(nextPts as number, 0);
             let fillFrame = AAC.getSilentFrame(
-              track.parsedCodec || track.manifestCodec || track.codec,
+              track.manifestCodec || track.codec,
               track.channelCount,
             );
             if (!fillFrame) {
@@ -1078,7 +1077,7 @@ export default class MP4Remuxer implements Remuxer {
     const nbSamples: number = Math.ceil((endDTS - startDTS) / frameDuration);
     // silent frame
     const silentFrame: Uint8Array | undefined = AAC.getSilentFrame(
-      track.parsedCodec || track.manifestCodec || track.codec,
+      track.manifestCodec || track.codec,
       track.channelCount,
     );
 

package/src/task-loop.ts

@@ -1,5 +1,3 @@
-import { type ILogger, Logger } from './utils/logger';
-
 /**
  * @ignore
  * Sub-class specialization of EventHandler base class.
@@ -29,14 +27,13 @@ import { type ILogger, Logger } from './utils/logger';
  * we are limiting the task execution per call stack to exactly one, but scheduling/post-poning further
  * task processing on the next main loop iteration (also known as "next tick" in the Node/JS runtime lingo).
  */
-export default class TaskLoop extends Logger {
+export default class TaskLoop {
   private readonly _boundTick: () => void;
   private _tickTimer: number | null = null;
   private _tickInterval: number | null = null;
   private _tickCallCount = 0;
 
-  constructor(label: string, logger: ILogger) {
-    super(label, logger);
+  constructor() {
     this._boundTick = this.tick.bind(this);
   }
 

package/src/types/demuxer.ts

@@ -64,7 +64,6 @@ export interface DemuxedAudioTrack extends DemuxedTrack {
   segmentCodec?: string;
   channelCount?: number;
   manifestCodec?: string;
-  parsedCodec?: string;
   samples: AudioSample[];
 }
 

package/src/utils/codecs.ts

@@ -147,15 +147,12 @@ function getCodecCompatibleNameLower(
     return CODEC_COMPATIBLE_NAMES[lowerCaseCodec]!;
   }
 
+  // Idealy fLaC and Opus would be first (spec-compliant) but
+  // some browsers will report that fLaC is supported then fail.
+  // see: https://bugs.chromium.org/p/chromium/issues/detail?id=1422728
   const codecsToCheck = {
-    // Idealy fLaC and Opus would be first (spec-compliant) but
-    // some browsers will report that fLaC is supported then fail.
-    // see: https://bugs.chromium.org/p/chromium/issues/detail?id=1422728
     flac: ['flac', 'fLaC', 'FLAC'],
     opus: ['opus', 'Opus'],
-    // Replace audio codec info if browser does not support mp4a.40.34,
-    // and demuxer can fallback to 'audio/mpeg' or 'audio/mp4;codecs="mp3"'
-    'mp4a.40.34': ['mp3'],
   }[lowerCaseCodec];
 
   for (let i = 0; i < codecsToCheck.length; i++) {
@@ -168,18 +165,13 @@ function getCodecCompatibleNameLower(
     ) {
       CODEC_COMPATIBLE_NAMES[lowerCaseCodec] = codecsToCheck[i];
       return codecsToCheck[i];
-    } else if (
-      codecsToCheck[i] === 'mp3' &&
-      getMediaSource(preferManagedMediaSource)?.isTypeSupported('audio/mpeg')
-    ) {
-      return '';
     }
   }
 
   return lowerCaseCodec;
 }
 
-const AUDIO_CODEC_REGEXP = /flac|opus|mp4a\.40\.34/i;
+const AUDIO_CODEC_REGEXP = /flac|opus/i;
 export function getCodecCompatibleName(
   codec: string,
   preferManagedMediaSource = true,
@@ -217,24 +209,3 @@ export function convertAVC1ToAVCOTI(codec: string) {
   }
   return codec;
 }
-
-export interface TypeSupported {
-  mpeg: boolean;
-  mp3: boolean;
-  ac3: boolean;
-}
-
-export function getM2TSSupportedAudioTypes(
-  preferManagedMediaSource: boolean,
-): TypeSupported {
-  const MediaSource = getMediaSource(preferManagedMediaSource) || {
-    isTypeSupported: () => false,
-  };
-  return {
-    mpeg: MediaSource.isTypeSupported('audio/mpeg'),
-    mp3: MediaSource.isTypeSupported('audio/mp4; codecs="mp3"'),
-    ac3: __USE_M2TS_ADVANCED_CODECS__
-      ? MediaSource.isTypeSupported('audio/mp4; codecs="ac-3"')
-      : false,
-  };
-}

package/src/utils/logger.ts

@@ -11,25 +11,6 @@ export interface ILogger {
   error: ILogFunction;
 }
 
-export class Logger implements ILogger {
-  trace: ILogFunction;
-  debug: ILogFunction;
-  log: ILogFunction;
-  warn: ILogFunction;
-  info: ILogFunction;
-  error: ILogFunction;
-
-  constructor(label: string, logger: ILogger) {
-    const lb = `[${label}]:`;
-    this.trace = noop;
-    this.debug = logger.debug.bind(null, lb);
-    this.log = logger.log.bind(null, lb);
-    this.warn = logger.warn.bind(null, lb);
-    this.info = logger.info.bind(null, lb);
-    this.error = logger.error.bind(null, lb);
-  }
-}
-
 const noop: ILogFunction = function () {};
 
 const fakeLogger: ILogger = {
@@ -41,9 +22,7 @@ const fakeLogger: ILogger = {
   error: noop,
 };
 
-function createLogger() {
-  return Object.assign({}, fakeLogger);
-}
+let exportedLogger: ILogger = fakeLogger;
 
 // let lastCallTime;
 // function formatMsgWithTimeInfo(type, msg) {
@@ -54,37 +33,33 @@ function createLogger() {
 //   return msg;
 // }
 
-function consolePrintFn(type: string, id: string | undefined): ILogFunction {
+function consolePrintFn(type: string): ILogFunction {
   const func: ILogFunction = self.console[type];
-  return func
-    ? func.bind(self.console, `${id ? '[' + id + '] ' : ''}[${type}] >`)
-    : noop;
+  if (func) {
+    return func.bind(self.console, `[${type}] >`);
+  }
+  return noop;
 }
 
-function getLoggerFn(
-  key: string,
-  debugConfig: boolean | Partial<ILogger>,
-  id: string | undefined,
-): ILogFunction {
-  return debugConfig[key]
-    ? debugConfig[key].bind(debugConfig)
-    : consolePrintFn(key, id);
+function exportLoggerFunctions(
+  debugConfig: boolean | ILogger,
+  ...functions: string[]
+): void {
+  functions.forEach(function (type) {
+    exportedLogger[type] = debugConfig[type]
+      ? debugConfig[type].bind(debugConfig)
+      : consolePrintFn(type);
+  });
 }
 
-let exportedLogger: ILogger = createLogger();
-
-export function enableLogs(
-  debugConfig: boolean | ILogger,
-  context: string,
-  id?: string | undefined,
-): ILogger {
+export function enableLogs(debugConfig: boolean | ILogger, id: string): void {
   // check that console is available
-  const newLogger = createLogger();
   if (
     (typeof console === 'object' && debugConfig === true) ||
     typeof debugConfig === 'object'
   ) {
-    const keys: (keyof ILogger)[] = [
+    exportLoggerFunctions(
+      debugConfig,
       // Remove out from list here to hard-disable a log-level
       // 'trace',
       'debug',
@@ -92,23 +67,19 @@ export function enableLogs(
       'info',
       'warn',
       'error',
-    ];
-    keys.forEach((key) => {
-      newLogger[key] = getLoggerFn(key, debugConfig, id);
-    });
+    );
     // Some browsers don't allow to use bind on console object anyway
     // fallback to default if needed
     try {
-      newLogger.log(
-        `Debug logs enabled for "${context}" in hls.js version ${__VERSION__}`,
+      exportedLogger.log(
+        `Debug logs enabled for "${id}" in hls.js version ${__VERSION__}`,
       );
     } catch (e) {
-      /* log fn threw an exception. All logger methods are no-ops. */
-      return createLogger();
+      exportedLogger = fakeLogger;
     }
+  } else {
+    exportedLogger = fakeLogger;
   }
-  exportedLogger = newLogger;
-  return newLogger;
 }
 
 export const logger: ILogger = exportedLogger;

package/src/crypt/decrypter-aes-mode.ts

@@ -1,4 +0,0 @@
-export const enum DecrypterAesMode {
-  cbc = 0,
-  ctr = 1,
-}

package/src/utils/encryption-methods-util.ts

@@ -1,21 +0,0 @@
-import { DecrypterAesMode } from '../crypt/decrypter-aes-mode';
-
-export function isFullSegmentEncryption(method: string): boolean {
-  return (
-    method === 'AES-128' || method === 'AES-256' || method === 'AES-256-CTR'
-  );
-}
-
-export function getAesModeFromFullSegmentMethod(
-  method: string,
-): DecrypterAesMode {
-  switch (method) {
-    case 'AES-128':
-    case 'AES-256':
-      return DecrypterAesMode.cbc;
-    case 'AES-256-CTR':
-      return DecrypterAesMode.ctr;
-    default:
-      throw new Error(`invalid full segment method ${method}`);
-  }
-}