hls.js 1.6.0-beta.2.0.canary.10894 → 1.6.0-beta.2.0.canary.10896

package/dist/hls.mjs

@@ -402,7 +402,7 @@ function enableLogs(debugConfig, context, 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 ${"1.6.0-beta.2.0.canary.10894"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.2.0.canary.10896"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -1234,11 +1234,10 @@ function matchesOption(option, track, matchPredicate) {
     name,
     lang,
     assocLang,
-    characteristics,
     default: isDefault
   } = option;
   const forced = option.forced;
-  return (groupId === undefined || track.groupId === groupId) && (name === undefined || track.name === name) && (lang === undefined || languagesMatch(lang, track.lang)) && (lang === undefined || track.assocLang === assocLang) && (isDefault === undefined || track.default === isDefault) && (forced === undefined || track.forced === forced) && (characteristics === undefined || characteristicsMatch(characteristics, track.characteristics)) && (matchPredicate === undefined || matchPredicate(option, track));
+  return (groupId === undefined || track.groupId === groupId) && (name === undefined || track.name === name) && (lang === undefined || languagesMatch(lang, track.lang)) && (lang === undefined || track.assocLang === assocLang) && (isDefault === undefined || track.default === isDefault) && (forced === undefined || track.forced === forced) && (!('characteristics' in option) || characteristicsMatch(option.characteristics || '', track.characteristics)) && (matchPredicate === undefined || matchPredicate(option, track));
 }
 function languagesMatch(languageA, languageB = '--') {
   if (languageA.length === languageB.length) {
@@ -9835,7 +9834,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.2.0.canary.10894";
+const version = "1.6.0-beta.2.0.canary.10896";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -16082,30 +16081,6 @@ class TransmuxerInterface {
   }
 }
 
-function subtitleOptionsIdentical(trackList1, trackList2) {
-  if (trackList1.length !== trackList2.length) {
-    return false;
-  }
-  for (let i = 0; i < trackList1.length; i++) {
-    if (!mediaAttributesIdentical(trackList1[i].attrs, trackList2[i].attrs)) {
-      return false;
-    }
-  }
-  return true;
-}
-function mediaAttributesIdentical(attrs1, attrs2, customAttributes) {
-  // Media options with the same rendition ID must be bit identical
-  const stableRenditionId = attrs1['STABLE-RENDITION-ID'];
-  if (stableRenditionId && !customAttributes) {
-    return stableRenditionId === attrs2['STABLE-RENDITION-ID'];
-  }
-  // When rendition ID is not present, compare attributes
-  return !(customAttributes || ['LANGUAGE', 'NAME', 'CHARACTERISTICS', 'AUTOSELECT', 'DEFAULT', 'FORCED', 'ASSOC-LANGUAGE']).some(subtitleAttribute => attrs1[subtitleAttribute] !== attrs2[subtitleAttribute]);
-}
-function subtitleTrackMatchesTextTrack(subtitleTrack, textTrack) {
-  return textTrack.label.toLowerCase() === subtitleTrack.name.toLowerCase() && (!textTrack.language || textTrack.language.toLowerCase() === (subtitleTrack.lang || '').toLowerCase());
-}
-
 const TICK_INTERVAL$2 = 100; // how often to tick in ms
 
 class AudioStreamController extends BaseStreamController {
@@ -16369,11 +16344,7 @@ class AudioStreamController extends BaseStreamController {
     if (bufferInfo === null) {
       return;
     }
-    const {
-      bufferedTrack,
-      switchingTrack
-    } = this;
-    if (!switchingTrack && this._streamEnded(bufferInfo, trackDetails)) {
+    if (!this.switchingTrack && this._streamEnded(bufferInfo, trackDetails)) {
       hls.trigger(Events.BUFFER_EOS, {
         type: 'audio'
       });
@@ -16385,13 +16356,9 @@ class AudioStreamController extends BaseStreamController {
     const fragments = trackDetails.fragments;
     const start = fragments[0].start;
     const loadPosition = this.getLoadPosition();
-    let targetBufferTime = this.flushing ? loadPosition : bufferInfo.end;
-    if (switchingTrack && media) {
+    const targetBufferTime = this.flushing ? loadPosition : bufferInfo.end;
+    if (this.switchingTrack && media) {
       const pos = loadPosition;
-      // STABLE
-      if (bufferedTrack && !mediaAttributesIdentical(switchingTrack.attrs, bufferedTrack.attrs)) {
-        targetBufferTime = pos;
-      }
       // if currentTime (pos) is less than alt audio playlist start time, it means that alt audio is ahead of currentTime
       if (trackDetails.PTSKnown && pos < start) {
         // if everything is buffered from pos to start or if audio buffer upfront, let's seek to start
@@ -16403,7 +16370,7 @@ class AudioStreamController extends BaseStreamController {
     }
 
     // if buffer length is less than maxBufLen, or near the end, find a fragment to load
-    if (bufferLen >= maxBufLen && !switchingTrack && targetBufferTime < fragments[fragments.length - 1].start) {
+    if (bufferLen >= maxBufLen && !this.switchingTrack && targetBufferTime < fragments[fragments.length - 1].start) {
       return;
     }
     let frag = this.getNextFragment(targetBufferTime, trackDetails);
@@ -16897,20 +16864,31 @@ class AudioStreamController extends BaseStreamController {
     }
   }
   flushAudioIfNeeded(switchingTrack) {
-    const {
-      media,
-      bufferedTrack
-    } = this;
-    const bufferedAttributes = bufferedTrack == null ? undefined : bufferedTrack.attrs;
-    const switchAttributes = switchingTrack.attrs;
-    if (media && bufferedAttributes && (bufferedAttributes.CHANNELS !== switchAttributes.CHANNELS || bufferedTrack.name !== switchingTrack.name || bufferedTrack.lang !== switchingTrack.lang)) {
-      if (useAlternateAudio(switchingTrack.url, this.hls)) {
-        this.log('Switching audio track : flushing all audio');
-        super.flushMainBuffer(0, Number.POSITIVE_INFINITY, 'audio');
-        this.bufferedTrack = null;
-      } else {
-        // Main is being buffered. Set bufferedTrack so that it is flushed when switching back to alt-audio
-        this.bufferedTrack = switchingTrack;
+    if (this.media && this.bufferedTrack) {
+      const {
+        name,
+        lang,
+        assocLang,
+        characteristics,
+        audioCodec,
+        channels
+      } = this.bufferedTrack;
+      if (!matchesOption({
+        name,
+        lang,
+        assocLang,
+        characteristics,
+        audioCodec,
+        channels
+      }, switchingTrack, audioMatchPredicate)) {
+        if (useAlternateAudio(switchingTrack.url, this.hls)) {
+          this.log('Switching audio track : flushing all audio');
+          super.flushMainBuffer(0, Number.POSITIVE_INFINITY, 'audio');
+          this.bufferedTrack = null;
+        } else {
+          // Main is being buffered. Set bufferedTrack so that it is flushed when switching back to alt-audio
+          this.bufferedTrack = switchingTrack;
+        }
       }
     }
   }
@@ -17182,6 +17160,30 @@ class BasePlaylistController extends Logger {
   }
 }
 
+function subtitleOptionsIdentical(trackList1, trackList2) {
+  if (trackList1.length !== trackList2.length) {
+    return false;
+  }
+  for (let i = 0; i < trackList1.length; i++) {
+    if (!mediaAttributesIdentical(trackList1[i].attrs, trackList2[i].attrs)) {
+      return false;
+    }
+  }
+  return true;
+}
+function mediaAttributesIdentical(attrs1, attrs2, customAttributes) {
+  // Media options with the same rendition ID must be bit identical
+  const stableRenditionId = attrs1['STABLE-RENDITION-ID'];
+  if (stableRenditionId && !customAttributes) {
+    return stableRenditionId === attrs2['STABLE-RENDITION-ID'];
+  }
+  // When rendition ID is not present, compare attributes
+  return !(customAttributes || ['LANGUAGE', 'NAME', 'CHARACTERISTICS', 'AUTOSELECT', 'DEFAULT', 'FORCED', 'ASSOC-LANGUAGE']).some(subtitleAttribute => attrs1[subtitleAttribute] !== attrs2[subtitleAttribute]);
+}
+function subtitleTrackMatchesTextTrack(subtitleTrack, textTrack) {
+  return textTrack.label.toLowerCase() === subtitleTrack.name.toLowerCase() && (!textTrack.language || textTrack.language.toLowerCase() === (subtitleTrack.lang || '').toLowerCase());
+}
+
 class AudioTrackController extends BasePlaylistController {
   constructor(hls) {
     super(hls, 'audio-track-controller');