hls.js 1.5.9-0.canary.10310 → 1.5.9

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,13 +59,9 @@ 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;
   private _emitter: HlsEventEmitter = new EventEmitter();
   private _autoLevelCapping: number = -1;
   private _maxHdcpLevel: HdcpLevel = null;
@@ -146,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
@@ -171,10 +160,8 @@ export default class Hls implements HlsEventEmitter {
     } = config;
     const errorController = new ConfigErrorController(this);
     const abrController = (this.abrController = new ConfigAbrController(this));
-    // FragmentTracker must be defined before StreamController because the order of event handling is important
-    const fragmentTracker = new FragmentTracker(this);
     const bufferController = (this.bufferController =
-      new ConfigBufferController(this, fragmentTracker));
+      new ConfigBufferController(this));
     const capLevelController = (this.capLevelController =
       new ConfigCapLevelController(this));
 
@@ -183,7 +170,7 @@ export default class Hls implements HlsEventEmitter {
     const id3TrackController = new ID3TrackController(this);
 
     const ConfigContentSteeringController = config.contentSteeringController;
-    // ContentSteeringController is defined before LevelController to receive Multivariant Playlist events first
+    // ConentSteeringController is defined before LevelController to receive Multivariant Playlist events first
     const contentSteering = ConfigContentSteeringController
       ? new ConfigContentSteeringController(this)
       : null;
@@ -191,6 +178,8 @@ export default class Hls implements HlsEventEmitter {
       this,
       contentSteering,
     ));
+    // FragmentTracker must be defined before StreamController because the order of event handling is important
+    const fragmentTracker = new FragmentTracker(this);
     const keyLoader = new KeyLoader(this.config);
     const streamController = (this.streamController = new StreamController(
       this,
@@ -331,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: "' +
@@ -365,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();
@@ -388,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 });
   }
@@ -397,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;
   }
@@ -418,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 &&
@@ -439,7 +428,8 @@ 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);
     });
@@ -449,31 +439,34 @@ 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();
     });
   }
 
   /**
-   * Resumes stream controller segment loading after `pauseBuffering` has been called.
+   * Resumes stream controller segment loading if previously started.
    */
   resumeBuffering() {
-    this.networkControllers.forEach((controller) => {
-      if (controller.resumeBuffering) {
-        controller.resumeBuffering();
-      }
-    });
+    if (this.started) {
+      this.networkControllers.forEach((controller) => {
+        if ('fragmentLoader' in controller) {
+          controller.startLoad(-1);
+        }
+      });
+    }
   }
 
   /**
-   * Prevents stream controller from loading new segments until `resumeBuffering` is called.
+   * Stops stream controller segment loading without changing 'started' state like stopLoad().
    * This allows for media buffering to be paused without interupting playlist loading.
    */
   pauseBuffering() {
     this.networkControllers.forEach((controller) => {
-      if (controller.pauseBuffering) {
-        controller.pauseBuffering();
+      if ('fragmentLoader' in controller) {
+        controller.stopLoad();
       }
     });
   }
@@ -482,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();
   }
 
@@ -493,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) {
@@ -524,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();
   }
@@ -543,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();
   }
@@ -562,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;
   }
 
@@ -593,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;
   }
 
@@ -618,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);
@@ -693,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();
     }
@@ -802,10 +795,6 @@ export default class Hls implements HlsEventEmitter {
     return this.streamController.getMainFwdBufferInfo();
   }
 
-  public get maxBufferLength(): number {
-    return this.streamController.maxBufferLength;
-  }
-
   /**
    * Find and select the best matching audio track, making a level switch when a Group change is necessary.
    * Updates `hls.config.audioPreference`. Returns the selected track, or null when no matching track is found.
@@ -981,17 +970,6 @@ export default class Hls implements HlsEventEmitter {
   get forceStartLoad(): boolean {
     return this.streamController.forceStartLoad;
   }
-
-  /**
-   * ContentSteering pathwayPriority getter/setter
-   */
-  get pathwayPriority(): string[] | null {
-    return this.levelController.pathwayPriority;
-  }
-
-  set pathwayPriority(pathwayPriority: string[]) {
-    this.levelController.pathwayPriority = pathwayPriority;
-  }
 }
 
 export type {
@@ -1054,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,
@@ -1169,7 +1147,6 @@ export type {
   ManifestParsedData,
   MediaAttachedData,
   MediaAttachingData,
-  MediaEndedData,
   NonNativeTextTrack,
   NonNativeTextTracksData,
   SteeringManifestLoadedData,

package/src/loader/fragment-loader.ts

@@ -1,6 +1,6 @@
 import { ErrorTypes, ErrorDetails } from '../errors';
 import { Fragment } from './fragment';
-import type {
+import {
   Loader,
   LoaderConfiguration,
   FragmentLoaderContext,
@@ -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

@@ -1,5 +1,5 @@
 import { ErrorTypes, ErrorDetails } from '../errors';
-import type {
+import {
   LoaderStats,
   LoaderResponse,
   LoaderConfiguration,
@@ -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/loader/playlist-loader.ts

@@ -8,6 +8,7 @@
 
 import { Events } from '../events';
 import { ErrorDetails, ErrorTypes } from '../errors';
+import { logger } from '../utils/logger';
 import M3U8Parser from './m3u8-parser';
 import type { LevelParsed, VariableMap } from '../types/level';
 import type {
@@ -220,10 +221,10 @@ class PlaylistLoader implements NetworkComponentAPI {
         loaderContext.level === context.level
       ) {
         // same URL can't overlap
-        this.hls.logger.trace('[playlist-loader]: playlist request ongoing');
+        logger.trace('[playlist-loader]: playlist request ongoing');
         return;
       }
-      this.hls.logger.log(
+      logger.log(
         `[playlist-loader]: aborting previous loader for type: ${context.type}`,
       );
       loader.abort();
@@ -407,7 +408,7 @@ class PlaylistLoader implements NetworkComponentAPI {
         levels[0].audioCodec &&
         !levels[0].attrs.AUDIO
       ) {
-        this.hls.logger.log(
+        logger.log(
           '[playlist-loader]: audio codec signaled in quality level, but no embedded audio track signaled, create one',
         );
         audioTracks.unshift({
@@ -554,7 +555,7 @@ class PlaylistLoader implements NetworkComponentAPI {
       message += ` id: ${context.id} group-id: "${context.groupId}"`;
     }
     const error = new Error(message);
-    this.hls.logger.warn(`[playlist-loader]: ${message}`);
+    logger.warn(`[playlist-loader]: ${message}`);
     let details = ErrorDetails.UNKNOWN;
     let fatal = false;
 

package/src/remux/mp4-generator.ts

@@ -28,8 +28,6 @@ class MP4 {
     MP4.types = {
       avc1: [], // codingname
       avcC: [],
-      hvc1: [],
-      hvcC: [],
       btrt: [],
       dinf: [],
       dref: [],
@@ -841,10 +839,8 @@ class MP4 {
         return MP4.box(MP4.types.stsd, MP4.STSD, MP4.ac3(track));
       }
       return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp4a(track));
-    } else if (track.segmentCodec === 'avc') {
-      return MP4.box(MP4.types.stsd, MP4.STSD, MP4.avc1(track));
     } else {
-      return MP4.box(MP4.types.stsd, MP4.STSD, MP4.hvc1(track));
+      return MP4.box(MP4.types.stsd, MP4.STSD, MP4.avc1(track));
     }
   }
 
@@ -1127,197 +1123,6 @@ class MP4 {
     const result = appendUint8Array(MP4.FTYP, movie);
     return result;
   }
-
-  static hvc1(track) {
-    const ps = track.params;
-    const units = [track.vps, track.sps, track.pps];
-    const NALuLengthSize = 4;
-    const config = new Uint8Array([
-      0x01,
-      (ps.general_profile_space << 6) |
-        (ps.general_tier_flag ? 32 : 0) |
-        ps.general_profile_idc,
-      ps.general_profile_compatibility_flags[0],
-      ps.general_profile_compatibility_flags[1],
-      ps.general_profile_compatibility_flags[2],
-      ps.general_profile_compatibility_flags[3],
-      ps.general_constraint_indicator_flags[0],
-      ps.general_constraint_indicator_flags[1],
-      ps.general_constraint_indicator_flags[2],
-      ps.general_constraint_indicator_flags[3],
-      ps.general_constraint_indicator_flags[4],
-      ps.general_constraint_indicator_flags[5],
-      ps.general_level_idc,
-      240 | (ps.min_spatial_segmentation_idc >> 8),
-      255 & ps.min_spatial_segmentation_idc,
-      252 | ps.parallelismType,
-      252 | ps.chroma_format_idc,
-      248 | ps.bit_depth_luma_minus8,
-      248 | ps.bit_depth_chroma_minus8,
-      0x00,
-      parseInt(ps.frame_rate.fps),
-      (NALuLengthSize - 1) |
-        (ps.temporal_id_nested << 2) |
-        (ps.num_temporal_layers << 3) |
-        (ps.frame_rate.fixed ? 64 : 0),
-      units.length,
-    ]);
-
-    // compute hvcC size in bytes
-    let length = config.length;
-    for (let i = 0; i < units.length; i += 1) {
-      length += 3;
-      for (let j = 0; j < units[i].length; j += 1) {
-        length += 2 + units[i][j].length;
-      }
-    }
-
-    const hvcC = new Uint8Array(length);
-    hvcC.set(config, 0);
-    length = config.length;
-    // append parameter set units: one vps, one or more sps and pps
-    const iMax = units.length - 1;
-    for (let i = 0; i < units.length; i += 1) {
-      hvcC.set(
-        new Uint8Array([
-          (32 + i) | (i === iMax ? 128 : 0),
-          0x00,
-          units[i].length,
-        ]),
-        length,
-      );
-      length += 3;
-      for (let j = 0; j < units[i].length; j += 1) {
-        hvcC.set(
-          new Uint8Array([units[i][j].length >> 8, units[i][j].length & 255]),
-          length,
-        );
-        length += 2;
-        hvcC.set(units[i][j], length);
-        length += units[i][j].length;
-      }
-    }
-    const hvcc = MP4.box(MP4.types.hvcC, hvcC);
-    const width = track.width;
-    const height = track.height;
-    const hSpacing = track.pixelRatio[0];
-    const vSpacing = track.pixelRatio[1];
-
-    return MP4.box(
-      MP4.types.hvc1,
-      new Uint8Array([
-        0x00,
-        0x00,
-        0x00, // reserved
-        0x00,
-        0x00,
-        0x00, // reserved
-        0x00,
-        0x01, // data_reference_index
-        0x00,
-        0x00, // pre_defined
-        0x00,
-        0x00, // reserved
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00, // pre_defined
-        (width >> 8) & 0xff,
-        width & 0xff, // width
-        (height >> 8) & 0xff,
-        height & 0xff, // height
-        0x00,
-        0x48,
-        0x00,
-        0x00, // horizresolution
-        0x00,
-        0x48,
-        0x00,
-        0x00, // vertresolution
-        0x00,
-        0x00,
-        0x00,
-        0x00, // reserved
-        0x00,
-        0x01, // frame_count
-        0x12,
-        0x64,
-        0x61,
-        0x69,
-        0x6c, // dailymotion/hls.js
-        0x79,
-        0x6d,
-        0x6f,
-        0x74,
-        0x69,
-        0x6f,
-        0x6e,
-        0x2f,
-        0x68,
-        0x6c,
-        0x73,
-        0x2e,
-        0x6a,
-        0x73,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00, // compressorname
-        0x00,
-        0x18, // depth = 24
-        0x11,
-        0x11,
-      ]), // pre_defined = -1
-      hvcc,
-      MP4.box(
-        MP4.types.btrt,
-        new Uint8Array([
-          0x00,
-          0x1c,
-          0x9c,
-          0x80, // bufferSizeDB
-          0x00,
-          0x2d,
-          0xc6,
-          0xc0, // maxBitrate
-          0x00,
-          0x2d,
-          0xc6,
-          0xc0,
-        ]),
-      ), // avgBitrate
-      MP4.box(
-        MP4.types.pasp,
-        new Uint8Array([
-          hSpacing >> 24, // hSpacing
-          (hSpacing >> 16) & 0xff,
-          (hSpacing >> 8) & 0xff,
-          hSpacing & 0xff,
-          vSpacing >> 24, // vSpacing
-          (vSpacing >> 16) & 0xff,
-          (vSpacing >> 8) & 0xff,
-          vSpacing & 0xff,
-        ]),
-      ),
-    );
-  }
 }
 
 export default MP4;