hls.js 1.6.0-beta.3.0.canary.10980 → 1.6.0-beta.3.0.canary.10982

package/package.json

@@ -134,5 +134,5 @@
     "url-toolkit": "2.2.5",
     "wrangler": "3.109.2"
   },
-  "version": "1.6.0-beta.3.0.canary.10980"
+  "version": "1.6.0-beta.3.0.canary.10982"
 }

package/src/config.ts

@@ -308,7 +308,7 @@ export type HlsConfig = {
   interstitialsController?: typeof InterstitialsController;
   // Option to disable internal playback handling of Interstitials (set to false to disable Interstitials playback without disabling parsing and schedule events)
   enableInterstitialPlayback: boolean;
-  // Option to disable appending Interstitals inline on same timeline and MediaSource as Primary media
+  // Option to disable appending Interstitials inline on same timeline and MediaSource as Primary media
   interstitialAppendInPlace: boolean;
   // How many seconds past the end of a live playlist to preload Interstitial assets
   interstitialLiveLookAhead: number;
@@ -440,7 +440,7 @@ export const hlsDefaultConfig: HlsConfig = {
   enableEmsgMetadataCues: true,
   enableEmsgKLVMetadata: false,
   enableID3MetadataCues: true,
-  enableInterstitialPlayback: __USE_INTERSTITALS__,
+  enableInterstitialPlayback: __USE_INTERSTITIALS__,
   interstitialAppendInPlace: true,
   interstitialLiveLookAhead: 10,
   useMediaCapabilities: __USE_MEDIA_CAPABILITIES__,
@@ -533,7 +533,7 @@ export const hlsDefaultConfig: HlsConfig = {
       : defaultLoadPolicy,
   },
   interstitialAssetListLoadPolicy: {
-    default: __USE_INTERSTITALS__
+    default: __USE_INTERSTITIALS__
       ? {
           maxTimeToFirstByteMs: 10000,
           maxLoadTimeMs: 30000,
@@ -582,7 +582,7 @@ export const hlsDefaultConfig: HlsConfig = {
   contentSteeringController: __USE_CONTENT_STEERING__
     ? ContentSteeringController
     : undefined,
-  interstitialsController: __USE_INTERSTITALS__
+  interstitialsController: __USE_INTERSTITIALS__
     ? InterstitialsController
     : undefined,
 };

package/src/controller/abr-controller.ts

@@ -8,6 +8,7 @@ import {
   requiresMediaCapabilitiesDecodingInfo,
   SUPPORTED_INFO_DEFAULT,
 } from '../utils/mediacapabilities-helper';
+import { isHEVC } from '../utils/mp4-tools';
 import {
   type AudioTracksByGroup,
   type CodecSetTier,
@@ -804,7 +805,7 @@ class AbrController extends Logger implements AbrComponentAPI {
             currentBw,
             audioPreference,
           ) ||
-            levelInfo.videoCodec?.substring(0, 4) === 'hvc1') // Force media capabilities check for HEVC to avoid failure on Windows
+            isHEVC(levelInfo.videoCodec)) // Force media capabilities check for HEVC to avoid failure on Windows
         ) {
           levelInfo.supportedPromise = getMediaDecodingInfoPromise(
             levelInfo,

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

@@ -797,13 +797,15 @@ class AudioStreamController
           this.state = State.IDLE;
         }
         break;
+      case ErrorDetails.BUFFER_ADD_CODEC_ERROR:
       case ErrorDetails.BUFFER_APPEND_ERROR:
-      case ErrorDetails.BUFFER_FULL_ERROR:
-        if (!data.parent || data.parent !== 'audio') {
+        if (data.parent !== 'audio') {
           return;
         }
-        if (data.details === ErrorDetails.BUFFER_APPEND_ERROR) {
-          this.resetLoadingState();
+        this.resetLoadingState();
+        break;
+      case ErrorDetails.BUFFER_FULL_ERROR:
+        if (data.parent !== 'audio') {
           return;
         }
         if (this.reduceLengthAndFlushBuffer(data)) {
@@ -954,7 +956,7 @@ class AudioStreamController
     }
     const track = tracks.audio;
 
-    track.id = 'audio';
+    track.id = PlaylistLevelType.AUDIO;
 
     const variantAudioCodecs = currentLevel.audioCodec;
     this.log(

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

@@ -454,7 +454,7 @@ export default class BaseStreamController
   ) {
     const config = this.hls.config;
     if (
-      __USE_INTERSTITALS__ &&
+      __USE_INTERSTITIALS__ &&
       config.interstitialsController &&
       config.enableInterstitialPlayback !== false &&
       frag.type !== PlaylistLevelType.SUBTITLE
@@ -488,7 +488,7 @@ export default class BaseStreamController
           }
         }
       }
-      // Skip loading of fragments that overlap completely with appendInPlace interstitals
+      // Skip loading of fragments that overlap completely with appendInPlace interstitials
       const playerQueue = interstitials?.playerQueue;
       if (playerQueue) {
         for (let i = playerQueue.length; i--; ) {

package/src/controller/buffer-controller.ts

@@ -1336,7 +1336,6 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
       } else {
         // ok, let's create them now !
         this.createSourceBuffers();
-        this.bufferCreated();
       }
     }
   }
@@ -1409,6 +1408,10 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
           this.error(
             `error while trying to add sourceBuffer: ${error.message}`,
           );
+          // remove init segment from queue and delete track info
+          this.shiftAndExecuteNext(type);
+          this.operationQueue?.removeBlockers();
+          delete this.tracks[type];
           this.hls.trigger(Events.ERROR, {
             type: ErrorTypes.MEDIA_ERROR,
             details: ErrorDetails.BUFFER_ADD_CODEC_ERROR,
@@ -1416,12 +1419,14 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
             error,
             sourceBufferName: type,
             mimeType: mimeType,
+            parent: track.id as PlaylistLevelType,
           });
-          break;
+          return;
         }
         this.trackSourceBuffer(type, track);
       }
     }
+    this.bufferCreated();
   }
 
   private getTrackCodec(track: BaseTrack, trackName: SourceBufferName): string {
@@ -1450,7 +1455,7 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
       id: track.id,
       listeners: [],
     };
-
+    this.removeBufferListeners(type);
     this.addBufferListener(type, 'updatestart', this.onSBUpdateStart);
     this.addBufferListener(type, 'updateend', this.onSBUpdateEnd);
     this.addBufferListener(type, 'error', this.onSBUpdateError);

package/src/controller/error-controller.ts

@@ -3,6 +3,7 @@ import { ErrorDetails, ErrorTypes } from '../errors';
 import { Events } from '../events';
 import { HdcpLevels } from '../types/level';
 import { PlaylistContextType, PlaylistLevelType } from '../types/loader';
+import { getCodecsForMimeType } from '../utils/codecs';
 import {
   getRetryConfig,
   isTimeoutError,
@@ -506,6 +507,19 @@ export default class ErrorController
       data.errorAction.resolved = true;
       // Stream controller is responsible for this but won't switch on false start
       this.hls.nextLoadLevel = this.hls.nextAutoLevel;
+      if (
+        data.details === ErrorDetails.BUFFER_ADD_CODEC_ERROR &&
+        data.mimeType &&
+        data.sourceBufferName !== 'audiovideo'
+      ) {
+        const codec = getCodecsForMimeType(data.mimeType);
+        const levels = this.hls.levels;
+        for (let i = levels.length; i--; ) {
+          if (levels[i][`${data.sourceBufferName}Codec`] === codec) {
+            this.hls.removeLevel(i);
+          }
+        }
+      }
     }
   }
 }

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

@@ -461,7 +461,7 @@ class ID3TrackController implements ComponentAPI {
             this.id3Track.addCue(cue);
             cues[key] = cue;
             if (
-              __USE_INTERSTITALS__ &&
+              __USE_INTERSTITIALS__ &&
               this.hls.config.interstitialsController
             ) {
               if (key === 'X-ASSET-LIST' || key === 'X-ASSET-URL') {

package/src/controller/interstitial-player.ts

@@ -9,9 +9,17 @@ import {
 } from '../loader/interstitial-event';
 import { BufferHelper } from '../utils/buffer-helper';
 import type { HlsConfig } from '../config';
+import type { InterstitialScheduleEventItem } from '../controller/interstitials-schedule';
 import type Hls from '../hls';
 import type { BufferCodecsData, MediaAttachingData } from '../types/events';
 
+export interface InterstitialPlayer {
+  currentTime: number;
+  duration: number;
+  assetPlayers: (HlsAssetPlayer | null)[];
+  playingIndex: number;
+  scheduleItem: InterstitialScheduleEventItem | null;
+}
 export class HlsAssetPlayer {
   public readonly hls: Hls;
   public readonly interstitial: InterstitialEvent;
@@ -19,7 +27,6 @@ export class HlsAssetPlayer {
   public tracks: Partial<BufferCodecsData> | null = null;
   private hasDetails: boolean = false;
   private mediaAttached: HTMLMediaElement | null = null;
-  private playoutOffset: number = 0;
 
   constructor(
     HlsPlayerClass: typeof Hls,
@@ -49,8 +56,6 @@ export class HlsAssetPlayer {
       this.mediaAttached = media;
       const event = this.interstitial;
       if (event.playoutLimit) {
-        this.playoutOffset =
-          event.assetList[event.assetList.indexOf(assetItem)]?.startOffset || 0;
         media.addEventListener('timeupdate', this.checkPlayout);
       }
     });
@@ -59,7 +64,8 @@ export class HlsAssetPlayer {
   private checkPlayout = () => {
     const interstitial = this.interstitial;
     const playoutLimit = interstitial.playoutLimit;
-    if (this.playoutOffset + this.currentTime >= playoutLimit) {
+    const currentTime = this.currentTime;
+    if (this.startOffset + currentTime >= playoutLimit) {
       this.hls.trigger(Events.PLAYOUT_LIMIT_REACHED, {});
     }
   };
@@ -98,7 +104,7 @@ export class HlsAssetPlayer {
   }
 
   get duration(): number {
-    const duration = this.assetItem?.duration;
+    const duration = this.assetItem.duration;
     if (!duration) {
       return 0;
     }
@@ -113,6 +119,10 @@ export class HlsAssetPlayer {
     return Math.max(0, duration - this.currentTime);
   }
 
+  get startOffset(): number {
+    return this.assetItem.startOffset;
+  }
+
   get timelineOffset(): number {
     return this.hls?.config.timelineOffset || 0;
   }