shaka-player 3.3.4 → 4.0.1

package/test/media/segment_index_unit.js

@@ -693,22 +693,6 @@ describe('SegmentIndex', /** @suppress {accessControls} */ () => {
       expect(iterator.current()).toBe(null);
     });
 
-    describe('seek', () => {
-      it('returns the matching segment', () => {
-        const index = new shaka.media.SegmentIndex(inputRefs);
-        const iterator = index[Symbol.iterator]();
-        expect(iterator.seek(10)).toBe(inputRefs[1]);
-        expect(iterator.current()).toBe(inputRefs[1]);
-      });
-
-      it('returns the matching segment with partial segments', () => {
-        const index = new shaka.media.SegmentIndex(inputRefsWithPartial);
-        const iterator = index[Symbol.iterator]();
-        expect(iterator.seek(8)).toBe(inputRefsWithPartial[0]);
-        expect(iterator.seek(10)).toBe(partialRefs1[0]);
-      });
-    });
-
     describe('next', () => {
       it('starts with the first segment', () => {
         const index = new shaka.media.SegmentIndex(inputRefs);
@@ -725,20 +709,20 @@ describe('SegmentIndex', /** @suppress {accessControls} */ () => {
         expect(iterator.next().value).toBe(null);
       });
 
-      it('iterates forward after a seek', () => {
+      it('iterates from getIteratorForTime', () => {
         const index = new shaka.media.SegmentIndex(inputRefs);
-        const iterator = index[Symbol.iterator]();
-        expect(iterator.seek(10)).toBe(inputRefs[1]);
+        const iterator = index.getIteratorForTime(10);
+        expect(iterator.next().value).toBe(inputRefs[1]);
         expect(iterator.current()).toBe(inputRefs[1]);
         expect(iterator.next().value).toBe(inputRefs[2]);
         expect(iterator.current()).toBe(inputRefs[2]);
         expect(iterator.next().value).toBe(null);
       });
 
-      it('iterates forward after a seek with partial segments', () => {
+      it('iterates from getIteratorForTime with partial segments', () => {
         const index = new shaka.media.SegmentIndex(inputRefsWithPartial);
-        const iterator = index[Symbol.iterator]();
-        expect(iterator.seek(10)).toBe(partialRefs1[0]);
+        const iterator = index.getIteratorForTime(10);
+        expect(iterator.next().value).toBe(partialRefs1[0]);
         expect(iterator.current()).toBe(partialRefs1[0]);
         expect(iterator.next().value).toBe(partialRefs1[1]);
         expect(iterator.current()).toBe(partialRefs1[1]);
@@ -935,11 +919,17 @@ describe('SegmentIndex', /** @suppress {accessControls} */ () => {
       expect(Array.from(metaIndex)).toEqual(oldRefs);
 
       // Every 0.1 seconds, return the next new ref.
-      index1.updateEvery(0.1, () => {
-        return [newRefs.shift()];
+      const done = new Promise((resolve, reject) => {
+        index1.updateEvery(0.1, () => {
+          if (newRefs.length == 0) {
+            resolve();
+          }
+          return [newRefs.shift()];
+        });
       });
       // Wait long enough for all three new refs to be appended.
-      await shaka.test.Util.delay(0.5);
+      // Or for all of the new refs to be passed out.
+      await Promise.race([shaka.test.Util.delay(1), done]);
 
       expect(Array.from(metaIndex)).toEqual(oldRefs.concat(inputRefs2));
     });

package/test/media/streaming_engine_integration.js

@@ -214,8 +214,7 @@ describe('StreamingEngine', () => {
         manifest,
         config,
         /* startTime= */ null,
-        onSeek,
-        shaka.test.Util.spyFunc(onEvent));
+        onSeek);
   }
 
   function setupManifest(
@@ -403,7 +402,6 @@ describe('StreamingEngine', () => {
   // TODO: Consider also adding tests for missing frames.
   describe('gap jumping', () => {
     it('jumps small gaps at the beginning', async () => {
-      config.smallGapLimit = 5;
       await setupGappyContent(/* gapAtStart= */ 1, /* dropSegment= */ false);
 
       // Let's go!
@@ -419,8 +417,6 @@ describe('StreamingEngine', () => {
     });
 
     it('jumps large gaps at the beginning', async () => {
-      config.smallGapLimit = 1;
-      config.jumpLargeGaps = true;
       await setupGappyContent(/* gapAtStart= */ 5, /* dropSegment= */ false);
 
       // Let's go!
@@ -436,7 +432,6 @@ describe('StreamingEngine', () => {
     });
 
     it('jumps small gaps in the middle', async () => {
-      config.smallGapLimit = 20;
       await setupGappyContent(/* gapAtStart= */ 0, /* dropSegment= */ true);
 
       // Let's go!
@@ -451,11 +446,9 @@ describe('StreamingEngine', () => {
       await waiter.timeoutAfter(60).waitUntilPlayheadReaches(video, 23);
       // Should be close enough to still have the gap buffered.
       expect(video.buffered.length).toBe(2);
-      expect(onEvent).not.toHaveBeenCalled();
     });
 
     it('jumps large gaps in the middle', async () => {
-      config.jumpLargeGaps = true;
       await setupGappyContent(/* gapAtStart= */ 0, /* dropSegment= */ true);
 
       // Let's go!
@@ -470,37 +463,6 @@ describe('StreamingEngine', () => {
       await waiter.timeoutAfter(60).waitUntilPlayheadReaches(video, 23);
       // Should be close enough to still have the gap buffered.
       expect(video.buffered.length).toBe(2);
-      expect(onEvent).toHaveBeenCalled();
-    });
-
-    it('won\'t jump large gaps with preventDefault()', async () => {
-      config.jumpLargeGaps = true;
-      await setupGappyContent(/* gapAtStart= */ 0, /* dropSegment= */ true);
-
-      onEvent.and.callFake((event) => {
-        event.preventDefault();
-      });
-
-      // Let's go!
-      streamingEngine.switchVariant(variant);
-      await streamingEngine.start();
-
-      await waiter.timeoutAfter(5).waitForEvent(video, 'loadeddata');
-
-      let seekCount = 0;
-      eventManager.listen(video, 'seeking', () => {
-        seekCount++;
-      });
-
-      video.currentTime = 8;
-      video.play();
-
-      await shaka.test.Util.delay(5);
-
-      // Edge somehow plays _into_ the gap, and Xbox One plays _through_ the
-      // gap.  Just make sure _we_ don't jump the gap by seeking.  One seek is
-      // required to start playback at time 8.
-      expect(seekCount).toBe(1);
     });
 
     /**
@@ -610,6 +572,7 @@ describe('StreamingEngine', () => {
         minBufferTime: 2,
         textStreams: [],
         imageStreams: [],
+        sequenceMode: false,
         variants: [{
           id: 1,
           video: {
@@ -622,6 +585,7 @@ describe('StreamingEngine', () => {
             width: 600,
             height: 400,
             type: shaka.util.ManifestParserUtils.ContentType.VIDEO,
+            drmInfos: [],
           },
           audio: {
             id: 3,
@@ -631,6 +595,7 @@ describe('StreamingEngine', () => {
             codecs: 'mp4a.40.2',
             bandwidth: 192000,
             type: shaka.util.ManifestParserUtils.ContentType.AUDIO,
+            drmInfos: [],
           },
         }],
       };

package/test/media/streaming_engine_unit.js

@@ -496,7 +496,8 @@ describe('StreamingEngine', () => {
     expectedMseInit.set(ContentType.VIDEO, videoStream);
     expectedMseInit.set(ContentType.TEXT, textStream);
 
-    expect(mediaSourceEngine.init).toHaveBeenCalledWith(expectedMseInit, false);
+    expect(mediaSourceEngine.init).toHaveBeenCalledWith(expectedMseInit,
+        /** forceTransmuxTS= */ false, /** sequenceMode= */ false);
     expect(mediaSourceEngine.init).toHaveBeenCalledTimes(1);
 
     expect(mediaSourceEngine.setDuration).toHaveBeenCalledTimes(1);
@@ -801,7 +802,7 @@ describe('StreamingEngine', () => {
       asymmetricMatch: (val) => val > 40 && val <= 40.1,
     };
     expect(mediaSourceEngine.setStreamProperties)
-        .toHaveBeenCalledWith('video', 0, lt20, gt40);
+        .toHaveBeenCalledWith('video', 0, lt20, gt40, false);
   });
 
   // Regression test for https://github.com/shaka-project/shaka-player/issues/3717

package/test/media/time_ranges_utils_unit.js

@@ -22,11 +22,6 @@ describe('TimeRangesUtils', () => {
       expect(TimeRangesUtils.isBuffered(b, 13)).toBe(true);
     });
 
-    it('returns buffered when having a small gap', () => {
-      const b = createFakeBuffered([{start: 10, end: 20}]);
-      expect(TimeRangesUtils.isBuffered(b, 9, 1)).toBe(true);
-    });
-
     // Ranges: [10-20], [30-40], [50-60]
     defineTest('returns false when before range', {time: 3, expected: false});
     defineTest('returns true inside first range', {time: 12, expected: true});

package/test/offline/indexeddb_storage_unit.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-filterDescribe('IndexeddbStorageCell', () => window.indexedDB, () => {
+filterDescribe('IndexeddbStorageCell', offlineSupported, () => {
   const IndexedDBUtils = shaka.test.IndexedDBUtils;
   const OfflineUtils = shaka.test.OfflineUtils;
   const Util = shaka.test.Util;

package/test/offline/manifest_convert_unit.js

@@ -107,6 +107,7 @@ describe('ManifestConverter', () => {
         },
         appMetadata: null,
         creationTime: 0,
+        sequenceMode: false,
       };
 
       const manifest = createConverter().fromManifestDB(manifestDb);
@@ -143,6 +144,7 @@ describe('ManifestConverter', () => {
           createVideoStreamDB(1, [0]),
           createVideoStreamDB(2, [1]),
         ],
+        sequenceMode: false,
       };
 
       const manifest = createConverter().fromManifestDB(manifestDb);
@@ -170,6 +172,7 @@ describe('ManifestConverter', () => {
           createAudioStreamDB(1, [0]),
           createAudioStreamDB(2, [1]),
         ],
+        sequenceMode: false,
       };
 
       const manifest = createConverter().fromManifestDB(manifestDb);
@@ -182,6 +185,29 @@ describe('ManifestConverter', () => {
       expect(manifest.variants[1].video).toBe(null);
     });
 
+    it('supports containerless content', () => {
+      /** @type {shaka.extern.ManifestDB} */
+      const manifestDb = {
+        originalManifestUri: 'http://example.com/foo',
+        duration: 60,
+        size: 1234,
+        expiration: Infinity,
+        sessionIds: [],
+        drmInfo: null,
+        appMetadata: null,
+        creationTime: 0,
+        streams: [
+          createVideoStreamDB(1, [0]),
+          createAudioStreamDB(2, [0]),
+        ],
+        sequenceMode: true,
+      };
+
+      const manifest = createConverter().fromManifestDB(manifestDb);
+      expect(manifest.sequenceMode).toBe(true);
+      expect(manifest.variants.length).toBe(1);
+    });
+
     it('supports text streams', () => {
       /** @type {shaka.extern.ManifestDB} */
       const manifestDb = {
@@ -197,6 +223,7 @@ describe('ManifestConverter', () => {
           createVideoStreamDB(1, [0]),
           createTextStreamDB(2),
         ],
+        sequenceMode: false,
       };
 
       const manifest = createConverter().fromManifestDB(manifestDb);
@@ -235,6 +262,7 @@ describe('ManifestConverter', () => {
           createVideoStreamDB(video1, [variant1]),
           createVideoStreamDB(video2, [variant2, variant3]),
         ],
+        sequenceMode: false,
       };
 
       const manifest = createConverter().fromManifestDB(manifestDb);
@@ -509,8 +537,6 @@ describe('ManifestConverter', () => {
 
     // Assume that we don't have to call createSegmentIndex.
 
-    const iterator = stream.segmentIndex[Symbol.iterator]();
-
     streamDb.segments.forEach((segmentDb, i) => {
       const uri = shaka.offline.OfflineUri.segment(
           'mechanism', 'cell', segmentDb.dataKey);
@@ -520,10 +546,14 @@ describe('ManifestConverter', () => {
           null;
 
       /** @type {shaka.media.SegmentReference} */
-      const segment = iterator.seek(segmentDb.startTime);
+      const segment =
+          stream.segmentIndex
+              .getIteratorForTime(segmentDb.startTime).next().value;
 
       /** @type {shaka.media.SegmentReference} */
-      const sameSegment = iterator.seek(segmentDb.endTime - 0.1);
+      const sameSegment =
+          stream.segmentIndex
+              .getIteratorForTime(segmentDb.endTime - 0.1).next().value;
 
       expect(segment).toBe(sameSegment);
       expect(segment.startTime).toBe(segmentDb.startTime);

package/test/offline/offline_manifest_parser_unit.js

@@ -210,6 +210,7 @@ filterDescribe('OfflineManifestParser', offlineManifestParserSupport, () => {
       sessionIds: [sessionId],
       drmInfo: null,
       appMetadata: {},
+      sequenceMode: false,
     };
 
     return manifest;

package/test/offline/storage_compatibility_unit.js

@@ -91,7 +91,7 @@ const compatibilityTestsMetadata = [
   },
 ];
 
-filterDescribe('Storage Compatibility', () => window.indexedDB, () => {
+filterDescribe('Storage Compatibility', offlineSupported, () => {
   for (const metadata of compatibilityTestsMetadata) {
     describe(metadata.name, () => {
       makeTests(metadata);

package/test/offline/storage_integration.js

@@ -1110,10 +1110,7 @@ filterDescribe('Storage', storageSupport, () => {
           aRequestIsStarted.resolve();
           await promise;
 
-          // All downloads for a given stream are in the same "download group",
-          // and will be downloaded sequentially. Thus, we expect only the first
-          // download to be aborted.
-          expect(abortCheck()).toBe(i == 0 ? true : false);
+          expect(abortCheck()).toBe(true);
 
           return new ArrayBuffer(16);
         });
@@ -1355,6 +1352,8 @@ filterDescribe('Storage', storageSupport, () => {
       pixelAspectRatio: '59:54',
       hdr: null,
       mimeType: 'video/mp4,audio/mp4',
+      audioMimeType: 'audio/mp4',
+      videoMimeType: 'video/mp4',
       codecs: 'mp4,mp4',
       audioCodec: 'mp4',
       videoCodec: 'mp4',
@@ -1397,6 +1396,8 @@ filterDescribe('Storage', storageSupport, () => {
       pixelAspectRatio: null,
       hdr: null,
       mimeType: 'text/vtt',
+      audioMimeType: null,
+      videoMimeType: null,
       codecs: 'vtt',
       audioCodec: null,
       videoCodec: null,

package/test/player_external.js

@@ -107,12 +107,6 @@ describe('Player', () => {
         player.configure('manifest.dash.clockSyncUri',
             'https://shaka-player-demo.appspot.com/time.txt');
 
-        // Make sure we don't get stuck on gaps that only appear in some
-        // browsers (Safari, Firefox).
-        // TODO(https://github.com/shaka-project/shaka-player/issues/1702):
-        // Is this necessary because of a bug in Shaka Player?
-        player.configure('streaming.jumpLargeGaps', true);
-
         // Add asset-specific configuration.
         player.configure(asset.getConfiguration());
 
@@ -120,7 +114,13 @@ describe('Player', () => {
         const networkingEngine = player.getNetworkingEngine();
         asset.applyFilters(networkingEngine);
 
-        await player.load(asset.manifestUri);
+        // Rather than awaiting the load() method, catch any load() errors and
+        // wait on the 'canplay' event.  This has the advantage that we will
+        // get better logging of the media state on a timeout, since that
+        // capabilitiy is built into the waiter for media element events.
+        player.load(asset.manifestUri).catch(fail);
+        await waiter.timeoutAfter(60).waitForEvent(video, 'canplay');
+
         if (asset.features) {
           const isLive = asset.features.includes(Feature.LIVE);
           expect(player.isLive()).toBe(isLive);

package/test/player_integration.js

@@ -418,6 +418,22 @@ describe('Player', () => {
       expect(video.playbackRate).toBe(1);
     });
 
+    it('in sequence mode', async () => {
+      const testSchemeMimeType = 'application/x-test-manifest';
+      player = new compiledShaka.Player(video);
+      await player.load('test:sintel_sequence_compiled', 0, testSchemeMimeType);
+      expect(player.getManifest().sequenceMode).toBe(true);
+
+      // Ensure the video plays.
+      video.play();
+      await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 5, 10);
+
+      // Seek the video, and see if it can continue playing from that point.
+      video.currentTime = 20;
+      // Expect that we can then reach the end of the video.
+      await waiter.timeoutAfter(20).waitForEnd(video);
+    });
+
     // Regression test for #2326.
     //
     // 1. Construct an instance with a video element.
@@ -1053,16 +1069,16 @@ describe('Player', () => {
     });
   });  // describe('unloading')
 
-  describe('chapters', () => {
-    it('add external chapters in vtt format', async () => {
+  describe('addChaptersTrack', () => {
+    it('adds external chapters in vtt format', async () => {
       await player.load('test:sintel_no_text_compiled');
       const locationUri = new goog.Uri(location.href);
       const partialUri1 = new goog.Uri('/base/test/test/assets/chapters.vtt');
       const absoluteUri1 = locationUri.resolve(partialUri1);
       await player.addChaptersTrack(absoluteUri1.toString(), 'en');
 
-      await shaka.test.Util.delay(1.5);
-
+      // Data should be available as soon as addChaptersTrack resolves.
+      // See https://github.com/shaka-project/shaka-player/issues/4186
       const chapters = player.getChapters('en');
       expect(chapters.length).toBe(3);
       const chapter1 = chapters[0];
@@ -1082,8 +1098,6 @@ describe('Player', () => {
       const absoluteUri2 = locationUri.resolve(partialUri2);
       await player.addChaptersTrack(absoluteUri2.toString(), 'en');
 
-      await shaka.test.Util.delay(1.5);
-
       const chaptersUpdated = player.getChapters('en');
       expect(chaptersUpdated.length).toBe(6);
       const chapterUpdated1 = chaptersUpdated[0];
@@ -1112,15 +1126,13 @@ describe('Player', () => {
       expect(chapterUpdated6.endTime).toBe(61.349);
     });
 
-    it('add external chapters in srt format', async () => {
+    it('adds external chapters in srt format', async () => {
       await player.load('test:sintel_no_text_compiled');
       const locationUri = new goog.Uri(location.href);
       const partialUri = new goog.Uri('/base/test/test/assets/chapters.srt');
       const absoluteUri = locationUri.resolve(partialUri);
       await player.addChaptersTrack(absoluteUri.toString(), 'es');
 
-      await shaka.test.Util.delay(1.5);
-
       const chapters = player.getChapters('es');
       expect(chapters.length).toBe(3);
       const chapter1 = chapters[0];
@@ -1136,5 +1148,5 @@ describe('Player', () => {
       expect(chapter3.startTime).toBe(30);
       expect(chapter3.endTime).toBe(61.349);
     });
-  });  // describe('chapters')
+  });  // describe('addChaptersTrack')
 });

package/test/player_src_equals_integration.js

@@ -319,90 +319,88 @@ describe('Player Src Equals', () => {
     expect(newTrack).toBeTruthy();
   });
 
-  it('add external chapters in vtt format', async () => {
-    await loadWithSrcEquals(SMALL_MP4_CONTENT_URI, /* startTime= */ null);
-
-    const locationUri = new goog.Uri(location.href);
-    const partialUri1 = new goog.Uri('/base/test/test/assets/chapters.vtt');
-    const absoluteUri1 = locationUri.resolve(partialUri1);
-    await player.addChaptersTrack(absoluteUri1.toString(), 'en');
-
-    await shaka.test.Util.delay(1.5);
-
-    const chapters = player.getChapters('en');
-    expect(chapters.length).toBe(3);
-    const chapter1 = chapters[0];
-    expect(chapter1.title).toBe('Chapter 1');
-    expect(chapter1.startTime).toBe(0);
-    expect(chapter1.endTime).toBe(5);
-    const chapter2 = chapters[1];
-    expect(chapter2.title).toBe('Chapter 2');
-    expect(chapter2.startTime).toBe(5);
-    expect(chapter2.endTime).toBe(10);
-    const chapter3 = chapters[2];
-    expect(chapter3.title).toBe('Chapter 3');
-    expect(chapter3.startTime).toBe(10);
-    expect(chapter3.endTime).toBe(20);
-
-    const partialUri2 = new goog.Uri('/base/test/test/assets/chapters2.vtt');
-    const absoluteUri2 = locationUri.resolve(partialUri2);
-    await player.addChaptersTrack(absoluteUri2.toString(), 'en');
-
-    await shaka.test.Util.delay(1.5);
-
-    const chaptersUpdated = player.getChapters('en');
-    expect(chaptersUpdated.length).toBe(6);
-    const chapterUpdated1 = chaptersUpdated[0];
-    expect(chapterUpdated1.title).toBe('Chapter 1');
-    expect(chapterUpdated1.startTime).toBe(0);
-    expect(chapterUpdated1.endTime).toBe(5);
-    const chapterUpdated2 = chaptersUpdated[1];
-    expect(chapterUpdated2.title).toBe('Chapter 2');
-    expect(chapterUpdated2.startTime).toBe(5);
-    expect(chapterUpdated2.endTime).toBe(10);
-    const chapterUpdated3 = chaptersUpdated[2];
-    expect(chapterUpdated3.title).toBe('Chapter 3');
-    expect(chapterUpdated3.startTime).toBe(10);
-    expect(chapterUpdated3.endTime).toBe(20);
-    const chapterUpdated4 = chaptersUpdated[3];
-    expect(chapterUpdated4.title).toBe('Chapter 4');
-    expect(chapterUpdated4.startTime).toBe(20);
-    expect(chapterUpdated4.endTime).toBe(30);
-    const chapterUpdated5 = chaptersUpdated[4];
-    expect(chapterUpdated5.title).toBe('Chapter 5');
-    expect(chapterUpdated5.startTime).toBe(30);
-    expect(chapterUpdated5.endTime).toBe(40);
-    const chapterUpdated6 = chaptersUpdated[5];
-    expect(chapterUpdated6.title).toBe('Chapter 6');
-    expect(chapterUpdated6.startTime).toBe(40);
-    expect(chapterUpdated6.endTime).toBe(61.349);
-  });
-
-  it('add external chapters in srt format', async () => {
-    await loadWithSrcEquals(SMALL_MP4_CONTENT_URI, /* startTime= */ null);
-
-    const locationUri = new goog.Uri(location.href);
-    const partialUri = new goog.Uri('/base/test/test/assets/chapters.srt');
-    const absoluteUri = locationUri.resolve(partialUri);
-    await player.addChaptersTrack(absoluteUri.toString(), 'es');
-
-    await shaka.test.Util.delay(1.5);
+  describe('addChaptersTrack', () => {
+    it('adds external chapters in vtt format', async () => {
+      await loadWithSrcEquals(SMALL_MP4_CONTENT_URI, /* startTime= */ null);
+
+      const locationUri = new goog.Uri(location.href);
+      const partialUri1 = new goog.Uri('/base/test/test/assets/chapters.vtt');
+      const absoluteUri1 = locationUri.resolve(partialUri1);
+      await player.addChaptersTrack(absoluteUri1.toString(), 'en');
+
+      // Data should be available as soon as addChaptersTrack resolves.
+      // See https://github.com/shaka-project/shaka-player/issues/4186
+      const chapters = player.getChapters('en');
+      expect(chapters.length).toBe(3);
+      const chapter1 = chapters[0];
+      expect(chapter1.title).toBe('Chapter 1');
+      expect(chapter1.startTime).toBe(0);
+      expect(chapter1.endTime).toBe(5);
+      const chapter2 = chapters[1];
+      expect(chapter2.title).toBe('Chapter 2');
+      expect(chapter2.startTime).toBe(5);
+      expect(chapter2.endTime).toBe(10);
+      const chapter3 = chapters[2];
+      expect(chapter3.title).toBe('Chapter 3');
+      expect(chapter3.startTime).toBe(10);
+      expect(chapter3.endTime).toBe(20);
+
+      const partialUri2 = new goog.Uri('/base/test/test/assets/chapters2.vtt');
+      const absoluteUri2 = locationUri.resolve(partialUri2);
+      await player.addChaptersTrack(absoluteUri2.toString(), 'en');
+
+      const chaptersUpdated = player.getChapters('en');
+      expect(chaptersUpdated.length).toBe(6);
+      const chapterUpdated1 = chaptersUpdated[0];
+      expect(chapterUpdated1.title).toBe('Chapter 1');
+      expect(chapterUpdated1.startTime).toBe(0);
+      expect(chapterUpdated1.endTime).toBe(5);
+      const chapterUpdated2 = chaptersUpdated[1];
+      expect(chapterUpdated2.title).toBe('Chapter 2');
+      expect(chapterUpdated2.startTime).toBe(5);
+      expect(chapterUpdated2.endTime).toBe(10);
+      const chapterUpdated3 = chaptersUpdated[2];
+      expect(chapterUpdated3.title).toBe('Chapter 3');
+      expect(chapterUpdated3.startTime).toBe(10);
+      expect(chapterUpdated3.endTime).toBe(20);
+      const chapterUpdated4 = chaptersUpdated[3];
+      expect(chapterUpdated4.title).toBe('Chapter 4');
+      expect(chapterUpdated4.startTime).toBe(20);
+      expect(chapterUpdated4.endTime).toBe(30);
+      const chapterUpdated5 = chaptersUpdated[4];
+      expect(chapterUpdated5.title).toBe('Chapter 5');
+      expect(chapterUpdated5.startTime).toBe(30);
+      expect(chapterUpdated5.endTime).toBe(40);
+      const chapterUpdated6 = chaptersUpdated[5];
+      expect(chapterUpdated6.title).toBe('Chapter 6');
+      expect(chapterUpdated6.startTime).toBe(40);
+      expect(chapterUpdated6.endTime).toBe(61.349);
+    });
 
-    const chapters = player.getChapters('es');
-    expect(chapters.length).toBe(3);
-    const chapter1 = chapters[0];
-    expect(chapter1.title).toBe('Chapter 1');
-    expect(chapter1.startTime).toBe(0);
-    expect(chapter1.endTime).toBe(5);
-    const chapter2 = chapters[1];
-    expect(chapter2.title).toBe('Chapter 2');
-    expect(chapter2.startTime).toBe(5);
-    expect(chapter2.endTime).toBe(30);
-    const chapter3 = chapters[2];
-    expect(chapter3.title).toBe('Chapter 3');
-    expect(chapter3.startTime).toBe(30);
-    expect(chapter3.endTime).toBe(61.349);
-  });
+    it('add external chapters in srt format', async () => {
+      await loadWithSrcEquals(SMALL_MP4_CONTENT_URI, /* startTime= */ null);
+
+      const locationUri = new goog.Uri(location.href);
+      const partialUri = new goog.Uri('/base/test/test/assets/chapters.srt');
+      const absoluteUri = locationUri.resolve(partialUri);
+      await player.addChaptersTrack(absoluteUri.toString(), 'es');
+
+      const chapters = player.getChapters('es');
+      expect(chapters.length).toBe(3);
+      const chapter1 = chapters[0];
+      expect(chapter1.title).toBe('Chapter 1');
+      expect(chapter1.startTime).toBe(0);
+      expect(chapter1.endTime).toBe(5);
+      const chapter2 = chapters[1];
+      expect(chapter2.title).toBe('Chapter 2');
+      expect(chapter2.startTime).toBe(5);
+      expect(chapter2.endTime).toBe(30);
+      const chapter3 = chapters[2];
+      expect(chapter3.title).toBe('Chapter 3');
+      expect(chapter3.startTime).toBe(30);
+      expect(chapter3.endTime).toBe(61.349);
+    });
+  }); // describe('addChaptersTrack')
 
   // Since we are not in-charge of streaming, calling |retryStreaming| should
   // have no effect.