hls.js 1.6.0-beta.1.0.canary.10770 → 1.6.0-beta.1.0.canary.10773

package/dist/hls.js

@@ -1057,7 +1057,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.1.0.canary.10770");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.1.0.canary.10773");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -7883,7 +7883,7 @@
                 break;
               }
             case 'DISCONTINUITY-SEQUENCE':
-              discontinuityCounter = parseInt(value1);
+              level.startCC = discontinuityCounter = parseInt(value1);
               break;
             case 'KEY':
               {
@@ -8013,7 +8013,7 @@
         if (!level.live) {
           lastFragment.endList = true;
         }
-        if (firstFragment) {
+        if (firstFragment && !level.startCC) {
           level.startCC = firstFragment.cc;
         }
         /**
@@ -8356,7 +8356,9 @@
           newDetails.fragments.shift();
         }
         newDetails.startSN = newDetails.fragments[0].sn;
-        newDetails.startCC = newDetails.fragments[0].cc;
+        if (!newDetails.startCC) {
+          newDetails.startCC = newDetails.fragments[0].cc;
+        }
       } else {
         if (newDetails.canSkipDateRanges) {
           newDetails.dateRanges = mergeDateRanges(oldDetails.dateRanges, newDetails);
@@ -8625,11 +8627,10 @@
    * The PTS of a fragment lets Hls.js know where it fits into a stream - by knowing every PTS, we know which fragment to
    * download at any given time. PTS is normally computed when the fragment is demuxed, so taking this step saves us time
    * and an extra download.
-   * @param lastFrag
    * @param lastLevel
    * @param details
    */
-  function alignStream(lastFrag, switchDetails, details) {
+  function alignStream(switchDetails, details) {
     if (!switchDetails) {
       return;
     }
@@ -9824,10 +9825,9 @@
       var firstLevelLoad = !previousDetails;
       var aligned = details.alignedSliding && isFiniteNumber(slidingStart);
       if (firstLevelLoad || !aligned && !slidingStart) {
-        var fragPrevious = this.fragPrevious;
-        alignStream(fragPrevious, switchDetails, details);
+        alignStream(switchDetails, details);
         var alignedSlidingStart = details.fragmentStart;
-        this.log("Live playlist sliding: " + alignedSlidingStart.toFixed(2) + " start-sn: " + (previousDetails ? previousDetails.startSN : 'na') + "->" + details.startSN + " prev-sn: " + (fragPrevious ? fragPrevious.sn : 'na') + " fragments: " + length);
+        this.log("Live playlist sliding: " + alignedSlidingStart.toFixed(2) + " start-sn: " + (previousDetails ? previousDetails.startSN : 'na') + "->" + details.startSN + " fragments: " + length);
         return alignedSlidingStart;
       }
       return slidingStart;
@@ -16253,7 +16253,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10770";
+  var version = "1.6.0-beta.1.0.canary.10773";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -16834,7 +16834,7 @@
                 this.nextLoadPosition = this.findSyncFrag(videoAnchor).start;
                 this.clearWaitingFragment();
               }
-            } else if (this.state !== State.STOPPED) {
+            } else {
               this.state = State.IDLE;
             }
           }
@@ -17017,20 +17017,24 @@
     };
     _proto.onLevelLoaded = function onLevelLoaded(event, data) {
       this.mainDetails = data.details;
-      if (this.cachedTrackLoadedData !== null) {
-        this.hls.trigger(Events.AUDIO_TRACK_LOADED, this.cachedTrackLoadedData);
+      var cachedTrackLoadedData = this.cachedTrackLoadedData;
+      if (cachedTrackLoadedData) {
         this.cachedTrackLoadedData = null;
+        this.hls.trigger(Events.AUDIO_TRACK_LOADED, cachedTrackLoadedData);
       }
     };
     _proto.onAudioTrackLoaded = function onAudioTrackLoaded(event, data) {
       var _track$details;
-      if (this.mainDetails == null) {
-        this.cachedTrackLoadedData = data;
-        return;
-      }
       var levels = this.levels;
       var newDetails = data.details,
         trackId = data.id;
+      if (this.mainDetails == null || this.mainDetails.expired || newDetails.endCC > this.mainDetails.endCC) {
+        this.cachedTrackLoadedData = data;
+        if (this.state !== State.STOPPED) {
+          this.state = State.WAITING_TRACK;
+        }
+        return;
+      }
       if (!levels) {
         this.warn("Audio tracks were reset while loading level " + trackId);
         return;
@@ -17044,15 +17048,19 @@
         if (newDetails.deltaUpdateFailed || !mainDetails) {
           return;
         }
-        if (!track.details && newDetails.hasProgramDateTime && mainDetails.hasProgramDateTime) {
-          // Make sure our audio rendition is aligned with the "main" rendition, using
-          // pdt as our reference times.
-          alignMediaPlaylistByPDT(newDetails, mainDetails);
-          sliding = newDetails.fragmentStart;
-        } else {
+        if (track.details) {
           var _this$levelLastLoaded;
           sliding = this.alignPlaylists(newDetails, track.details, (_this$levelLastLoaded = this.levelLastLoaded) == null ? void 0 : _this$levelLastLoaded.details);
         }
+        if (!newDetails.alignedSliding) {
+          // Align audio rendition with the "main" playlist on discontinuity change
+          // or program-date-time (PDT)
+          alignDiscontinuities(newDetails, mainDetails);
+          if (!newDetails.alignedSliding) {
+            alignMediaPlaylistByPDT(newDetails, mainDetails);
+          }
+          sliding = newDetails.fragmentStart;
+        }
       }
       track.details = newDetails;
       this.levelLastLoaded = track;
@@ -17126,7 +17134,9 @@
           },
           cache = _this$waitingData.cache;
         cache.push(new Uint8Array(payload));
-        this.state = State.WAITING_INIT_PTS;
+        if (this.state !== State.STOPPED) {
+          this.state = State.WAITING_INIT_PTS;
+        }
       }
     };
     _proto._handleFragmentLoadComplete = function _handleFragmentLoadComplete(fragLoadedData) {