hls.js 1.5.14-0.canary.10431 → 1.5.14-0.canary.10432

package/src/hls.ts

@@ -13,6 +13,7 @@ import { enableStreamingMode, hlsDefaultConfig, mergeConfig } from './config';
 import { EventEmitter } from 'eventemitter3';
 import { Events } from './events';
 import { ErrorTypes, ErrorDetails } from './errors';
+import { version } from './version';
 import { isHdcpLevel, type HdcpLevel, type Level } from './types/level';
 import type { HlsEventEmitter, HlsListeners } from './events';
 import type AudioTrackController from './controller/audio-track-controller';
@@ -87,7 +88,7 @@ export default class Hls implements HlsEventEmitter {
    * Get the video-dev/hls.js package version.
    */
   static get version(): string {
-    return __VERSION__;
+    return version;
   }
 
   /**

package/src/remux/mp4-remuxer.ts

@@ -3,7 +3,6 @@ import MP4 from './mp4-generator';
 import type { HlsEventEmitter } from '../events';
 import { Events } from '../events';
 import { ErrorTypes, ErrorDetails } from '../errors';
-import { logger } from '../utils/logger';
 import type {
   InitSegmentData,
   Remuxer,
@@ -27,9 +26,9 @@ import type {
 } from '../types/demuxer';
 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';
+import type { ILogger } from '../utils/logger';
 
 const MAX_SILENT_FRAME_DURATION = 10 * 1000; // 10 seconds
 const AAC_SAMPLES_PER_FRAME = 1024;
@@ -40,9 +39,10 @@ let chromeVersion: number | null = null;
 let safariWebkitVersion: number | null = null;
 
 export default class MP4Remuxer implements Remuxer {
-  private observer: HlsEventEmitter;
-  private config: HlsConfig;
-  private typeSupported: TypeSupported;
+  private readonly logger: ILogger;
+  private readonly observer: HlsEventEmitter;
+  private readonly config: HlsConfig;
+  private readonly typeSupported: TypeSupported;
   private ISGenerated: boolean = false;
   private _initPTS: RationalTimestamp | null = null;
   private _initDTS: RationalTimestamp | null = null;
@@ -60,12 +60,13 @@ export default class MP4Remuxer implements Remuxer {
   constructor(
     observer: HlsEventEmitter,
     config: HlsConfig,
-    typeSupported,
-    vendor = '',
+    typeSupported: TypeSupported,
+    logger: ILogger,
   ) {
     this.observer = observer;
     this.config = config;
     this.typeSupported = typeSupported;
+    this.logger = logger;
     this.ISGenerated = false;
 
     if (chromeVersion === null) {
@@ -85,18 +86,18 @@ export default class MP4Remuxer implements Remuxer {
   }
 
   resetTimeStamp(defaultTimeStamp: RationalTimestamp | null) {
-    logger.log('[mp4-remuxer]: initPTS & initDTS reset');
+    this.logger.log('[mp4-remuxer]: initPTS & initDTS reset');
     this._initPTS = this._initDTS = defaultTimeStamp;
   }
 
   resetNextTimestamp() {
-    logger.log('[mp4-remuxer]: reset next timestamp');
+    this.logger.log('[mp4-remuxer]: reset next timestamp');
     this.isVideoContiguous = false;
     this.isAudioContiguous = false;
   }
 
   resetInitSegment() {
-    logger.log('[mp4-remuxer]: ISGenerated flag reset');
+    this.logger.log('[mp4-remuxer]: ISGenerated flag reset');
     this.ISGenerated = false;
     this.videoTrackConfig = undefined;
   }
@@ -116,7 +117,7 @@ export default class MP4Remuxer implements Remuxer {
       }
     }, videoSamples[0].pts);
     if (rolloverDetected) {
-      logger.debug('PTS rollover detected');
+      this.logger.debug('PTS rollover detected');
     }
     return startPTS;
   }
@@ -189,7 +190,7 @@ export default class MP4Remuxer implements Remuxer {
         if (!isVideoContiguous && this.config.forceKeyFrameOnDiscontinuity) {
           independent = true;
           if (firstKeyFrameIndex > 0) {
-            logger.warn(
+            this.logger.warn(
               `[mp4-remuxer]: Dropped ${firstKeyFrameIndex} out of ${length} video samples due to a missing keyframe`,
             );
             const startPTS = this.getVideoStartPts(videoTrack.samples);
@@ -200,7 +201,7 @@ export default class MP4Remuxer implements Remuxer {
               videoTrack.inputTimeScale;
             firstKeyFramePTS = videoTimeOffset;
           } else if (firstKeyFrameIndex === -1) {
-            logger.warn(
+            this.logger.warn(
               `[mp4-remuxer]: No keyframe found out of ${length} video samples`,
             );
             independent = false;
@@ -226,7 +227,7 @@ export default class MP4Remuxer implements Remuxer {
         if (enoughAudioSamples) {
           // if initSegment was generated without audio samples, regenerate it again
           if (!audioTrack.samplerate) {
-            logger.warn(
+            this.logger.warn(
               '[mp4-remuxer]: regenerate InitSegment as audio detected',
             );
             initSegment = this.generateIS(
@@ -251,7 +252,7 @@ export default class MP4Remuxer implements Remuxer {
             const audioTrackLength = audio ? audio.endPTS - audio.startPTS : 0;
             // if initSegment was generated without video samples, regenerate it again
             if (!videoTrack.inputTimeScale) {
-              logger.warn(
+              this.logger.warn(
                 '[mp4-remuxer]: regenerate InitSegment as video detected',
               );
               initSegment = this.generateIS(
@@ -518,7 +519,7 @@ export default class MP4Remuxer implements Remuxer {
       const foundOverlap = delta < -1;
       if (foundHole || foundOverlap) {
         if (foundHole) {
-          logger.warn(
+          this.logger.warn(
             `${(track.segmentCodec || '').toUpperCase()}: ${toMsFromMpegTsClock(
               delta,
               true,
@@ -527,7 +528,7 @@ export default class MP4Remuxer implements Remuxer {
             )}`,
           );
         } else {
-          logger.warn(
+          this.logger.warn(
             `${(track.segmentCodec || '').toUpperCase()}: ${toMsFromMpegTsClock(
               -delta,
               true,
@@ -570,7 +571,7 @@ export default class MP4Remuxer implements Remuxer {
               }
             }
           }
-          logger.log(
+          this.logger.log(
             `Video: Initial PTS/DTS adjusted: ${toMsFromMpegTsClock(
               firstPTS,
               true,
@@ -692,7 +693,7 @@ export default class MP4Remuxer implements Remuxer {
             } else {
               stretchedLastFrame = true;
             }
-            logger.log(
+            this.logger.log(
               `[mp4-remuxer]: It is approximately ${
                 deltaToFrameEnd / 90
               } ms to the next segment; using duration ${
@@ -741,7 +742,7 @@ export default class MP4Remuxer implements Remuxer {
           averageSampleDuration / maxDtsDelta < 0.025 &&
           outputSamples[0].cts === 0
         ) {
-          logger.warn(
+          this.logger.warn(
             'Found irregular gaps in sample duration. Using PTS instead of DTS to determine MP4 sample duration.',
           );
           let dts = firstDTS;
@@ -904,7 +905,7 @@ export default class MP4Remuxer implements Remuxer {
           alignedWithVideo
         ) {
           if (i === 0) {
-            logger.warn(
+            this.logger.warn(
               `Audio frame @ ${(pts / inputTimeScale).toFixed(
                 3,
               )}s overlaps nextAudioPts by ${Math.round(
@@ -936,7 +937,7 @@ export default class MP4Remuxer implements Remuxer {
           if (i === 0) {
             this.nextAudioPts = nextAudioPts = nextPts;
           }
-          logger.warn(
+          this.logger.warn(
             `[mp4-remuxer]: Injecting ${missing} audio frame @ ${(
               nextPts / inputTimeScale
             ).toFixed(3)}s due to ${Math.round(
@@ -950,7 +951,7 @@ export default class MP4Remuxer implements Remuxer {
               track.channelCount,
             );
             if (!fillFrame) {
-              logger.log(
+              this.logger.log(
                 '[mp4-remuxer]: Unable to get silent frame for given audio codec; duplicating last frame instead.',
               );
               fillFrame = sample.unit.subarray();

package/src/remux/passthrough-remuxer.ts

@@ -14,8 +14,9 @@ import {
   parseInitSegment,
 } from '../utils/mp4-tools';
 import { ElementaryStreamTypes } from '../loader/fragment';
-import { logger } from '../utils/logger';
 import { getCodecCompatibleName } from '../utils/codecs';
+import type { HlsEventEmitter } from '../events';
+import type { HlsConfig } from '../config';
 import type { TrackSet } from '../types/track';
 import type {
   InitSegmentData,
@@ -30,9 +31,12 @@ import type {
   PassthroughTrack,
 } from '../types/demuxer';
 import type { DecryptData } from '../loader/level-key';
+import type { TypeSupported } from '../utils/codecs';
+import type { ILogger } from '../utils/logger';
 import type { RationalTimestamp } from '../utils/timescale-conversion';
 
 class PassThroughRemuxer implements Remuxer {
+  private readonly logger: ILogger;
   private emitInitSegment: boolean = false;
   private audioCodec?: string;
   private videoCodec?: string;
@@ -41,6 +45,15 @@ class PassThroughRemuxer implements Remuxer {
   private initTracks?: TrackSet;
   private lastEndTime: number | null = null;
 
+  constructor(
+    observer: HlsEventEmitter,
+    config: HlsConfig,
+    typeSupported: TypeSupported,
+    logger: ILogger,
+  ) {
+    this.logger = logger;
+  }
+
   public destroy() {}
 
   public resetTimeStamp(defaultInitPTS: RationalTimestamp | null) {
@@ -111,7 +124,7 @@ class PassThroughRemuxer implements Remuxer {
         id: 'main',
       };
     } else {
-      logger.warn(
+      this.logger.warn(
         '[passthrough-remuxer.ts]: initSegment does not contain moov or trak boxes.',
       );
     }
@@ -160,7 +173,9 @@ class PassThroughRemuxer implements Remuxer {
     }
     if (!initData?.length) {
       // We can't remux if the initSegment could not be generated
-      logger.warn('[passthrough-remuxer.ts]: Failed to generate initSegment.');
+      this.logger.warn(
+        '[passthrough-remuxer.ts]: Failed to generate initSegment.',
+      );
       return result;
     }
     if (this.emitInitSegment) {
@@ -177,7 +192,7 @@ class PassThroughRemuxer implements Remuxer {
     ) {
       initSegment.initPTS = decodeTime - timeOffset;
       if (initPTS && initPTS.timescale === 1) {
-        logger.warn(
+        this.logger.warn(
           `Adjusting initPTS @${timeOffset} from ${initPTS.baseTime / initPTS.timescale} to ${initSegment.initPTS}`,
         );
       }
@@ -196,7 +211,7 @@ class PassThroughRemuxer implements Remuxer {
     if (duration > 0) {
       this.lastEndTime = endTime;
     } else {
-      logger.warn('Duration parsed from mp4 should be greater than zero');
+      this.logger.warn('Duration parsed from mp4 should be greater than zero');
       this.resetNextTimestamp();
     }
 
@@ -284,14 +299,14 @@ function getParsedTrackCodec(
       return getCodecCompatibleName(parsedCodec, preferManagedMediaSource);
     }
     const result = 'mp4a.40.5';
-    logger.info(
+    this.logger.info(
       `Parsed audio codec "${parsedCodec}" or audio object type not handled. Using "${result}"`,
     );
     return result;
   }
   // Provide defaults based on codec type
   // This allows for some playback of some fmp4 playlists without CODECS defined in manifest
-  logger.warn(`Unhandled video codec "${parsedCodec}"`);
+  this.logger.warn(`Unhandled video codec "${parsedCodec}"`);
   if (parsedCodec === 'hvc1' || parsedCodec === 'hev1') {
     return 'hvc1.1.6.L120.90';
   }

package/src/version.ts

@@ -0,0 +1 @@
+export const version = __VERSION__;