hls.js 1.5.8-0.canary.10170 → 1.5.8

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 '@svta/common-media-library/utils/utf8ArrayToStr';
+import { utf8ArrayToStr } from '../demux/id3';
 import {
   RationalTimestamp,
   toTimescaleFromScale,

package/src/utils/keysystem-util.ts

@@ -1,5 +1,4 @@
 import { base64Decode } from './numeric-encoding-utils';
-import { strToUtf8array } from './utf8-utils';
 
 function getKeyIdBytes(str: string): Uint8Array {
   const keyIdbytes = strToUtf8array(str).subarray(0, 16);
@@ -41,3 +40,9 @@ 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/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,
-): 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);
+  });
 }
 
-const 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,29 +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;
     }
-    // global exported logger uses the same functions as new logger without `id`
-    keys.forEach((key) => {
-      exportedLogger[key] = getLoggerFn(key, debugConfig);
-    });
   } else {
-    // Reset global exported logger
-    Object.assign(exportedLogger, newLogger);
+    exportedLogger = fakeLogger;
   }
-  return newLogger;
 }
 
 export const logger: ILogger = exportedLogger;

package/src/utils/mp4-tools.ts

@@ -1,6 +1,6 @@
 import { ElementaryStreamTypes } from '../loader/fragment';
 import { sliceUint8 } from './typed-array';
-import { utf8ArrayToStr } from '@svta/common-media-library/utils/utf8ArrayToStr';
+import { utf8ArrayToStr } from '../demux/id3';
 import { logger } from '../utils/logger';
 import Hex from './hex';
 import type { PassthroughTrack, UserdataSample } from '../types/demuxer';
@@ -327,7 +327,7 @@ function parseStsd(stsd: Uint8Array): { codec: string; encrypted: boolean } {
     case 'mp4a': {
       const codecBox = findBox(sampleEntries, [fourCC])[0];
       const esdsBox = findBox(codecBox.subarray(28), ['esds'])[0];
-      if (esdsBox && esdsBox.length > 7) {
+      if (esdsBox && esdsBox.length > 12) {
         let i = 4;
         // ES Descriptor tag
         if (esdsBox[i++] !== 0x03) {
@@ -478,9 +478,7 @@ function parseStsd(stsd: Uint8Array): { codec: string; encrypted: boolean } {
 
 function skipBERInteger(bytes: Uint8Array, i: number): number {
   const limit = i + 5;
-  while (bytes[i++] & 0x80 && i < limit) {
-    /* do nothing */
-  }
+  while (bytes[i++] & 0x80 && i < limit) {}
   return i;
 }
 

package/src/utils/webvtt-parser.ts

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

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

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