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

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

@@ -1,15 +1,12 @@
 import TaskLoop from '../task-loop';
 import { FragmentState } from './fragment-tracker';
 import { Bufferable, BufferHelper, BufferInfo } from '../utils/buffer-helper';
+import { logger } from '../utils/logger';
 import { Events } from '../events';
 import { ErrorDetails, ErrorTypes } from '../errors';
 import { ChunkMetadata } from '../types/transmuxer';
 import { appendUint8Array } from '../utils/mp4-tools';
 import { alignStream } from '../utils/discontinuities';
-import {
-  isFullSegmentEncryption,
-  getAesModeFromFullSegmentMethod,
-} from '../utils/encryption-methods-util';
 import {
   findFragmentByPDT,
   findFragmentByPTS,
@@ -100,8 +97,12 @@ export default class BaseStreamController
   protected startFragRequested: boolean = false;
   protected decrypter: Decrypter;
   protected initPTS: RationalTimestamp[] = [];
-  protected buffering: boolean = true;
-  private loadingParts: boolean = false;
+  protected onvseeking: EventListener | null = null;
+  protected onvended: EventListener | null = null;
+
+  private readonly logPrefix: string = '';
+  protected log: (msg: any) => void;
+  protected warn: (msg: any) => void;
 
   constructor(
     hls: Hls,
@@ -110,32 +111,18 @@ export default class BaseStreamController
     logPrefix: string,
     playlistType: PlaylistLevelType,
   ) {
-    super(logPrefix, hls.logger);
+    super();
     this.playlistType = playlistType;
+    this.logPrefix = logPrefix;
+    this.log = logger.log.bind(logger, `${logPrefix}:`);
+    this.warn = logger.warn.bind(logger, `${logPrefix}:`);
     this.hls = hls;
     this.fragmentLoader = new FragmentLoader(hls.config);
     this.keyLoader = keyLoader;
     this.fragmentTracker = fragmentTracker;
     this.config = hls.config;
     this.decrypter = new Decrypter(hls.config);
-  }
-
-  protected registerListeners() {
-    const { hls } = this;
-    hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-    hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
     hls.on(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
-    hls.on(Events.ERROR, this.onError, this);
-  }
-
-  protected unregisterListeners() {
-    const { hls } = this;
-    hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-    hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.off(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
-    hls.off(Events.ERROR, this.onError, this);
   }
 
   protected doTick() {
@@ -163,14 +150,6 @@ export default class BaseStreamController
     this.state = State.STOPPED;
   }
 
-  public pauseBuffering() {
-    this.buffering = false;
-  }
-
-  public resumeBuffering() {
-    this.buffering = true;
-  }
-
   protected _streamEnded(
     bufferInfo: BufferInfo,
     levelDetails: LevelDetails,
@@ -218,8 +197,10 @@ export default class BaseStreamController
     data: MediaAttachedData,
   ) {
     const media = (this.media = this.mediaBuffer = data.media);
-    media.addEventListener('seeking', this.onMediaSeeking);
-    media.addEventListener('ended', this.onMediaEnded);
+    this.onvseeking = this.onMediaSeeking.bind(this) as EventListener;
+    this.onvended = this.onMediaEnded.bind(this) as EventListener;
+    media.addEventListener('seeking', this.onvseeking);
+    media.addEventListener('ended', this.onvended);
     const config = this.config;
     if (this.levels && config.autoStartLoad && this.state === State.STOPPED) {
       this.startLoad(config.startPosition);
@@ -234,9 +215,10 @@ export default class BaseStreamController
     }
 
     // remove video listeners
-    if (media) {
-      media.removeEventListener('seeking', this.onMediaSeeking);
-      media.removeEventListener('ended', this.onMediaEnded);
+    if (media && this.onvseeking && this.onvended) {
+      media.removeEventListener('seeking', this.onvseeking);
+      media.removeEventListener('ended', this.onvended);
+      this.onvseeking = this.onvended = null;
     }
     if (this.keyLoader) {
       this.keyLoader.detach();
@@ -247,11 +229,7 @@ export default class BaseStreamController
     this.stopLoad();
   }
 
-  protected onManifestLoading() {}
-
-  protected onError(event: Events.ERROR, data: ErrorData) {}
-
-  protected onMediaSeeking = () => {
+  protected onMediaSeeking() {
     const { config, fragCurrent, media, mediaBuffer, state } = this;
     const currentTime: number = media ? media.currentTime : 0;
     const bufferInfo = BufferHelper.bufferInfo(
@@ -305,21 +283,6 @@ export default class BaseStreamController
       );
 
       this.lastCurrentTime = currentTime;
-      if (!this.loadingParts) {
-        const bufferEnd = Math.max(bufferInfo.end, currentTime);
-        const shouldLoadParts = this.shouldLoadParts(
-          this.getLevelDetails(),
-          bufferEnd,
-        );
-        if (shouldLoadParts) {
-          this.log(
-            `LL-Part loading ON after seeking to ${currentTime.toFixed(
-              2,
-            )} with buffer @${bufferEnd.toFixed(2)}`,
-          );
-          this.loadingParts = shouldLoadParts;
-        }
-      }
     }
 
     // in case seeking occurs although no media buffered, adjust startPosition and nextLoadPosition to seek target
@@ -329,17 +292,12 @@ export default class BaseStreamController
 
     // Async tick to speed up processing
     this.tickImmediate();
-  };
+  }
 
-  protected onMediaEnded = () => {
+  protected onMediaEnded() {
     // reset startPosition and lastCurrentTime to restart playback @ stream beginning
     this.startPosition = this.lastCurrentTime = 0;
-    if (this.playlistType === PlaylistLevelType.MAIN) {
-      this.hls.trigger(Events.MEDIA_ENDED, {
-        stalled: false,
-      });
-    }
-  };
+  }
 
   protected onManifestLoaded(
     event: Events.MANIFEST_LOADED,
@@ -350,10 +308,11 @@ export default class BaseStreamController
   }
 
   protected onHandlerDestroying() {
+    this.hls.off(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
     this.stopLoad();
     super.onHandlerDestroying();
     // @ts-ignore
-    this.hls = this.onMediaSeeking = this.onMediaEnded = null;
+    this.hls = null;
   }
 
   protected onHandlerDestroyed() {
@@ -537,7 +496,7 @@ export default class BaseStreamController
           payload.byteLength > 0 &&
           decryptData?.key &&
           decryptData.iv &&
-          isFullSegmentEncryption(decryptData.method)
+          decryptData.method === 'AES-128'
         ) {
           const startTime = self.performance.now();
           // decrypt init segment data
@@ -546,7 +505,6 @@ export default class BaseStreamController
               new Uint8Array(payload),
               decryptData.key.buffer,
               decryptData.iv.buffer,
-              getAesModeFromFullSegmentMethod(decryptData.method),
             )
             .catch((err) => {
               hls.trigger(Events.ERROR, {
@@ -590,9 +548,7 @@ export default class BaseStreamController
       throw new Error('init load aborted, missing levels');
     }
     const stats = data.frag.stats;
-    if (this.state !== State.STOPPED) {
-      this.state = State.IDLE;
-    }
+    this.state = State.IDLE;
     data.frag.data = new Uint8Array(data.payload);
     stats.parsing.start = stats.buffering.start = self.performance.now();
     stats.parsing.end = stats.buffering.end = self.performance.now();
@@ -703,7 +659,7 @@ export default class BaseStreamController
     if (frag.encrypted && !frag.decryptdata?.key) {
       this.log(
         `Loading key for ${frag.sn} of [${details.startSN}-${details.endSN}], ${
-          this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track'
+          this.logPrefix === '[stream-controller]' ? 'level' : 'track'
         } ${frag.level}`,
       );
       this.state = State.KEY_LOADING;
@@ -727,23 +683,8 @@ export default class BaseStreamController
       this.keyLoader.loadClear(frag, details.encryptedFragments);
     }
 
-    const fragPrevious = this.fragPrevious;
-    if (
-      frag.sn !== 'initSegment' &&
-      (!fragPrevious || frag.sn !== fragPrevious.sn)
-    ) {
-      const shouldLoadParts = this.shouldLoadParts(level.details, frag.end);
-      if (shouldLoadParts !== this.loadingParts) {
-        this.log(
-          `LL-Part loading ${
-            shouldLoadParts ? 'ON' : 'OFF'
-          } loading sn ${fragPrevious?.sn}->${frag.sn}`,
-        );
-        this.loadingParts = shouldLoadParts;
-      }
-    }
     targetBufferTime = Math.max(frag.start, targetBufferTime || 0);
-    if (this.loadingParts && frag.sn !== 'initSegment') {
+    if (this.config.lowLatencyMode && frag.sn !== 'initSegment') {
       const partList = details.partList;
       if (partList && progressCallback) {
         if (targetBufferTime > frag.end && details.fragmentHint) {
@@ -758,7 +699,7 @@ export default class BaseStreamController
             } of playlist [${details.startSN}-${
               details.endSN
             }] parts [0-${partIndex}-${partList.length - 1}] ${
-              this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track'
+              this.logPrefix === '[stream-controller]' ? 'level' : 'track'
             }: ${frag.level}, target: ${parseFloat(
               targetBufferTime.toFixed(3),
             )}`,
@@ -814,22 +755,10 @@ export default class BaseStreamController
       }
     }
 
-    if (frag.sn !== 'initSegment' && this.loadingParts) {
-      this.log(
-        `LL-Part loading OFF after next part miss @${targetBufferTime.toFixed(
-          2,
-        )}`,
-      );
-      this.loadingParts = false;
-    } else if (!frag.url) {
-      // Selected fragment hint for part but not loading parts
-      return Promise.resolve(null);
-    }
-
     this.log(
       `Loading fragment ${frag.sn} cc: ${frag.cc} ${
         details ? 'of [' + details.startSN + '-' + details.endSN + '] ' : ''
-      }${this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track'}: ${
+      }${this.logPrefix === '[stream-controller]' ? 'level' : 'track'}: ${
         frag.level
       }, target: ${parseFloat(targetBufferTime.toFixed(3))}`,
     );
@@ -953,50 +882,9 @@ export default class BaseStreamController
     if (part) {
       part.stats.parsing.end = now;
     }
-    // See if part loading should be disabled/enabled based on buffer and playback position.
-    if (frag.sn !== 'initSegment') {
-      const levelDetails = this.getLevelDetails();
-      const loadingPartsAtEdge = levelDetails && frag.sn > levelDetails.endSN;
-      const shouldLoadParts =
-        loadingPartsAtEdge || this.shouldLoadParts(levelDetails, frag.end);
-      if (shouldLoadParts !== this.loadingParts) {
-        this.log(
-          `LL-Part loading ${
-            shouldLoadParts ? 'ON' : 'OFF'
-          } after parsing segment ending @${frag.end.toFixed(2)}`,
-        );
-        this.loadingParts = shouldLoadParts;
-      }
-    }
-
     this.updateLevelTiming(frag, part, level, chunkMeta.partial);
   }
 
-  private shouldLoadParts(
-    details: LevelDetails | undefined,
-    bufferEnd: number,
-  ): boolean {
-    if (this.config.lowLatencyMode) {
-      if (!details) {
-        return this.loadingParts;
-      }
-      if (details?.partList) {
-        // Buffer must be ahead of first part + duration of parts after last segment
-        // and playback must be at or past segment adjacent to part list
-        const firstPart = details.partList[0];
-        const safePartStart =
-          firstPart.end + (details.fragmentHint?.duration || 0);
-        if (
-          bufferEnd >= safePartStart &&
-          this.lastCurrentTime > firstPart.start - firstPart.fragment.duration
-        ) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
   protected getCurrentContext(
     chunkMeta: ChunkMetadata,
   ): { frag: Fragment; part: Part | null; level: Level } | null {
@@ -1113,10 +1001,7 @@ export default class BaseStreamController
     // Workaround flaw in getting forward buffer when maxBufferHole is smaller than gap at current pos
     if (bufferInfo.len === 0 && bufferInfo.nextStart !== undefined) {
       const bufferedFragAtPos = this.fragmentTracker.getBufferedFrag(pos, type);
-      if (
-        bufferedFragAtPos &&
-        (bufferInfo.nextStart <= bufferedFragAtPos.end || bufferedFragAtPos.gap)
-      ) {
+      if (bufferedFragAtPos && bufferInfo.nextStart < bufferedFragAtPos.end) {
         return BufferHelper.bufferInfo(
           bufferable,
           pos,
@@ -1129,7 +1014,7 @@ export default class BaseStreamController
 
   protected getMaxBufferLength(levelBitrate?: number): number {
     const { config } = this;
-    let maxBufLen: number;
+    let maxBufLen;
     if (levelBitrate) {
       maxBufLen = Math.max(
         (8 * config.maxBufferSize) / levelBitrate,
@@ -1182,8 +1067,7 @@ export default class BaseStreamController
     // find fragment index, contiguous with end of buffer position
     const { config } = this;
     const start = fragments[0].start;
-    const canLoadParts = config.lowLatencyMode && !!levelDetails.partList;
-    let frag: Fragment | null = null;
+    let frag;
 
     if (levelDetails.live) {
       const initialLiveManifestSize = config.initialLiveManifestSize;
@@ -1203,10 +1087,6 @@ export default class BaseStreamController
           this.startPosition === -1) ||
         pos < start
       ) {
-        if (canLoadParts && !this.loadingParts) {
-          this.log(`LL-Part loading ON for initial live fragment`);
-          this.loadingParts = true;
-        }
         frag = this.getInitialLiveFragment(levelDetails, fragments);
         this.startPosition = this.nextLoadPosition = frag
           ? this.hls.liveSyncPosition || frag.start
@@ -1219,7 +1099,7 @@ export default class BaseStreamController
 
     // If we haven't run into any special cases already, just load the fragment most closely matching the requested position
     if (!frag) {
-      const end = this.loadingParts
+      const end = config.lowLatencyMode
         ? levelDetails.partEnd
         : levelDetails.fragmentEnd;
       frag = this.getFragmentAtPosition(pos, end, levelDetails);
@@ -1402,7 +1282,7 @@ export default class BaseStreamController
     const partList = levelDetails.partList;
 
     const loadingParts = !!(
-      this.loadingParts &&
+      config.lowLatencyMode &&
       partList?.length &&
       fragmentHint
     );
@@ -1681,7 +1561,7 @@ export default class BaseStreamController
           errorAction.resolved = true;
         }
       } else {
-        this.warn(
+        logger.warn(
           `${data.details} reached or exceeded max retry (${retryCount})`,
         );
         return;
@@ -1770,9 +1650,7 @@ export default class BaseStreamController
     this.log('Reset loading state');
     this.fragCurrent = null;
     this.fragPrevious = null;
-    if (this.state !== State.STOPPED) {
-      this.state = State.IDLE;
-    }
+    this.state = State.IDLE;
   }
 
   protected resetStartWhenNotLoaded(level: Level | null): void {