Allow base and query URI differences in segment mismatch error check (#7465)

robwalch · web-flow · commit b21b6de9f67b · 2025-08-14T11:39:01.000-07:00
diff --git a/src/utils/level-helper.ts b/src/utils/level-helper.ts
@@ -429,7 +429,9 @@ export function mapFragmentIntersection(
     }
     if ((oldFrag as any) && (newFrag as any)) {
       intersectionFn(oldFrag, newFrag, i, newFrags);
-      if (oldFrag.url && oldFrag.url !== newFrag.url) {
+      const uriBefore = oldFrag.relurl;
+      const uriAfter = newFrag.relurl;
+      if (uriBefore && notEqualAfterStrippingQueries(uriBefore, uriAfter)) {
         newDetails.playlistParsingError = getSequenceError(
           `media sequence mismatch ${newFrag.sn}:`,
           oldDetails,
@@ -600,3 +602,17 @@ export function reassignFragmentLevelIndexes(levels: Level[]) {
     });
   });
 }
+
+function notEqualAfterStrippingQueries(
+  uriBefore: string,
+  uriAfter: string | undefined,
+): boolean {
+  if (uriBefore !== uriAfter && uriAfter) {
+    return stripQuery(uriBefore) !== stripQuery(uriAfter);
+  }
+  return false;
+}
+
+function stripQuery(uri: string): string {
+  return uri.replace(/\?[^?]*$/, '');
+}
diff --git a/tests/unit/controller/level-helper.ts b/tests/unit/controller/level-helper.ts
@@ -1677,6 +1677,43 @@ video_5432.m4s`;
     });
   });
 
+  it('does not error between updates when only the query part of the URI changes', function () {
+    const playlist1 = `#EXTM3U
+#EXT-X-VERSION:6
+#EXT-X-TARGETDURATION:3
+#EXT-X-MEDIA-SEQUENCE:5428
+#EXT-X-DISCONTINUITY-SEQUENCE:31
+#EXT-X-MAP:URI="video_init.mp4"
+#EXTINF:2.000,
+video_5428.m4s?t=1
+#EXTINF:2.000,
+video_5429.m4s?t=1
+#EXTINF:2.000,
+video_5430.m4s?t=1
+#EXTINF:2.000,
+video_5431.m4s?t=1`;
+    // Media sequence increased by one but two segments removed.
+    const playlist2 = `#EXTM3U
+#EXT-X-VERSION:6
+#EXT-X-TARGETDURATION:3
+#EXT-X-MEDIA-SEQUENCE:5429
+#EXT-X-DISCONTINUITY-SEQUENCE:31
+#EXT-X-MAP:URI="video_init.mp4"
+#EXTINF:2.000,
+video_5429.m4s?t=2
+#EXTINF:2.000,
+video_5430.m4s?t=2
+#EXTINF:2.000,
+video_5431.m4s?t=2
+#EXTINF:2.000,
+video_5432.m4s?t=2`;
+    const details1 = parseLevelPlaylist(playlist1);
+    const details2 = parseLevelPlaylist(playlist2);
+    details2.fragments[0].base.url += '?base=changed';
+    mergeDetails(details1, details2, logger);
+    expect(details2.playlistParsingError).to.be.null;
+  });
+
   it('maps dateranges based on latest EXT-X-PROGRAM-DATE-TIME', function () {
     const playlist1 = `#EXTM3U
 #EXT-X-VERSION:6
