hls.js 1.5.19 → 1.5.20

package/dist/hls.js

@@ -552,7 +552,7 @@
       // Some browsers don't allow to use bind on console object anyway
       // fallback to default if needed
       try {
-        exportedLogger.log("Debug logs enabled for \"" + id + "\" in hls.js version " + "1.5.19");
+        exportedLogger.log("Debug logs enabled for \"" + id + "\" in hls.js version " + "1.5.20");
       } catch (e) {
         exportedLogger = fakeLogger;
       }
@@ -7174,10 +7174,9 @@
       name = option.name,
       lang = option.lang,
       assocLang = option.assocLang,
-      characteristics = option.characteristics,
       isDefault = option.default;
     var forced = option.forced;
-    return (groupId === undefined || track.groupId === groupId) && (name === undefined || track.name === name) && (lang === undefined || track.lang === 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 || track.lang === 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 characteristicsMatch(characteristicsA, characteristicsB) {
     if (characteristicsB === void 0) {
@@ -16263,32 +16262,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) {
     _inheritsLoose(AudioStreamController, _BaseStreamController);
@@ -16526,9 +16499,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'
         });
@@ -16540,13 +16511,10 @@
       var maxBufLen = this.getMaxBufferLength(mainBufferInfo == null ? void 0 : mainBufferInfo.len);
       var fragments = trackDetails.fragments;
       var start = fragments[0].start;
-      var targetBufferTime = this.flushing ? this.getLoadPosition() : bufferInfo.end;
-      if (switchingTrack && media) {
-        var pos = this.getLoadPosition();
-        // STABLE
-        if (bufferedTrack && !mediaAttributesIdentical(switchingTrack.attrs, bufferedTrack.attrs)) {
-          targetBufferTime = pos;
-        }
+      var loadPosition = this.getLoadPosition();
+      var targetBufferTime = this.flushing ? loadPosition : bufferInfo.end;
+      if (this.switchingTrack && media) {
+        var pos = loadPosition;
         // 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
@@ -16558,7 +16526,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);
@@ -17013,14 +16981,26 @@
       }
     };
     _proto.flushAudioIfNeeded = function flushAudioIfNeeded(switchingTrack) {
-      var media = this.media,
-        bufferedTrack = this.bufferedTrack;
-      var bufferedAttributes = bufferedTrack == null ? void 0 : bufferedTrack.attrs;
-      var switchAttributes = switchingTrack.attrs;
-      if (media && bufferedAttributes && (bufferedAttributes.CHANNELS !== switchAttributes.CHANNELS || bufferedTrack.name !== switchingTrack.name || bufferedTrack.lang !== switchingTrack.lang)) {
-        this.log('Switching audio track : flushing all audio');
-        _BaseStreamController.prototype.flushMainBuffer.call(this, 0, Number.POSITIVE_INFINITY, 'audio');
-        this.bufferedTrack = null;
+      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)) {
+          this.log('Switching audio track : flushing all audio');
+          _BaseStreamController.prototype.flushMainBuffer.call(this, 0, Number.POSITIVE_INFINITY, 'audio');
+          this.bufferedTrack = null;
+        }
       }
     };
     _proto.completeAudioSwitch = function completeAudioSwitch(switchingTrack) {
@@ -17033,6 +17013,32 @@
     return AudioStreamController;
   }(BaseStreamController);
 
+  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) {
     _inheritsLoose(AudioTrackController, _BasePlaylistControll);
     function AudioTrackController(hls) {
@@ -29369,7 +29375,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.19";
+        return "1.5.20";
       }
     }, {
       key: "Events",