hls.js 1.5.7-0.canary.10040 → 1.5.7

package/src/crypt/fast-aes-key.ts

@@ -1,35 +1,16 @@
-import { DecrypterAesMode } from './decrypter-aes-mode';
-
 export default class FastAESKey {
   private subtle: any;
   private key: ArrayBuffer;
-  private aesMode: DecrypterAesMode;
 
-  constructor(subtle, key, aesMode: DecrypterAesMode) {
+  constructor(subtle, key) {
     this.subtle = subtle;
     this.key = key;
-    this.aesMode = aesMode;
   }
 
   expandKey() {
-    const subtleAlgoName = getSubtleAlgoName(this.aesMode);
-    return this.subtle.importKey(
-      'raw',
-      this.key,
-      { name: subtleAlgoName },
-      false,
-      ['encrypt', 'decrypt'],
-    );
-  }
-}
-
-function getSubtleAlgoName(aesMode: DecrypterAesMode) {
-  switch (aesMode) {
-    case DecrypterAesMode.cbc:
-      return 'AES-CBC';
-    case DecrypterAesMode.ctr:
-      return 'AES-CTR';
-    default:
-      throw new Error(`[FastAESKey] invalid aes mode ${aesMode}`);
+    return this.subtle.importKey('raw', this.key, { name: 'AES-CBC' }, false, [
+      'encrypt',
+      'decrypt',
+    ]);
   }
 }

package/src/demux/audio/adts.ts

@@ -17,7 +17,6 @@ type AudioConfig = {
   samplerate: number;
   channelCount: number;
   codec: string;
-  parsedCodec: string;
   manifestCodec: string;
 };
 
@@ -33,7 +32,6 @@ export function getAudioConfig(
   audioCodec: string,
 ): AudioConfig | void {
   let adtsObjectType: number;
-  let originalAdtsObjectType: number;
   let adtsExtensionSamplingIndex: number;
   let adtsChannelConfig: number;
   let config: number[];
@@ -44,8 +42,7 @@ export function getAudioConfig(
     8000, 7350,
   ];
   // byte 2
-  adtsObjectType = originalAdtsObjectType =
-    ((data[offset + 2] & 0xc0) >>> 6) + 1;
+  adtsObjectType = ((data[offset + 2] & 0xc0) >>> 6) + 1;
   const adtsSamplingIndex = (data[offset + 2] & 0x3c) >>> 2;
   if (adtsSamplingIndex > adtsSamplingRates.length - 1) {
     const error = new Error(`invalid ADTS sampling index:${adtsSamplingIndex}`);
@@ -64,8 +61,8 @@ export function getAudioConfig(
   logger.log(
     `manifest codec:${audioCodec}, ADTS type:${adtsObjectType}, samplingIndex:${adtsSamplingIndex}`,
   );
-  // Firefox and Pale Moon: freq less than 24kHz = AAC SBR (HE-AAC)
-  if (/firefox|palemoon/i.test(userAgent)) {
+  // firefox: freq less than 24kHz = AAC SBR (HE-AAC)
+  if (/firefox/i.test(userAgent)) {
     if (adtsSamplingIndex >= 6) {
       adtsObjectType = 5;
       config = new Array(4);
@@ -170,7 +167,6 @@ export function getAudioConfig(
     samplerate: adtsSamplingRates[adtsSamplingIndex],
     channelCount: adtsChannelConfig,
     codec: 'mp4a.40.' + adtsObjectType,
-    parsedCodec: 'mp4a.40.' + originalAdtsObjectType,
     manifestCodec,
   };
 }
@@ -248,9 +244,8 @@ export function initTrackConfig(
     track.channelCount = config.channelCount;
     track.codec = config.codec;
     track.manifestCodec = config.manifestCodec;
-    track.parsedCodec = config.parsedCodec;
     logger.log(
-      `parsed codec:${track.parsedCodec}, codec:${track.codec}, rate:${config.samplerate}, channels:${config.channelCount}`,
+      `parsed codec:${track.codec}, rate:${config.samplerate}, channels:${config.channelCount}`,
     );
   }
 }

package/src/demux/sample-aes.ts

@@ -4,7 +4,6 @@
 
 import { HlsConfig } from '../config';
 import Decrypter from '../crypt/decrypter';
-import { DecrypterAesMode } from '../crypt/decrypter-aes-mode';
 import { HlsEventEmitter } from '../events';
 import type {
   AudioSample,
@@ -31,7 +30,6 @@ class SampleAesDecrypter {
       encryptedData,
       this.keyData.key.buffer,
       this.keyData.iv.buffer,
-      DecrypterAesMode.cbc,
     );
   }
 

package/src/demux/transmuxer-interface.ts

@@ -12,13 +12,14 @@ import Transmuxer, {
 } from '../demux/transmuxer';
 import { logger } from '../utils/logger';
 import { ErrorTypes, ErrorDetails } from '../errors';
+import { getMediaSource } from '../utils/mediasource-helper';
 import { EventEmitter } from 'eventemitter3';
 import { Fragment, Part } from '../loader/fragment';
-import { getM2TSSupportedAudioTypes } from '../utils/codecs';
 import type { ChunkMetadata, TransmuxerResult } from '../types/transmuxer';
 import type Hls from '../hls';
 import type { HlsEventEmitter } from '../events';
 import type { PlaylistLevelType } from '../types/loader';
+import type { TypeSupported } from './tsdemuxer';
 import type { RationalTimestamp } from '../utils/timescale-conversion';
 
 export default class TransmuxerInterface {
@@ -63,9 +64,16 @@ export default class TransmuxerInterface {
     this.observer.on(Events.FRAG_DECRYPTED, forwardMessage);
     this.observer.on(Events.ERROR, forwardMessage);
 
-    const m2tsTypeSupported = getM2TSSupportedAudioTypes(
-      config.preferManagedMediaSource,
-    );
+    const MediaSource = getMediaSource(config.preferManagedMediaSource) || {
+      isTypeSupported: () => false,
+    };
+    const m2tsTypeSupported: TypeSupported = {
+      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,
+    };
 
     // navigator.vendor is not always available in Web Worker
     // refer to https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope/navigator

package/src/demux/transmuxer-worker.ts

@@ -1,6 +1,6 @@
 import Transmuxer, { isPromise } from '../demux/transmuxer';
 import { Events } from '../events';
-import { enableLogs, type ILogFunction, type ILogger } from '../utils/logger';
+import { ILogFunction, enableLogs, logger } from '../utils/logger';
 import { EventEmitter } from 'eventemitter3';
 import { ErrorDetails, ErrorTypes } from '../errors';
 import type { RemuxedTrack, RemuxerResult } from '../types/remuxer';
@@ -21,7 +21,7 @@ function startWorker(self) {
   observer.on(Events.ERROR, forwardMessage);
 
   // forward logger events to main thread
-  const forwardWorkerLogs = (logger: ILogger) => {
+  const forwardWorkerLogs = () => {
     for (const logFn in logger) {
       const func: ILogFunction = (message?) => {
         forwardMessage('workerLog', {
@@ -46,8 +46,8 @@ function startWorker(self) {
           data.vendor,
           data.id,
         );
-        const logger = enableLogs(config.debug, data.id);
-        forwardWorkerLogs(logger);
+        enableLogs(config.debug, data.id);
+        forwardWorkerLogs();
         forwardMessage('init', null);
         break;
       }

package/src/demux/transmuxer.ts

@@ -4,23 +4,18 @@ import { ErrorTypes, ErrorDetails } from '../errors';
 import Decrypter from '../crypt/decrypter';
 import AACDemuxer from './audio/aacdemuxer';
 import MP4Demuxer from '../demux/mp4demuxer';
-import TSDemuxer from '../demux/tsdemuxer';
+import TSDemuxer, { TypeSupported } from '../demux/tsdemuxer';
 import MP3Demuxer from './audio/mp3demuxer';
 import { AC3Demuxer } from './audio/ac3-demuxer';
 import MP4Remuxer from '../remux/mp4-remuxer';
 import PassThroughRemuxer from '../remux/passthrough-remuxer';
 import { logger } from '../utils/logger';
-import {
-  isFullSegmentEncryption,
-  getAesModeFromFullSegmentMethod,
-} from '../utils/encryption-methods-util';
 import type { Demuxer, DemuxerResult, KeyData } from '../types/demuxer';
 import type { Remuxer } from '../types/remuxer';
 import type { TransmuxerResult, ChunkMetadata } from '../types/transmuxer';
 import type { HlsConfig } from '../config';
 import type { DecryptData } from '../loader/level-key';
 import type { PlaylistLevelType } from '../types/loader';
-import type { TypeSupported } from '../utils/codecs';
 import type { RationalTimestamp } from '../utils/timescale-conversion';
 import { optionalSelf } from '../utils/global';
 
@@ -119,10 +114,8 @@ export default class Transmuxer {
     } = transmuxConfig;
 
     const keyData = getEncryptionType(uintData, decryptdata);
-    if (keyData && isFullSegmentEncryption(keyData.method)) {
+    if (keyData && keyData.method === 'AES-128') {
       const decrypter = this.getDecrypter();
-      const aesMode = getAesModeFromFullSegmentMethod(keyData.method);
-
       // Software decryption is synchronous; webCrypto is not
       if (decrypter.isSync()) {
         // Software decryption is progressive. Progressive decryption may not return a result on each call. Any cached
@@ -131,7 +124,6 @@ export default class Transmuxer {
           uintData,
           keyData.key.buffer,
           keyData.iv.buffer,
-          aesMode,
         );
         // For Low-Latency HLS Parts, decrypt in place, since part parsing is expected on push progress
         const loadingParts = chunkMeta.part > -1;
@@ -145,12 +137,7 @@ export default class Transmuxer {
         uintData = new Uint8Array(decryptedData);
       } else {
         this.decryptionPromise = decrypter
-          .webCryptoDecrypt(
-            uintData,
-            keyData.key.buffer,
-            keyData.iv.buffer,
-            aesMode,
-          )
+          .webCryptoDecrypt(uintData, keyData.key.buffer, keyData.iv.buffer)
           .then((decryptedData): TransmuxerResult => {
             // Calling push here is important; if flush() is called while this is still resolving, this ensures that
             // the decrypted data has been transmuxed

package/src/demux/tsdemuxer.ts

@@ -2,7 +2,7 @@
  * highly optimized TS demuxer:
  * parse PAT, PMT
  * extract PES packet from audio and video PIDs
- * extract AVC/H264 (or HEVC/H265) NAL units and AAC/ADTS samples from PES packet
+ * extract AVC/H264 NAL units and AAC/ADTS samples from PES packet
  * trigger the remuxer upon parsing completion
  * it also tries to workaround as best as it can audio codec switch (HE-AAC to AAC and vice versa), without having to restart the MediaSource.
  * it also controls the remuxing process :
@@ -12,9 +12,7 @@
 import * as ADTS from './audio/adts';
 import * as MpegAudio from './audio/mpegaudio';
 import * as AC3 from './audio/ac3-demuxer';
-import BaseVideoParser from './video/base-video-parser';
 import AvcVideoParser from './video/avc-video-parser';
-import HevcVideoParser from './video/hevc-video-parser';
 import SampleAesDecrypter from './sample-aes';
 import { Events } from '../events';
 import { appendUint8Array, RemuxerTrackIdConfig } from '../utils/mp4-tools';
@@ -22,21 +20,20 @@ import { logger } from '../utils/logger';
 import { ErrorTypes, ErrorDetails } from '../errors';
 import type { HlsConfig } from '../config';
 import type { HlsEventEmitter } from '../events';
-import type { TypeSupported } from '../utils/codecs';
 import {
+  DemuxedVideoTrack,
+  DemuxedAudioTrack,
+  DemuxedTrack,
+  Demuxer,
+  DemuxerResult,
+  VideoSample,
+  DemuxedMetadataTrack,
+  DemuxedUserdataTrack,
+  ElementaryStreamData,
+  KeyData,
   MetadataSchema,
-  type DemuxedVideoTrack,
-  type DemuxedAudioTrack,
-  type DemuxedTrack,
-  type Demuxer,
-  type DemuxerResult,
-  type VideoSample,
-  type DemuxedMetadataTrack,
-  type DemuxedUserdataTrack,
-  type ElementaryStreamData,
-  type KeyData,
 } from '../types/demuxer';
-import type { AudioFrame } from '../types/demuxer';
+import { AudioFrame } from '../types/demuxer';
 
 export type ParsedTimestamp = {
   pts?: number;
@@ -51,6 +48,12 @@ export type PES = ParsedTimestamp & {
 export type ParsedVideoSample = ParsedTimestamp &
   Omit<VideoSample, 'pts' | 'dts'>;
 
+export interface TypeSupported {
+  mpeg: boolean;
+  mp3: boolean;
+  ac3: boolean;
+}
+
 const PACKET_LENGTH = 188;
 
 class TSDemuxer implements Demuxer {
@@ -71,7 +74,7 @@ class TSDemuxer implements Demuxer {
   private _txtTrack?: DemuxedUserdataTrack;
   private aacOverFlow: AudioFrame | null = null;
   private remainderData: Uint8Array | null = null;
-  private videoParser: BaseVideoParser | null;
+  private videoParser: AvcVideoParser;
 
   constructor(
     observer: HlsEventEmitter,
@@ -81,7 +84,7 @@ class TSDemuxer implements Demuxer {
     this.observer = observer;
     this.config = config;
     this.typeSupported = typeSupported;
-    this.videoParser = null;
+    this.videoParser = new AvcVideoParser();
   }
 
   static probe(data: Uint8Array) {
@@ -289,27 +292,13 @@ class TSDemuxer implements Demuxer {
           case videoPid:
             if (stt) {
               if (videoData && (pes = parsePES(videoData))) {
-                if (this.videoParser === null) {
-                  switch (videoTrack.segmentCodec) {
-                    case 'avc':
-                      this.videoParser = new AvcVideoParser();
-                      break;
-                    case 'hevc':
-                      if (__USE_M2TS_ADVANCED_CODECS__) {
-                        this.videoParser = new HevcVideoParser();
-                      }
-                      break;
-                  }
-                }
-                if (this.videoParser !== null) {
-                  this.videoParser.parsePES(
-                    videoTrack,
-                    textTrack,
-                    pes,
-                    false,
-                    this._duration,
-                  );
-                }
+                this.videoParser.parseAVCPES(
+                  videoTrack,
+                  textTrack,
+                  pes,
+                  false,
+                  this._duration,
+                );
               }
 
               videoData = { data: [], size: 0 };
@@ -481,28 +470,14 @@ class TSDemuxer implements Demuxer {
     // try to parse last PES packets
     let pes: PES | null;
     if (videoData && (pes = parsePES(videoData))) {
-      if (this.videoParser === null) {
-        switch (videoTrack.segmentCodec) {
-          case 'avc':
-            this.videoParser = new AvcVideoParser();
-            break;
-          case 'hevc':
-            if (__USE_M2TS_ADVANCED_CODECS__) {
-              this.videoParser = new HevcVideoParser();
-            }
-            break;
-        }
-      }
-      if (this.videoParser !== null) {
-        this.videoParser.parsePES(
-          videoTrack as DemuxedVideoTrack,
-          textTrack as DemuxedUserdataTrack,
-          pes,
-          true,
-          this._duration,
-        );
-        videoTrack.pesData = null;
-      }
+      this.videoParser.parseAVCPES(
+        videoTrack as DemuxedVideoTrack,
+        textTrack as DemuxedUserdataTrack,
+        pes,
+        true,
+        this._duration,
+      );
+      videoTrack.pesData = null;
     } else {
       // either avcData null or PES truncated, keep it for next frag parsing
       videoTrack.pesData = videoData;
@@ -899,17 +874,8 @@ function parsePMT(
       case 0x87:
         logger.warn('Unsupported EC-3 in M2TS found');
         break;
-
-      case 0x24: // ITU-T Rec. H.265 and ISO/IEC 23008-2 (HEVC)
-        if (__USE_M2TS_ADVANCED_CODECS__) {
-          if (result.videoPid === -1) {
-            result.videoPid = pid;
-            result.segmentVideoCodec = 'hevc';
-            logger.log('HEVC in M2TS found');
-          }
-        } else {
-          logger.warn('Unsupported HEVC in M2TS found');
-        }
+      case 0x24:
+        logger.warn('Unsupported HEVC in M2TS found');
         break;
 
       default: