shaka-player 4.2.12 → 4.2.13

package/test/hls/hls_parser_unit.js

@@ -573,6 +573,78 @@ describe('HlsParser', () => {
     await testHlsParser(master, media, manifest);
   });
 
+  it('accepts fLaC codec as audio/mp4', async () => {
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=1000000,CODECS="fLaC"\n',
+      'audio\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=1000000,CODECS="flac"\n',
+      'audio2\n',
+    ].join('');
+
+    const media = [
+      '#EXTM3U\n',
+      '#EXT-X-PLAYLIST-TYPE:VOD\n',
+      '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+      '#EXTINF:5,\n',
+      '#EXT-X-BYTERANGE:121090@616\n',
+      'main.mp4',
+    ].join('');
+
+    const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+      manifest.anyTimeline();
+      manifest.addPartialVariant((variant) => {
+        variant.addPartialStream(ContentType.AUDIO, (stream) => {
+          stream.mime('audio/mp4', 'fLaC');
+        });
+      });
+      manifest.addPartialVariant((variant) => {
+        variant.addPartialStream(ContentType.AUDIO, (stream) => {
+          stream.mime('audio/mp4', 'flac');
+        });
+      });
+      manifest.sequenceMode = true;
+    });
+
+    await testHlsParser(master, media, manifest);
+  });
+
+  it('accepts Opus codec as audio/mp4', async () => {
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=128000,CODECS="Opus"\n',
+      'audio\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=128000,CODECS="opus"\n',
+      'audio2\n',
+    ].join('');
+
+    const media = [
+      '#EXTM3U\n',
+      '#EXT-X-PLAYLIST-TYPE:VOD\n',
+      '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+      '#EXTINF:5,\n',
+      '#EXT-X-BYTERANGE:121090@616\n',
+      'main.mp4',
+    ].join('');
+
+    const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+      manifest.anyTimeline();
+      manifest.addPartialVariant((variant) => {
+        variant.addPartialStream(ContentType.AUDIO, (stream) => {
+          stream.mime('audio/mp4', 'Opus');
+        });
+      });
+      manifest.addPartialVariant((variant) => {
+        variant.addPartialStream(ContentType.AUDIO, (stream) => {
+          stream.mime('audio/mp4', 'opus');
+        });
+      });
+      manifest.sequenceMode = true;
+    });
+
+    await testHlsParser(master, media, manifest);
+  });
+
   it('parses audio+video variant with closed captions', async () => {
     const master = [
       '#EXTM3U\n',

package/test/media/drm_engine_integration.js

@@ -242,7 +242,7 @@ describe('DrmEngine', () => {
           /* hasClosedCaptions= */ false);
 
       expect(video.buffered.end(0)).toBeGreaterThan(0);
-      video.play();
+      await video.play();
 
       const waiter = new shaka.test.Waiter(eventManager).timeoutAfter(15);
       waiter.setMediaSourceEngine(mediaSourceEngine);
@@ -325,7 +325,7 @@ describe('DrmEngine', () => {
           /* hasClosedCaptions= */ false);
 
       expect(video.buffered.end(0)).toBeGreaterThan(0);
-      video.play();
+      await video.play();
 
       const waiter = new shaka.test.Waiter(eventManager).timeoutAfter(15);
       waiter.setMediaSourceEngine(mediaSourceEngine);

package/test/media/segment_index_unit.js

@@ -974,9 +974,9 @@ describe('SegmentIndex', /** @suppress {accessControls} */ () => {
           return [newRefs.shift()];
         });
       });
-      // Wait long enough for all three new refs to be appended.
-      // Or for all of the new refs to be passed out.
-      await Promise.race([shaka.test.Util.delay(1), done]);
+
+      // Wait for the new refs to be appended.
+      await done;
 
       expect(Array.from(metaIndex)).toEqual(oldRefs.concat(inputRefs2));
     });

package/test/media/streaming_engine_integration.js

@@ -57,6 +57,9 @@ describe('StreamingEngine', () => {
   beforeEach(() => {
     config = shaka.util.PlayerConfiguration.createDefault().streaming;
 
+    // Disable stall detection, which can interfere with playback tests.
+    config.stallEnabled = false;
+
     onError = jasmine.createSpy('onError');
     onError.and.callFake(fail);
     onEvent = jasmine.createSpy('onEvent');
@@ -276,7 +279,7 @@ describe('StreamingEngine', () => {
       // Let's go!
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
-      video.play();
+      await video.play();
       // The overall test timeout is 120 seconds, and the content is 40
       // seconds.  It should be possible to complete this test in 100 seconds,
       // and if not, we want the error thrown to be within the overall test's
@@ -296,7 +299,7 @@ describe('StreamingEngine', () => {
       // Let's go!
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
-      video.play();
+      await video.play();
 
       // Wait for playback to begin before increasing the playback rate.  This
       // improves test reliability on slow platforms like Chromecast.
@@ -310,7 +313,7 @@ describe('StreamingEngine', () => {
       // Let's go!
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
-      video.play();
+      await video.play();
 
       // After 35 seconds seek back 10 seconds into the first Period.
       await waiter.timeoutAfter(80).waitUntilPlayheadReaches(video, 35);
@@ -322,7 +325,7 @@ describe('StreamingEngine', () => {
       // Let's go!
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
-      video.play();
+      await video.play();
       await waiter.timeoutAfter(60).waitUntilPlayheadReaches(video, 20);
       video.currentTime = 40;
       await waiter.timeoutAfter(60).waitForEnd(video);
@@ -350,7 +353,7 @@ describe('StreamingEngine', () => {
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
 
-      video.play();
+      await video.play();
       await waiter.timeoutAfter(60).waitUntilPlayheadReaches(video, 305);
 
       const segmentType = shaka.net.NetworkingEngine.RequestType.SEGMENT;
@@ -370,7 +373,7 @@ describe('StreamingEngine', () => {
       // Seek outside the availability window right away. The playhead
       // should adjust the video's current time.
       video.currentTime = segmentAvailability.end + 120;
-      video.play();
+      await video.play();
 
       // Wait until the repositioning is complete so we don't
       // immediately hit this case.
@@ -395,7 +398,7 @@ describe('StreamingEngine', () => {
       video.currentTime = segmentAvailability.start - 120;
       expect(video.currentTime).toBeGreaterThan(0);
 
-      video.play();
+      await video.play();
       await waiter.timeoutAfter(60).waitUntilPlayheadReaches(video, 305);
 
       // We are playing close to the beginning of the availability window.
@@ -423,7 +426,7 @@ describe('StreamingEngine', () => {
       // Let's go!
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
-      video.play();
+      await video.play();
 
       await waiter.timeoutAfter(5).waitUntilPlayheadReaches(video, 0.01);
       expect(video.buffered.length).toBeGreaterThan(0);
@@ -438,7 +441,7 @@ describe('StreamingEngine', () => {
       // Let's go!
       streamingEngine.switchVariant(variant);
       await streamingEngine.start();
-      video.play();
+      await video.play();
 
       await waiter.timeoutAfter(5).waitUntilPlayheadReaches(video, 0.01);
       expect(video.buffered.length).toBeGreaterThan(0);
@@ -457,7 +460,7 @@ describe('StreamingEngine', () => {
       await waiter.timeoutAfter(5).waitForEvent(video, 'loadeddata');
 
       video.currentTime = 8;
-      video.play();
+      await video.play();
 
       await waiter.timeoutAfter(60).waitUntilPlayheadReaches(video, 23);
       // Should be close enough to still have the gap buffered.
@@ -474,7 +477,7 @@ describe('StreamingEngine', () => {
       await waiter.timeoutAfter(5).waitForEvent(video, 'loadeddata');
 
       video.currentTime = 8;
-      video.play();
+      await video.play();
 
       await waiter.timeoutAfter(60).waitUntilPlayheadReaches(video, 23);
       // Should be close enough to still have the gap buffered.

package/test/offline/offline_integration.js

@@ -33,6 +33,9 @@ filterDescribe('Offline', supportsStorage, () => {
     player = new shaka.Player(video);
     player.addEventListener('error', fail);
 
+    // Disable stall detection, which can interfere with playback tests.
+    player.configure('streaming.stallEnabled', false);
+
     eventManager = new shaka.util.EventManager();
     waiter = new shaka.test.Waiter(eventManager);
     waiter.setPlayer(player);
@@ -67,7 +70,7 @@ filterDescribe('Offline', supportsStorage, () => {
 
     await player.load(contentUri);
 
-    video.play();
+    await video.play();
     await playTo(/* end= */ 3, /* timeout= */ 20);
     await player.unload();
     await storage.remove(contentUri);
@@ -103,7 +106,7 @@ filterDescribe('Offline', supportsStorage, () => {
 
         await player.load(contentUri);
 
-        video.play();
+        await video.play();
         await playTo(/* end= */ 3, /* timeout= */ 20);
         await player.unload();
         await storage.remove(contentUri);
@@ -146,7 +149,7 @@ filterDescribe('Offline', supportsStorage, () => {
 
         await player.load(contentUri);
 
-        video.play();
+        await video.play();
         await playTo(/* end= */ 3, /* timeout= */ 20);
         await player.unload();
         await storage.remove(contentUri);

package/test/player_external.js

@@ -36,6 +36,24 @@ describe('Player', () => {
   beforeEach(() => {
     player = new compiledShaka.Player(video);
 
+    // Make sure we are playing the lowest res available to avoid test flake
+    // based on network issues.  Note that disabling ABR and setting a low
+    // abr.defaultBandwidthEstimate would not be sufficient, because it
+    // would only affect the choice of track on the first period.  When we
+    // cross a period boundary, the default bandwidth estimate will no
+    // longer be in effect, and AbrManager may choose higher res tracks for
+    // the new period.  Using abr.restrictions.maxHeight will let us force
+    // AbrManager to the lowest resolution, which is its fallback when these
+    // soft restrictions cannot be met.
+    player.configure('abr.restrictions.maxHeight', 1);
+
+    // Make sure that live streams are synced against a good clock.
+    player.configure('manifest.dash.clockSyncUri',
+        'https://shaka-player-demo.appspot.com/time.txt');
+
+    // Disable stall detection, which can interfere with playback tests.
+    player.configure('streaming.stallEnabled', false);
+
     // Grab event manager from the uncompiled library:
     eventManager = new shaka.util.EventManager();
     waiter = new shaka.test.Waiter(eventManager);
@@ -92,21 +110,6 @@ describe('Player', () => {
           }
         }
 
-        // Make sure we are playing the lowest res available to avoid test flake
-        // based on network issues.  Note that disabling ABR and setting a low
-        // abr.defaultBandwidthEstimate would not be sufficient, because it
-        // would only affect the choice of track on the first period.  When we
-        // cross a period boundary, the default bandwidth estimate will no
-        // longer be in effect, and AbrManager may choose higher res tracks for
-        // the new period.  Using abr.restrictions.maxHeight will let us force
-        // AbrManager to the lowest resolution, which is its fallback when these
-        // soft restrictions cannot be met.
-        player.configure('abr.restrictions.maxHeight', 1);
-
-        // Make sure that live streams are synced against a good clock.
-        player.configure('manifest.dash.clockSyncUri',
-            'https://shaka-player-demo.appspot.com/time.txt');
-
         // Add asset-specific configuration.
         player.configure(asset.getConfiguration());
 
@@ -125,7 +128,7 @@ describe('Player', () => {
           const isLive = asset.features.includes(Feature.LIVE);
           expect(player.isLive()).toBe(isLive);
         }
-        video.play();
+        await video.play();
 
         // Wait for the video to start playback.  If it takes longer than 20
         // seconds, fail the test.

package/test/player_integration.js

@@ -34,6 +34,9 @@ describe('Player', () => {
     await shaka.test.TestScheme.createManifests(compiledShaka, '_compiled');
     player = new compiledShaka.Player(video);
 
+    // Disable stall detection, which can interfere with playback tests.
+    player.configure('streaming.stallEnabled', false);
+
     // Grab event manager from the uncompiled library:
     eventManager = new shaka.util.EventManager();
     waiter = new shaka.test.Waiter(eventManager);
@@ -81,11 +84,15 @@ describe('Player', () => {
       // Unlike the other tests in this file, this uses an uncompiled build of
       // Shaka, so that we don't need to expose shaka.util.Timer.activeTimers.
       player = new shaka.Player(video);
+
+      // Disable stall detection, which can interfere with playback tests.
+      player.configure('streaming.stallEnabled', false);
+
       waiter.setPlayer(player);
 
       // Play the video for a little while.
       await player.load('test:sintel');
-      video.play();
+      await video.play();
       await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 1, 10);
 
       // Destroy the player.
@@ -127,7 +134,7 @@ describe('Player', () => {
             }
           });
       await player.load('test:sintel_compiled');
-      video.play();
+      await video.play();
       await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 25, 30);
       expect(results).toEqual(expected);
     });
@@ -139,7 +146,7 @@ describe('Player', () => {
       // This is tested more in player_unit.js.  This is here to test the public
       // API and to check for renaming.
       await player.load('test:sintel_compiled');
-      video.play();
+      await video.play();
       await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 1, 10);
 
       const stats = player.getStats();
@@ -210,7 +217,7 @@ describe('Player', () => {
 
     it('does not cause cues to be null', async () => {
       await player.load('test:sintel_compiled');
-      video.play();
+      await video.play();
       await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 1, 10);
 
       // This TextTrack was created as part of load() when we set up the
@@ -331,7 +338,7 @@ describe('Player', () => {
       await player.load('test:sintel_realistic_compiled');
 
       // Play until a time at which the external cues would be on screen.
-      video.play();
+      await video.play();
       await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 4, 20);
 
       expect(player.isTextTrackVisible()).toBe(true);
@@ -363,7 +370,7 @@ describe('Player', () => {
       await waiter.waitForEvent(player, 'texttrackvisibility');
 
       // Play until a time at which the external cues would be on screen.
-      video.play();
+      await video.play();
       await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 4, 20);
 
       expect(player.isTextTrackVisible()).toBe(true);
@@ -434,7 +441,7 @@ describe('Player', () => {
       player.setTextTrackVisibility(true);
       player.selectTextLanguage('fr');
       video.currentTime = 5;
-      video.play();
+      await video.play();
       await waiter.waitForMovementOrFailOnTimeout(video, 10);
 
       expect(video.textTracks[0].activeCues.length).toBe(1);
@@ -472,7 +479,7 @@ describe('Player', () => {
 
     it('at higher playback rates', async () => {
       await player.load('test:sintel_compiled');
-      video.play();
+      await video.play();
       await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 1, 10);
 
       // Enabling trick play should change our playback rate to the same rate.
@@ -488,14 +495,12 @@ describe('Player', () => {
     });
 
     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);
+      await player.load('test:sintel_sequence_compiled');
       expect(player.getManifest().sequenceMode).toBe(true);
 
       // Ensure the video plays.
-      video.play();
-      await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 5, 10);
+      await video.play();
+      await waiter.timeoutAfter(20).waitUntilPlayheadReaches(video, 5);
 
       // Seek the video, and see if it can continue playing from that point.
       video.currentTime = 20;
@@ -514,9 +519,8 @@ describe('Player', () => {
     // even if one is not specified in load().
     it('immediately after construction with MIME type', async () => {
       const testSchemeMimeType = 'application/x-test-manifest';
-      player = new compiledShaka.Player(video);
       await player.load('test:sintel_compiled', 0, testSchemeMimeType);
-      video.play();
+      await video.play();
       await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 1, 10);
     });
 
@@ -555,7 +559,7 @@ describe('Player', () => {
     // Regression test for https://github.com/shaka-project/shaka-player/issues/1187
     it('does not throw on destroy', async () => {
       await player.load('test:sintel_compiled');
-      video.play();
+      await video.play();
       await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 1, 10);
       await player.unload();
       // Before we fixed #1187, the call to destroy() on textDisplayer was
@@ -801,7 +805,7 @@ describe('Player', () => {
       player.configure('streaming.observeQualityChanges', true);
 
       await player.load('test:sintel_compiled');
-      video.play();
+      await video.play();
 
       // Wait for the video to start playback.  If it takes longer than 10
       // seconds, fail the test.
@@ -815,7 +819,7 @@ describe('Player', () => {
       player.configure('streaming.observeQualityChanges', false);
 
       await player.load('test:sintel_compiled');
-      video.play();
+      await video.play();
 
       // Wait for the video to start playback.  If it takes longer than 10
       // seconds, fail the test.
@@ -844,7 +848,7 @@ describe('Player', () => {
 
       // Play the stream.
       await player.load('/base/test/test/assets/3675/dash_0.mpd');
-      video.play();
+      await video.play();
 
       // Wait for the stream to be over.
       eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
@@ -932,22 +936,22 @@ describe('Player', () => {
 
       await player.load('test:sintel_long_compiled');
       video.pause();
-      await waitUntilBuffered(10);
+      await waiter.waitUntilBuffered(video, 10);
 
       player.configure('streaming.bufferingGoal', 30);
-      await waitUntilBuffered(30);
+      await waiter.waitUntilBuffered(video, 30);
 
       player.configure('streaming.bufferingGoal', 60);
-      await waitUntilBuffered(60);
-      await Util.delay(0.2);
+      await waiter.waitUntilBuffered(video, 60);
+      await Util.delay(1);
       expect(getBufferedAhead()).toBeLessThan(70);  // 60 + segment_size
 
       // We don't remove buffered content ahead of the playhead, so seek to
       // clear the buffer.
       player.configure('streaming.bufferingGoal', 10);
       video.currentTime = 120;
-      await waitUntilBuffered(10);
-      await Util.delay(0.2);
+      await waiter.waitUntilBuffered(video, 10);
+      await Util.delay(1);
       expect(getBufferedAhead()).toBeLessThan(20);  // 10 + segment_size
     });
 
@@ -957,20 +961,22 @@ describe('Player', () => {
 
       await player.load('test:sintel_long_compiled');
       video.pause();
-      await waitUntilBuffered(30);
+      await waiter.waitUntilBuffered(video, 30);
       video.currentTime = 20;
-      await waitUntilBuffered(30);
+      await waiter.waitUntilBuffered(video, 30);
 
       expect(getBufferedBehind()).toBe(20);  // Buffered to start still.
       video.currentTime = 50;
-      await waitUntilBuffered(30);
+      await waiter.waitUntilBuffered(video, 30);
+      await Util.delay(1);
       expect(getBufferedBehind()).toBeLessThan(40);  // 30 + segment_size
 
       player.configure('streaming.bufferBehind', 10);
       // We only evict content when we append a segment, so increase the
       // buffering goal so we append another segment.
       player.configure('streaming.bufferingGoal', 40);
-      await waitUntilBuffered(40);
+      await waiter.waitUntilBuffered(video, 40);
+      await Util.delay(1);
       expect(getBufferedBehind()).toBeLessThanOrEqual(10);
     });
 
@@ -989,25 +995,6 @@ describe('Player', () => {
       }
       return video.currentTime - start;
     }
-
-    async function waitUntilBuffered(amount) {
-      for (let i = 0; i < 50; i++) {
-        // We buffer from an internal segment, so this shouldn't take long to
-        // buffer.
-        await Util.delay(0.1);  // eslint-disable-line no-await-in-loop
-        if (getBufferedAhead() >= amount) {
-          return;
-        }
-      }
-
-      const ranges =
-          shaka.media.TimeRangesUtils.getBufferedInfo(video.buffered);
-      const currentTime = video.currentTime;
-      const target = currentTime + amount;
-
-      throw new Error('Timeout waiting to buffer! ' +
-          JSON.stringify({ranges, currentTime, target}));
-    }
   });  // describe('buffering')
 
   describe('configuration', () => {

package/test/player_src_equals_integration.js

@@ -27,6 +27,10 @@ describe('Player Src Equals', () => {
   beforeEach(() => {
     player = new shaka.Player();
     player.addEventListener('error', fail);
+
+    // Disable stall detection, which can interfere with playback tests.
+    player.configure('streaming.stallEnabled', false);
+
     eventManager = new shaka.util.EventManager();
     waiter = new shaka.test.Waiter(eventManager);
   });
@@ -101,7 +105,7 @@ describe('Player Src Equals', () => {
     expect(video.duration).not.toBeCloseTo(0);
 
     // Start playback and wait for the playhead to move.
-    video.play();
+    await video.play();
     await waiter.waitForMovementOrFailOnTimeout(video, /* timeout= */10);
 
     // Make sure the playhead is roughly where we expect it to be before
@@ -138,7 +142,7 @@ describe('Player Src Equals', () => {
     await loadWithSrcEquals(SMALL_MP4_CONTENT_URI, /* startTime= */ null);
 
     // For playback to begin so that we have some content buffered.
-    video.play();
+    await video.play();
     await waiter.waitForMovementOrFailOnTimeout(video, /* timeout= */10);
 
     const buffered = player.getBufferedInfo();
@@ -162,7 +166,7 @@ describe('Player Src Equals', () => {
     await loadWithSrcEquals(SMALL_MP4_CONTENT_URI, /* startTime= */ null);
 
     // Let playback run for a little.
-    video.play();
+    await video.play();
     await waiter.waitForMovementOrFailOnTimeout(video, /* timeout= */10);
 
     let videoRateChange = false;
@@ -279,7 +283,7 @@ describe('Player Src Equals', () => {
     expect(video.currentTime).toBeCloseTo(0);
 
     // Start playback and wait. We should see the playhead move.
-    video.play();
+    await video.play();
     await waiter.waitForMovementOrFailOnTimeout(video, /* timeout= */10);
     await shaka.test.Util.delay(1.5);
 
@@ -296,7 +300,7 @@ describe('Player Src Equals', () => {
 
     // Wait some time for playback to start so that we will have a load latency
     // value.
-    video.play();
+    await video.play();
     await waiter.waitForMovementOrFailOnTimeout(video, /* timeout= */10);
 
     // Get the stats and check that some stats have been filled in.

package/test/test/util/fake_demo_main.js

@@ -12,9 +12,13 @@
  */
 shaka.test.FakeDemoMain = class {
   constructor() {
-    this.video = /** @type {!HTMLVideoElement} */ (
-      document.createElement('video'));
-    this.player = new shaka.Player(this.video);
+    // Using the player's constructor argument to attach a video element seems
+    // to cause flaky timeouts on teardown.  If a video element is needed in
+    // the future, please explicitly call attach(video) and await the result
+    // during the test setup.
+    /** @type {!shaka.Player} */
+    this.player = new shaka.Player();
+
     this.config_ = this.player.getConfiguration();
     this.selectedAsset = null;
 

package/test/test/util/layout_tests.js

@@ -395,7 +395,7 @@ shaka.test.NativeTextLayoutTests = class extends shaka.test.TextLayoutTests {
     // The this.video must be played a little now, after the cues were appended,
     // but before the screenshot.
     this.video.playbackRate = 1;
-    this.video.play();
+    await this.video.play();
     await this.waiter.failOnTimeout(false).timeoutAfter(5)
         .waitForMovement(this.video);
     this.video.pause();
@@ -404,7 +404,7 @@ shaka.test.NativeTextLayoutTests = class extends shaka.test.TextLayoutTests {
     this.video.currentTime = time;
     // Get into a playing state, but without movement.
     this.video.playbackRate = 0;
-    this.video.play();
+    await this.video.play();
 
     // Add a short delay to ensure that the system has caught up and that
     // native text displayers have been updated by the browser.

package/test/test/util/ui_utils.js

@@ -115,11 +115,18 @@ shaka.test.UiUtils = class {
       // Destroying the UI destroys the controls and player inside.
       destroys.push(ui.destroy());
     }
-    await Promise.all(destroys);
+
+    const allDestroyed = Promise.all(destroys);
+    // 10 seconds should be more than enough to tear down the UI.
+    // Adding this silent timeout fixes several tests that inconsistently hang
+    // during teardown and cause failures in afterEach() clauses.
+    await Promise.race([allDestroyed, shaka.test.Util.delay(10)]);
 
     // Now remove all the containers from the DOM.
     for (const container of containers) {
-      container.parentElement.removeChild(container);
+      if (container.parentElement) {
+        container.parentElement.removeChild(container);
+      }
     }
   }