feat: Create segmentIndex when there is only one variant (#7868)

Related to #6383
shaka-project · Jan 10, 2025 · 3a85217 · 3a85217
1 parent 11afdc8
commit 3a85217
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 19 deletions.
diff --git a/lib/hls/hls_parser.js b/lib/hls/hls_parser.js
@@ -1061,19 +1061,6 @@ shaka.hls.HlsParser = class {
     }
 
     this.playerInterface_.makeTextStreamsForClosedCaptions(this.manifest_);
-
-    if (variants.length == 1) {
-      const createSegmentIndexPromises = [];
-      const variant = variants[0];
-      for (const stream of [variant.video, variant.audio]) {
-        if (stream && !stream.segmentIndex) {
-          createSegmentIndexPromises.push(stream.createSegmentIndex());
-        }
-      }
-      if (createSegmentIndexPromises.length > 0) {
-        await Promise.all(createSegmentIndexPromises);
-      }
-    }
   }
 
   /**

diff --git a/lib/media/preload_manager.js b/lib/media/preload_manager.js
@@ -512,6 +512,19 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     if (!this.manifest_) {
       this.manifest_ = await this.parser_.start(
           this.assetUri_, this.manifestPlayerInterface_);
+
+      if (this.manifest_.variants.length == 1) {
+        const createSegmentIndexPromises = [];
+        const variant = this.manifest_.variants[0];
+        for (const stream of [variant.video, variant.audio]) {
+          if (stream && !stream.segmentIndex) {
+            createSegmentIndexPromises.push(stream.createSegmentIndex());
+          }
+        }
+        if (createSegmentIndexPromises.length > 0) {
+          await Promise.all(createSegmentIndexPromises);
+        }
+      }
     }
 
     this.manifestPromise_.resolve();
@@ -698,7 +711,9 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     this.segmentPrefetchById_.set(stream.id, prefetch);
 
     // Start prefetching a bit.
-    await stream.createSegmentIndex();
+    if (!stream.segmentIndex) {
+      await stream.createSegmentIndex();
+    }
     const startTime = this.startTime_ || 0;
     const prefetchSegmentIterator =
         stream.segmentIndex.getIteratorForTime(startTime);

diff --git a/lib/player.js b/lib/player.js
@@ -6716,7 +6716,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         return null;
       }
 
-      await stream.createSegmentIndex();
+      if (!stream.segmentIndex) {
+        await stream.createSegmentIndex();
+      }
       const iter = stream.segmentIndex.getIteratorForTime(time);
       const ref = iter ? iter.next().value : null;
       if (!ref) {

diff --git a/test/hls/hls_parser_unit.js b/test/hls/hls_parser_unit.js
@@ -3703,7 +3703,8 @@ describe('HlsParser', () => {
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MANIFEST,
           shaka.util.Error.Code.NO_WEB_CRYPTO_API));
-      await expectAsync(parser.start('test:/master', playerInterface))
+      const actual = await parser.start('test:/master', playerInterface);
+      await expectAsync(loadAllStreamsFor(actual))
           .toBeRejectedWith(expectedError);
     } finally {
       Object.defineProperty(window, 'crypto', {
@@ -4575,7 +4576,7 @@ describe('HlsParser', () => {
           shaka.util.Error.Category.MANIFEST,
           Code.HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED);
 
-      await verifyError(master, media, error);
+      await verifyError(master, media, error, true);
     });
 
     it('if SAMPLE-AES encryption with MSE and mp2t content', async () => {
@@ -4602,7 +4603,7 @@ describe('HlsParser', () => {
           shaka.util.Error.Category.MANIFEST,
           Code.HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED);
 
-      await verifyError(master, media, error);
+      await verifyError(master, media, error, true);
     });
 
 
@@ -4619,7 +4620,7 @@ describe('HlsParser', () => {
             Code.HLS_REQUIRED_TAG_MISSING,
             tagName);
 
-        await verifyError(master, media, error);
+        await verifyError(master, media, error, true);
       }
 
       it('EXTINF', async () => {