hls.js 1.5.8-0.canary.10153 → 1.5.8-0.canary.10155

package/package.json

@@ -130,5 +130,5 @@
     "url-toolkit": "2.2.5",
     "wrangler": "3.45.0"
   },
-  "version": "1.5.8-0.canary.10153"
+  "version": "1.5.8-0.canary.10155"
 }

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

@@ -1,8 +1,13 @@
 import type Hls from '../hls';
 import type { NetworkComponentAPI } from '../types/component-api';
-import { getSkipValue, HlsSkip, HlsUrlParameters, Level } from '../types/level';
+import {
+  getSkipValue,
+  HlsSkip,
+  HlsUrlParameters,
+  type Level,
+} from '../types/level';
 import { computeReloadInterval, mergeDetails } from '../utils/level-helper';
-import { ErrorData } from '../types/events';
+import type { ErrorData } from '../types/events';
 import { getRetryDelay, isTimeoutError } from '../utils/error-helper';
 import { NetworkErrorAction } from './error-controller';
 import { Logger } from '../utils/logger';

package/src/controller/cmcd-controller.ts

@@ -1,5 +1,5 @@
 import { Events } from '../events';
-import Hls from '../hls';
+import type Hls from '../hls';
 import { Cmcd } from '@svta/common-media-library/cmcd/Cmcd';
 import { CmcdObjectType } from '@svta/common-media-library/cmcd/CmcdObjectType';
 import { CmcdStreamingFormat } from '@svta/common-media-library/cmcd/CmcdStreamingFormat';

package/src/controller/eme-controller.ts

@@ -19,7 +19,7 @@ import {
   KeySystems,
   requestMediaKeySystemAccess,
 } from '../utils/mediakeys-helper';
-import { strToUtf8array } from '../utils/keysystem-util';
+import { strToUtf8array } from '../utils/utf8-utils';
 import { base64Decode } from '../utils/numeric-encoding-utils';
 import { DecryptData, LevelKey } from '../loader/level-key';
 import Hex from '../utils/hex';

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

@@ -4,7 +4,6 @@ import {
   clearCurrentCues,
   removeCuesInRange,
 } from '../utils/texttrack-utils';
-import * as ID3 from '../demux/id3';
 import {
   DateRange,
   isDateRangeCueAttribute,
@@ -19,6 +18,8 @@ import type {
 } from '../types/events';
 import type { ComponentAPI } from '../types/component-api';
 import type Hls from '../hls';
+import { getId3Frames } from '@svta/common-media-library/id3/getId3Frames';
+import { isId3TimestampFrame } from '@svta/common-media-library/id3/isId3TimestampFrame';
 
 declare global {
   interface Window {
@@ -210,7 +211,7 @@ class ID3TrackController implements ComponentAPI {
         continue;
       }
 
-      const frames = ID3.getID3Frames(samples[i].data);
+      const frames = getId3Frames(samples[i].data);
       if (frames) {
         const startTime = samples[i].pts;
         let endTime: number = startTime + samples[i].duration;
@@ -227,7 +228,7 @@ class ID3TrackController implements ComponentAPI {
         for (let j = 0; j < frames.length; j++) {
           const frame = frames[j];
           // Safari doesn't put the timestamp frame in the TextTrack
-          if (!ID3.isTimeStampFrame(frame)) {
+          if (!isId3TimestampFrame(frame)) {
             // add a bounds to any unbounded cues
             this.updateId3CueEnds(startTime, type);
             const cue = createCueWithDataFields(

package/src/controller/level-controller.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   ManifestLoadedData,
   ManifestParsedData,
   LevelLoadedData,

package/src/demux/audio/aacdemuxer.ts

@@ -5,7 +5,7 @@ import BaseAudioDemuxer from './base-audio-demuxer';
 import * as ADTS from './adts';
 import * as MpegAudio from './mpegaudio';
 import { logger } from '../../utils/logger';
-import * as ID3 from '../id3';
+import { getId3Data } from '@svta/common-media-library/id3/getId3Data';
 import type { HlsEventEmitter } from '../../events';
 import type { HlsConfig } from '../../config';
 
@@ -51,7 +51,7 @@ class AACDemuxer extends BaseAudioDemuxer {
     // Look for ADTS header | 1111 1111 | 1111 X00X | where X can be either 0 or 1
     // Layer bits (position 14 and 15) in header should be always 0 for ADTS
     // More info https://wiki.multimedia.cx/index.php?title=ADTS
-    const id3Data = ID3.getID3Data(data, 0);
+    const id3Data = getId3Data(data, 0);
     let offset = id3Data?.length || 0;
 
     if (MpegAudio.probe(data, offset)) {

package/src/demux/audio/ac3-demuxer.ts

@@ -1,5 +1,6 @@
 import BaseAudioDemuxer from './base-audio-demuxer';
-import { getID3Data, getTimeStamp } from '../id3';
+import { getId3Data } from '@svta/common-media-library/id3/getId3Data';
+import { getId3Timestamp } from '@svta/common-media-library/id3/getId3Timestamp';
 import { getAudioBSID } from './dolby';
 import type { HlsEventEmitter } from '../../events';
 import type { AudioFrame, DemuxedAudioTrack } from '../../types/demuxer';
@@ -61,7 +62,7 @@ export class AC3Demuxer extends BaseAudioDemuxer {
       return false;
     }
 
-    const id3Data = getID3Data(data, 0);
+    const id3Data = getId3Data(data, 0);
     if (!id3Data) {
       return false;
     }
@@ -71,7 +72,7 @@ export class AC3Demuxer extends BaseAudioDemuxer {
     if (
       data[offset] === 0x0b &&
       data[offset + 1] === 0x77 &&
-      getTimeStamp(id3Data) !== undefined &&
+      getId3Timestamp(id3Data) !== undefined &&
       // check the bsid to confirm ac-3
       getAudioBSID(data, offset) < 16
     ) {

package/src/demux/audio/base-audio-demuxer.ts

@@ -1,19 +1,21 @@
-import * as ID3 from '../id3';
 import {
-  DemuxerResult,
-  Demuxer,
-  DemuxedAudioTrack,
-  AudioFrame,
-  DemuxedMetadataTrack,
-  DemuxedVideoTrackBase,
-  DemuxedUserdataTrack,
-  KeyData,
+  type DemuxerResult,
+  type Demuxer,
+  type DemuxedAudioTrack,
+  type AudioFrame,
+  type DemuxedMetadataTrack,
+  type DemuxedVideoTrackBase,
+  type DemuxedUserdataTrack,
+  type KeyData,
   MetadataSchema,
 } from '../../types/demuxer';
 import { dummyTrack } from '../dummy-demuxed-track';
 import { appendUint8Array } from '../../utils/mp4-tools';
 import { sliceUint8 } from '../../utils/typed-array';
 import { RationalTimestamp } from '../../utils/timescale-conversion';
+import { getId3Data } from '@svta/common-media-library/id3/getId3Data';
+import { getId3Timestamp } from '@svta/common-media-library/id3/getId3Timestamp';
+import { canParseId3 } from '@svta/common-media-library/id3/canParseId3';
 
 class BaseAudioDemuxer implements Demuxer {
   protected _audioTrack!: DemuxedAudioTrack;
@@ -69,12 +71,12 @@ class BaseAudioDemuxer implements Demuxer {
       this.cachedData = null;
     }
 
-    let id3Data: Uint8Array | undefined = ID3.getID3Data(data, 0);
+    let id3Data: Uint8Array | undefined = getId3Data(data, 0);
     let offset = id3Data ? id3Data.length : 0;
     let lastDataIndex;
     const track = this._audioTrack;
     const id3Track = this._id3Track;
-    const timestamp = id3Data ? ID3.getTimeStamp(id3Data) : undefined;
+    const timestamp = id3Data ? getId3Timestamp(id3Data) : undefined;
     const length = data.length;
 
     if (
@@ -111,9 +113,9 @@ class BaseAudioDemuxer implements Demuxer {
         } else {
           offset = length;
         }
-      } else if (ID3.canParse(data, offset)) {
-        // after a ID3.canParse, a call to ID3.getID3Data *should* always returns some data
-        id3Data = ID3.getID3Data(data, offset)!;
+      } else if (canParseId3(data, offset)) {
+        // after a canParse, a call to getId3Data *should* always returns some data
+        id3Data = getId3Data(data, offset)!;
         id3Track.samples.push({
           pts: this.lastPTS,
           dts: this.lastPTS,

package/src/demux/audio/mp3demuxer.ts

@@ -2,10 +2,11 @@
  * MP3 demuxer
  */
 import BaseAudioDemuxer from './base-audio-demuxer';
-import { getID3Data, getTimeStamp } from '../id3';
 import { getAudioBSID } from './dolby';
 import { logger } from '../../utils/logger';
 import * as MpegAudio from './mpegaudio';
+import { getId3Data } from '@svta/common-media-library/id3/getId3Data';
+import { getId3Timestamp } from '@svta/common-media-library/id3/getId3Timestamp';
 
 class MP3Demuxer extends BaseAudioDemuxer {
   resetInitSegment(
@@ -39,7 +40,7 @@ class MP3Demuxer extends BaseAudioDemuxer {
     // Look for MPEG header | 1111 1111 | 111X XYZX | where X can be either 0 or 1 and Y or Z should be 1
     // Layer bits (position 14 and 15) in header should be always different from 0 (Layer I or Layer II or Layer III)
     // More info http://www.mp3-tech.org/programmer/frame_header.html
-    const id3Data = getID3Data(data, 0);
+    const id3Data = getId3Data(data, 0);
     let offset = id3Data?.length || 0;
 
     // Check for ac-3|ec-3 sync bytes and return false if present
@@ -47,7 +48,7 @@ class MP3Demuxer extends BaseAudioDemuxer {
       id3Data &&
       data[offset] === 0x0b &&
       data[offset + 1] === 0x77 &&
-      getTimeStamp(id3Data) !== undefined &&
+      getId3Timestamp(id3Data) !== undefined &&
       // check the bsid to confirm ac-3 or ec-3 (not mp3)
       getAudioBSID(data, offset) <= 16
     ) {

package/src/demux/audio/mpegaudio.ts

@@ -1,7 +1,7 @@
 /**
  *  MPEG parser helper
  */
-import { DemuxedAudioTrack } from '../../types/demuxer';
+import type { DemuxedAudioTrack } from '../../types/demuxer';
 
 let chromeVersion: number | null = null;
 

package/src/demux/mp4demuxer.ts

@@ -2,13 +2,13 @@
  * MP4 demuxer
  */
 import {
-  Demuxer,
-  DemuxerResult,
-  PassthroughTrack,
-  DemuxedAudioTrack,
-  DemuxedUserdataTrack,
-  DemuxedMetadataTrack,
-  KeyData,
+  type Demuxer,
+  type DemuxerResult,
+  type PassthroughTrack,
+  type DemuxedAudioTrack,
+  type DemuxedUserdataTrack,
+  type DemuxedMetadataTrack,
+  type KeyData,
   MetadataSchema,
 } from '../types/demuxer';
 import {

package/src/demux/video/hevc-video-parser.ts

@@ -1,5 +1,8 @@
 import BaseVideoParser from './base-video-parser';
-import { DemuxedVideoTrack, DemuxedUserdataTrack } from '../../types/demuxer';
+import type {
+  DemuxedVideoTrack,
+  DemuxedUserdataTrack,
+} from '../../types/demuxer';
 import { parseSEIMessageFromNALu } from '../../utils/mp4-tools';
 
 import type { PES } from '../tsdemuxer';

package/src/events.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   ManifestLoadedData,
   ManifestLoadingData,
   MediaAttachedData,

package/src/exports-named.ts

@@ -1,7 +1,7 @@
 import Hls from './hls';
 import { Events } from './events';
 import { ErrorTypes, ErrorDetails } from './errors';
-import { Level } from './types/level';
+import type { Level } from './types/level';
 import AbrController from './controller/abr-controller';
 import AudioTrackController from './controller/audio-track-controller';
 import AudioStreamController from './controller/audio-stream-controller';

package/src/loader/fragment-loader.ts

@@ -1,6 +1,6 @@
 import { ErrorTypes, ErrorDetails } from '../errors';
 import { Fragment } from './fragment';
-import {
+import type {
   Loader,
   LoaderConfiguration,
   FragmentLoaderContext,

package/src/loader/key-loader.ts

@@ -1,5 +1,5 @@
 import { ErrorTypes, ErrorDetails } from '../errors';
-import {
+import type {
   LoaderStats,
   LoaderResponse,
   LoaderConfiguration,

package/src/remux/mp4-remuxer.ts

@@ -4,7 +4,7 @@ import type { HlsEventEmitter } from '../events';
 import { Events } from '../events';
 import { ErrorTypes, ErrorDetails } from '../errors';
 import { logger } from '../utils/logger';
-import {
+import type {
   InitSegmentData,
   Remuxer,
   RemuxerResult,

package/src/types/component-api.ts

@@ -1,4 +1,4 @@
-import EwmaBandWidthEstimator from '../utils/ewma-bandwidth-estimator';
+import type EwmaBandWidthEstimator from '../utils/ewma-bandwidth-estimator';
 
 export interface ComponentAPI {
   destroy(): void;

package/src/types/remuxer.ts

@@ -1,5 +1,5 @@
 import type { TrackSet } from './track';
-import {
+import type {
   DemuxedAudioTrack,
   DemuxedMetadataTrack,
   DemuxedUserdataTrack,

package/src/utils/fetch-loader.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   LoaderCallbacks,
   LoaderContext,
   Loader,

package/src/utils/imsc1-ttml-parser.ts

@@ -1,7 +1,7 @@
 import { findBox } from './mp4-tools';
 import { parseTimeStamp } from './vttparser';
 import VTTCue from './vttcue';
-import { utf8ArrayToStr } from '../demux/id3';
+import { utf8ArrayToStr } from '@svta/common-media-library/utils/utf8ArrayToStr';
 import {
   RationalTimestamp,
   toTimescaleFromScale,

package/src/utils/keysystem-util.ts

@@ -1,4 +1,5 @@
 import { base64Decode } from './numeric-encoding-utils';
+import { strToUtf8array } from './utf8-utils';
 
 function getKeyIdBytes(str: string): Uint8Array {
   const keyIdbytes = strToUtf8array(str).subarray(0, 16);
@@ -40,9 +41,3 @@ export function convertDataUriToArrayBytes(uri: string): Uint8Array | null {
   }
   return keydata;
 }
-
-export function strToUtf8array(str: string): Uint8Array {
-  return Uint8Array.from(unescape(encodeURIComponent(str)), (c) =>
-    c.charCodeAt(0),
-  );
-}

package/src/utils/mp4-tools.ts

@@ -1,6 +1,6 @@
 import { ElementaryStreamTypes } from '../loader/fragment';
 import { sliceUint8 } from './typed-array';
-import { utf8ArrayToStr } from '../demux/id3';
+import { utf8ArrayToStr } from '@svta/common-media-library/utils/utf8ArrayToStr';
 import { logger } from '../utils/logger';
 import Hex from './hex';
 import type { PassthroughTrack, UserdataSample } from '../types/demuxer';

package/src/utils/utf8-utils.ts

@@ -0,0 +1,18 @@
+// breaking up those two types in order to clarify what is happening in the decoding path.
+type DecodedFrame<T> = { key: string; data: T; info?: any };
+export type Frame = DecodedFrame<ArrayBuffer | string>;
+// http://stackoverflow.com/questions/8936984/uint8array-to-string-in-javascript/22373197
+// http://www.onicos.com/staff/iz/amuse/javascript/expert/utf.txt
+/* utf.js - UTF-8 <=> UTF-16 convertion
+ *
+ * Copyright (C) 1999 Masanao Izumo <iz@onicos.co.jp>
+ * Version: 1.0
+ * LastModified: Dec 25 1999
+ * This library is free.  You can redistribute it and/or modify it.
+ */
+
+export function strToUtf8array(str: string): Uint8Array {
+  return Uint8Array.from(unescape(encodeURIComponent(str)), (c) =>
+    c.charCodeAt(0),
+  );
+}

package/src/utils/webvtt-parser.ts

@@ -1,5 +1,5 @@
 import { VTTParser } from './vttparser';
-import { utf8ArrayToStr } from '../demux/id3';
+import { utf8ArrayToStr } from '@svta/common-media-library/utils/utf8ArrayToStr';
 import {
   RationalTimestamp,
   toMpegTsClockFromTimescale,