hls.js 1.5.7-0.canary.10021 → 1.5.7-0.canary.10023

package/dist/hls.js

@@ -644,7 +644,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.5.7-0.canary.10021");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.7-0.canary.10023");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -8400,40 +8400,29 @@
      * Return true if `media`'s buffered include `position`
      */
     BufferHelper.isBuffered = function isBuffered(media, position) {
-      try {
-        if (media) {
-          var buffered = BufferHelper.getBuffered(media);
-          for (var i = 0; i < buffered.length; i++) {
-            if (position >= buffered.start(i) && position <= buffered.end(i)) {
-              return true;
-            }
+      if (media) {
+        var buffered = BufferHelper.getBuffered(media);
+        for (var i = buffered.length; i--;) {
+          if (position >= buffered.start(i) && position <= buffered.end(i)) {
+            return true;
           }
         }
-      } catch (error) {
-        // this is to catch
-        // InvalidStateError: Failed to read the 'buffered' property from 'SourceBuffer':
-        // This SourceBuffer has been removed from the parent media source
       }
       return false;
     };
     BufferHelper.bufferInfo = function bufferInfo(media, pos, maxHoleDuration) {
-      try {
-        if (media) {
-          var vbuffered = BufferHelper.getBuffered(media);
+      if (media) {
+        var vbuffered = BufferHelper.getBuffered(media);
+        if (vbuffered.length) {
           var buffered = [];
-          var i;
-          for (i = 0; i < vbuffered.length; i++) {
+          for (var i = 0; i < vbuffered.length; i++) {
             buffered.push({
               start: vbuffered.start(i),
               end: vbuffered.end(i)
             });
           }
-          return this.bufferedInfo(buffered, pos, maxHoleDuration);
+          return BufferHelper.bufferedInfo(buffered, pos, maxHoleDuration);
         }
-      } catch (error) {
-        // this is to catch
-        // InvalidStateError: Failed to read the 'buffered' property from 'SourceBuffer':
-        // This SourceBuffer has been removed from the parent media source
       }
       return {
         len: 0,
@@ -8446,12 +8435,7 @@
       pos = Math.max(0, pos);
       // sort on buffer.start/smaller end (IE does not always return sorted buffered range)
       buffered.sort(function (a, b) {
-        var diff = a.start - b.start;
-        if (diff) {
-          return diff;
-        } else {
-          return b.end - a.end;
-        }
+        return a.start - b.start || b.end - a.end;
       });
       var buffered2 = [];
       if (maxHoleDuration) {
@@ -8519,7 +8503,7 @@
      */;
     BufferHelper.getBuffered = function getBuffered(media) {
       try {
-        return media.buffered;
+        return media.buffered || noopBuffered;
       } catch (e) {
         logger.log('failed to get media.buffered', e);
         return noopBuffered;
@@ -10743,7 +10727,9 @@
       this.log('Reset loading state');
       this.fragCurrent = null;
       this.fragPrevious = null;
-      this.state = State.IDLE;
+      if (this.state !== State.STOPPED) {
+        this.state = State.IDLE;
+      }
     };
     _proto.resetStartWhenNotLoaded = function resetStartWhenNotLoaded(level) {
       // if loadedmetadata is not set, it means that first frag request failed
@@ -17291,7 +17277,9 @@
         this.fragmentTracker.removeFragment(waitingData.frag);
         this.waitingData = null;
         this.waitingVideoCC = -1;
-        this.state = State.IDLE;
+        if (this.state !== State.STOPPED) {
+          this.state = State.IDLE;
+        }
       }
     };
     _proto.resetLoadingState = function resetLoadingState() {
@@ -17424,26 +17412,25 @@
         this.removeUnbufferedFrags(fragCurrent.start);
       }
       this.resetLoadingState();
-      // destroy useless transmuxer when switching audio to main
-      if (!altAudio) {
-        this.resetTransmuxer();
-      } else {
-        // switching to audio track, start timer if not already started
-        this.setInterval(TICK_INTERVAL$2);
-      }
 
       // should we switch tracks ?
       if (altAudio) {
         this.switchingTrack = data;
         // main audio track are handled by stream-controller, just do something if switching to alt audio track
-        this.state = State.IDLE;
         this.flushAudioIfNeeded(data);
+        if (this.state !== State.STOPPED) {
+          // switching to audio track, start timer if not already started
+          this.setInterval(TICK_INTERVAL$2);
+          this.state = State.IDLE;
+          this.tick();
+        }
       } else {
+        // destroy useless transmuxer when switching audio to main
+        this.resetTransmuxer();
         this.switchingTrack = null;
         this.bufferedTrack = data;
-        this.state = State.STOPPED;
+        this.clearInterval();
       }
-      this.tick();
     };
     _proto.onManifestLoading = function onManifestLoading() {
       this.fragmentTracker.removeAllFragments();
@@ -18342,7 +18329,7 @@
       } else {
         this.mediaBuffer = null;
       }
-      if (currentTrack) {
+      if (currentTrack && this.state !== State.STOPPED) {
         this.setInterval(TICK_INTERVAL$1);
       }
     }
@@ -30217,7 +30204,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.7-0.canary.10021";
+        return "1.5.7-0.canary.10023";
       }
     }, {
       key: "Events",

package/dist/hls.js.d.ts

@@ -121,17 +121,17 @@ export declare class AudioStreamController extends BaseStreamController implemen
     protected resetLoadingState(): void;
     protected onTickEnd(): void;
     private doTickIdle;
-    onMediaDetaching(): void;
-    onAudioTracksUpdated(event: Events.AUDIO_TRACKS_UPDATED, { audioTracks }: AudioTracksUpdatedData): void;
-    onAudioTrackSwitching(event: Events.AUDIO_TRACK_SWITCHING, data: AudioTrackSwitchingData): void;
-    onManifestLoading(): void;
-    onLevelLoaded(event: Events.LEVEL_LOADED, data: LevelLoadedData): void;
-    onAudioTrackLoaded(event: Events.AUDIO_TRACK_LOADED, data: TrackLoadedData): void;
+    protected onMediaDetaching(): void;
+    private onAudioTracksUpdated;
+    private onAudioTrackSwitching;
+    protected onManifestLoading(): void;
+    private onLevelLoaded;
+    private onAudioTrackLoaded;
     _handleFragmentLoadProgress(data: FragLoadedData): void;
     protected _handleFragmentLoadComplete(fragLoadedData: FragLoadedData): void;
-    onBufferReset(): void;
-    onBufferCreated(event: Events.BUFFER_CREATED, data: BufferCreatedData): void;
-    onFragBuffered(event: Events.FRAG_BUFFERED, data: FragBufferedData): void;
+    private onBufferReset;
+    private onBufferCreated;
+    private onFragBuffered;
     protected onError(event: Events.ERROR, data: ErrorData): void;
     private onBufferFlushing;
     private onBufferFlushed;
@@ -2762,11 +2762,6 @@ declare class StyledUnicodeChar {
     isEmpty(): boolean;
 }
 
-declare interface SubtitleFragProcessed {
-    success: boolean;
-    frag: Fragment;
-}
-
 export declare interface SubtitleFragProcessedData {
     success: boolean;
     frag: Fragment;
@@ -2794,16 +2789,16 @@ export declare class SubtitleStreamController extends BaseStreamController imple
     protected registerListeners(): void;
     protected unregisterListeners(): void;
     startLoad(startPosition: number): void;
-    onManifestLoading(): void;
-    onMediaDetaching(): void;
-    onLevelLoaded(event: Events.LEVEL_LOADED, data: LevelLoadedData): void;
-    onSubtitleFragProcessed(event: Events.SUBTITLE_FRAG_PROCESSED, data: SubtitleFragProcessed): void;
-    onBufferFlushing(event: Events.BUFFER_FLUSHING, data: BufferFlushingData): void;
-    onFragBuffered(event: Events.FRAG_BUFFERED, data: FragBufferedData): void;
-    onError(event: Events.ERROR, data: ErrorData): void;
-    onSubtitleTracksUpdated(event: Events.SUBTITLE_TRACKS_UPDATED, { subtitleTracks }: SubtitleTracksUpdatedData): void;
-    onSubtitleTrackSwitch(event: Events.SUBTITLE_TRACK_SWITCH, data: TrackSwitchedData): void;
-    onSubtitleTrackLoaded(event: Events.SUBTITLE_TRACK_LOADED, data: TrackLoadedData): void;
+    protected onManifestLoading(): void;
+    protected onMediaDetaching(): void;
+    private onLevelLoaded;
+    private onSubtitleFragProcessed;
+    private onBufferFlushing;
+    private onFragBuffered;
+    protected onError(event: Events.ERROR, data: ErrorData): void;
+    private onSubtitleTracksUpdated;
+    private onSubtitleTrackSwitch;
+    private onSubtitleTrackLoaded;
     _handleFragmentLoadComplete(fragLoadedData: FragLoadedData): void;
     doTick(): void;
     protected loadFragment(frag: Fragment, level: Level, targetBufferTime: number): void;
@@ -3043,10 +3038,6 @@ export declare interface TrackSet {
     audiovideo?: Track;
 }
 
-declare interface TrackSwitchedData {
-    id: number;
-}
-
 declare class TransmuxerInterface {
     error: Error | null;
     private hls;