Add support for multiple EXT-X-MAP tags (updated)

src/controller/level-helper.ts

@@ -165,13 +165,14 @@ export function mergeDetails(
   oldDetails: LevelDetails,
   newDetails: LevelDetails
 ): void {
-  // potentially retrieve cached initsegment
-  const initMap = {};
+  // Track the last initSegment processed. Initialize it to the last one on the timeline.
+  let currentInitSegment: Fragment | null = null;
   const oldFragments = oldDetails.fragments;
-  for (let i = 0; i < oldFragments.length; i++) {
+  for (let i = oldFragments.length - 1; i >= 0; i--) {
     const oldInit = oldFragments[i].initSegment;
-    if (oldInit?.data && oldInit.relurl) {
-      initMap[oldInit.relurl] = oldInit;
+    if (oldInit) {
+      currentInitSegment = oldInit;
+      break;
     }
   }
 
@@ -219,6 +220,15 @@ export function mergeDetails(
       newFrag.loader = oldFrag.loader;
       newFrag.stats = oldFrag.stats;
       newFrag.urlId = oldFrag.urlId;
+      if (oldFrag.initSegment) {
+        newFrag.initSegment = oldFrag.initSegment;
+        currentInitSegment = oldFrag.initSegment;
+      } else if (
+        !newFrag.initSegment ||
+        newFrag.initSegment.relurl == currentInitSegment?.relurl
+      ) {
+        newFrag.initSegment = currentInitSegment;
+      }
     }
   );
 
@@ -244,13 +254,6 @@ export function mergeDetails(
     }
   }
   if (newDetails.skippedSegments) {
-    for (let i = 0; i < newFragments.length; i++) {
-      const newFrag = newFragments[i];
-      const initurl = newFrag.initSegment?.relurl;
-      if (initurl && initMap[initurl]) {
-        newFrag.initSegment = initMap[initurl];
-      }
-    }
     newDetails.startCC = newDetails.fragments[0].cc;
   }
 

src/loader/m3u8-parser.ts

@@ -211,11 +211,26 @@ export default class M3U8Parser {
     let i: number;
     let levelkey: LevelKey | undefined;
     let firstPdtIndex = -1;
+    let createNextFrag = false;
 
     LEVEL_PLAYLIST_REGEX_FAST.lastIndex = 0;
     level.m3u8 = string;
 
     while ((result = LEVEL_PLAYLIST_REGEX_FAST.exec(string)) !== null) {
+      if (createNextFrag) {
+        createNextFrag = false;
+        frag = new Fragment(type, baseurl);
+        // setup the next fragment for part loading
+        frag.start = totalduration;
+        frag.sn = currentSN;
+        frag.cc = discontinuityCounter;
+        frag.level = id;
+        if (currentInitSegment) {
+          frag.initSegment = currentInitSegment;
+          frag.rawProgramDateTime = currentInitSegment.rawProgramDateTime;
+        }
+      }
+
       const duration = result[1];
       if (duration) {
         // INF
@@ -235,9 +250,6 @@ export default class M3U8Parser {
           frag.level = id;
           frag.cc = discontinuityCounter;
           frag.urlId = levelUrlId;
-          if (currentInitSegment) {
-            frag.initSegment = currentInitSegment;
-          }
           fragments.push(frag);
           // avoid sliced strings    https://github.com/video-dev/hls.js/issues/939
           frag.relurl = (' ' + result[3]).slice(1);
@@ -246,13 +258,7 @@ export default class M3U8Parser {
           totalduration += frag.duration;
           currentSN++;
           currentPart = 0;
-
-          frag = new Fragment(type, baseurl);
-          // setup the next fragment for part loading
-          frag.start = totalduration;
-          frag.sn = currentSN;
-          frag.cc = discontinuityCounter;
-          frag.level = id;
+          createNextFrag = true;
         }
       } else if (result[4]) {
         // X-BYTERANGE
@@ -428,9 +434,9 @@ export default class M3U8Parser {
             if (levelkey) {
               frag.levelkey = levelkey;
             }
+            frag.initSegment = null;
             currentInitSegment = frag;
-            frag = new Fragment(type, baseurl);
-            frag.rawProgramDateTime = currentInitSegment.rawProgramDateTime;
+            createNextFrag = true;
             break;
           }
           case 'SERVER-CONTROL': {

src/loader/playlist-loader.ts

@@ -25,7 +25,6 @@ import type {
 } from '../types/loader';
 import { PlaylistContextType, PlaylistLevelType } from '../types/loader';
 import { LevelDetails } from './level-details';
-import { Fragment } from './fragment';
 import type Hls from '../hls';
 import { AttrList } from '../utils/attr-list';
 import type {