fix: Remove preloaded segment when segment has network error (#6515)

shaka-project · Apr 30, 2024 · 2f5062a · 2f5062a
1 parent 5f8e7fd
commit 2f5062a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/lib/media/segment_prefetch.js b/lib/media/segment_prefetch.js
@@ -233,6 +233,15 @@ shaka.media.SegmentPrefetch = class {
     this.prefetchPosTime_ = 0;
   }
 
+  /**
+   * Remove a reference of prefetched segment if already exists.
+   * @param {!shaka.media.SegmentReference} reference
+   * @public
+   */
+  removeReference(reference) {
+    this.abortPrefetchedSegment_(reference);
+  }
+
   /**
    * @param {number} time
    * @param {boolean=} clearInitSegments

diff --git a/lib/media/streaming_engine.js b/lib/media/streaming_engine.js
@@ -1702,6 +1702,11 @@ shaka.media.StreamingEngine = class {
             error.code);
         mediaState.hasError = true;
 
+        if (error.category == shaka.util.Error.Category.NETWORK &&
+            mediaState.segmentPrefetch) {
+          mediaState.segmentPrefetch.removeReference(reference);
+        }
+
         error.severity = shaka.util.Error.Severity.CRITICAL;
         await this.handleStreamingError_(mediaState, error);
       }