Switch on smaller fmp4 segments that align with buffered segment boun…

…daries Fixes #5743
video-dev · Sep 7, 2023 · c056878 · c056878
1 parent f28a374
commit c056878
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/controller/fragment-finders.ts b/src/controller/fragment-finders.ts
@@ -65,12 +65,18 @@ export function findFragmentByPTS(
       fragments[
         (fragPrevious.sn as number) - (fragments[0].sn as number) + 1
       ] || null;
+    // check for buffer-end rounding error
+    const bufferEdgeError = fragPrevious.endDTS - bufferEnd;
+    if (bufferEdgeError > 0 && bufferEdgeError < 0.0000015) {
+      bufferEnd += 0.0000015;
+    }
   } else if (bufferEnd === 0 && fragments[0].start === 0) {
     fragNext = fragments[0];
   }
   // Prefer the next fragment if it's within tolerance
   if (
     fragNext &&
+    (!fragPrevious || fragPrevious.level === fragNext.level) &&
     fragmentWithinToleranceTest(bufferEnd, maxFragLookUpTolerance, fragNext) ===
       0
   ) {

diff --git a/src/controller/stream-controller.ts b/src/controller/stream-controller.ts
@@ -464,9 +464,9 @@ export default class StreamController
               Math.min(
                 Math.max(
                   fragDuration - this.config.maxFragLookUpTolerance,
-                  fragDuration * 0.5,
+                  fragDuration * (this.couldBacktrack ? 0.5 : 0.125),
                 ),
-                fragDuration * 0.75,
+                fragDuration * (this.couldBacktrack ? 0.75 : 0.25),
               ),
           );
           this.flushMainBuffer(startPts, Number.POSITIVE_INFINITY);