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

package/dist/hls.js

@@ -1059,7 +1059,7 @@
       // 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.10895");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -16308,7 +16308,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.2.0.canary.10894";
+  var version = "1.6.0-beta.2.0.canary.10895";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -16679,32 +16679,6 @@
     return TransmuxerInterface;
   }();
 
-  function subtitleOptionsIdentical(trackList1, trackList2) {
-    if (trackList1.length !== trackList2.length) {
-      return false;
-    }
-    for (var 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
-    var 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(function (subtitleAttribute) {
-      return attrs1[subtitleAttribute] !== attrs2[subtitleAttribute];
-    });
-  }
-  function subtitleTrackMatchesTextTrack(subtitleTrack, textTrack) {
-    return textTrack.label.toLowerCase() === subtitleTrack.name.toLowerCase() && (!textTrack.language || textTrack.language.toLowerCase() === (subtitleTrack.lang || '').toLowerCase());
-  }
-
   var TICK_INTERVAL$2 = 100; // how often to tick in ms
   var AudioStreamController = /*#__PURE__*/function (_BaseStreamController) {
     function AudioStreamController(hls, fragmentTracker, keyLoader) {
@@ -16957,9 +16931,7 @@
       if (bufferInfo === null) {
         return;
       }
-      var bufferedTrack = this.bufferedTrack,
-        switchingTrack = this.switchingTrack;
-      if (!switchingTrack && this._streamEnded(bufferInfo, trackDetails)) {
+      if (!this.switchingTrack && this._streamEnded(bufferInfo, trackDetails)) {
         hls.trigger(Events.BUFFER_EOS, {
           type: 'audio'
         });
@@ -16972,12 +16944,8 @@
       var start = fragments[0].start;
       var loadPosition = this.getLoadPosition();
       var targetBufferTime = this.flushing ? loadPosition : bufferInfo.end;
-      if (switchingTrack && media) {
+      if (this.switchingTrack && media) {
         var 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
@@ -16989,7 +16957,7 @@
       }
 
       // 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;
       }
       var frag = this.getNextFragment(targetBufferTime, trackDetails);
@@ -17457,18 +17425,30 @@
       }
     };
     _proto.flushAudioIfNeeded = function flushAudioIfNeeded(switchingTrack) {
-      var media = this.media,
-        bufferedTrack = this.bufferedTrack;
-      var bufferedAttributes = bufferedTrack == null ? undefined : bufferedTrack.attrs;
-      var 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');
-          _BaseStreamController.prototype.flushMainBuffer.call(this, 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) {
+        var _this$bufferedTrack = this.bufferedTrack,
+          name = _this$bufferedTrack.name,
+          lang = _this$bufferedTrack.lang,
+          assocLang = _this$bufferedTrack.assocLang,
+          characteristics = _this$bufferedTrack.characteristics,
+          audioCodec = _this$bufferedTrack.audioCodec,
+          channels = _this$bufferedTrack.channels;
+        if (!matchesOption({
+          name: name,
+          lang: lang,
+          assocLang: assocLang,
+          characteristics: characteristics,
+          audioCodec: audioCodec,
+          channels: channels
+        }, switchingTrack, audioMatchPredicate)) {
+          if (useAlternateAudio(switchingTrack.url, this.hls)) {
+            this.log('Switching audio track : flushing all audio');
+            _BaseStreamController.prototype.flushMainBuffer.call(this, 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;
+          }
         }
       }
     };
@@ -17748,6 +17728,32 @@
     return BasePlaylistController;
   }(Logger);
 
+  function subtitleOptionsIdentical(trackList1, trackList2) {
+    if (trackList1.length !== trackList2.length) {
+      return false;
+    }
+    for (var 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
+    var 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(function (subtitleAttribute) {
+      return attrs1[subtitleAttribute] !== attrs2[subtitleAttribute];
+    });
+  }
+  function subtitleTrackMatchesTextTrack(subtitleTrack, textTrack) {
+    return textTrack.label.toLowerCase() === subtitleTrack.name.toLowerCase() && (!textTrack.language || textTrack.language.toLowerCase() === (subtitleTrack.lang || '').toLowerCase());
+  }
+
   var AudioTrackController = /*#__PURE__*/function (_BasePlaylistControll) {
     function AudioTrackController(hls) {
       var _this;