shaka-player 4.3.13 → 4.3.15

package/lib/util/stream_utils.js

@@ -434,19 +434,36 @@ shaka.util.StreamUtils = class {
 
     await shaka.util.StreamUtils.getDecodingInfosForVariants(
         manifest.variants, usePersistentLicenses, /* srcEquals= */ false);
+
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
+    const Capabilities = shaka.media.Capabilities;
+    const ManifestParserUtils = shaka.util.ManifestParserUtils;
+    const MimeUtils = shaka.util.MimeUtils;
+    const StreamUtils = shaka.util.StreamUtils;
+    const isXboxOne = shaka.util.Platform.isXboxOne();
+
+    const isFirefoxAndroid = shaka.util.Platform.isFirefox() &&
+        shaka.util.Platform.isAndroid();
+
     manifest.variants = manifest.variants.filter((variant) => {
       // See: https://github.com/shaka-project/shaka-player/issues/3860
       const video = variant.video;
+      const videoWidth = (video && video.width) || 0;
+      const videoHeight = (video && video.height) || 0;
 
-      const ContentType = shaka.util.ManifestParserUtils.ContentType;
-      const Capabilities = shaka.media.Capabilities;
-      const ManifestParserUtils = shaka.util.ManifestParserUtils;
-      const MimeUtils = shaka.util.MimeUtils;
-      const StreamUtils = shaka.util.StreamUtils;
+      // See: https://github.com/shaka-project/shaka-player/issues/3380
+      // Note: it makes sense to drop early
+      if (isXboxOne && video &&
+        (videoWidth > 1920 || videoHeight > 1080) &&
+        (video.codecs.includes('avc1.') || video.codecs.includes('avc3.'))
+      ) {
+        shaka.log.debug('Dropping variant - not compatible with platform',
+            StreamUtils.getVariantSummaryString_(variant));
+        return false;
+      }
 
       if (video) {
         let videoCodecs = StreamUtils.getCorrectVideoCodecs_(video.codecs);
-
         // For multiplexed streams. Here we must check the audio of the
         // stream to see if it is compatible.
         if (video.codecs.includes(',')) {
@@ -455,7 +472,6 @@ shaka.util.StreamUtils = class {
           videoCodecs = ManifestParserUtils.guessCodecs(
               ContentType.VIDEO, allCodecs);
           videoCodecs = StreamUtils.getCorrectVideoCodecs_(videoCodecs);
-
           let audioCodecs = ManifestParserUtils.guessCodecs(
               ContentType.AUDIO, allCodecs);
           audioCodecs = StreamUtils.getCorrectAudioCodecs_(audioCodecs);
@@ -484,6 +500,17 @@ shaka.util.StreamUtils = class {
 
       const audio = variant.audio;
 
+      // See: https://github.com/shaka-project/shaka-player/issues/6111
+      // It seems that Firefox Android reports that it supports
+      // Opus + Widevine, but it is not actually supported.
+      // It makes sense to drop early.
+      if (isFirefoxAndroid && audio && audio.encrypted &&
+          audio.codecs.toLowerCase().includes('opus')) {
+        shaka.log.debug('Dropping variant - not compatible with platform',
+            StreamUtils.getVariantSummaryString_(variant));
+        return false;
+      }
+
       if (audio) {
         const codecs = StreamUtils.getCorrectAudioCodecs_(audio.codecs);
         const fullType = MimeUtils.getFullOrConvertedType(
@@ -497,17 +524,6 @@ shaka.util.StreamUtils = class {
         audio.codecs = codecs;
       }
 
-      // See: https://github.com/shaka-project/shaka-player/issues/3380
-      if (shaka.util.Platform.isXboxOne() && video &&
-          ((video.width && video.width > 1920) ||
-          (video.height && video.height > 1080)) &&
-          (video.codecs.includes('avc1.') ||
-          video.codecs.includes('avc3.'))) {
-        shaka.log.debug('Dropping variant - not compatible with platform',
-            StreamUtils.getVariantSummaryString_(variant));
-        return false;
-      }
-
       const supported = variant.decodingInfos.some((decodingInfo) => {
         return decodingInfo.supported;
       });
@@ -790,7 +806,7 @@ shaka.util.StreamUtils = class {
     // currently don't support 'fLaC', while 'flac' is supported by most
     // major browsers.
     // See https://bugs.chromium.org/p/chromium/issues/detail?id=1422728
-    if (codecs === 'fLaC') {
+    if (codecs === 'fLaC' && !shaka.util.Platform.isSafari()) {
       return 'flac';
     }
 
@@ -799,15 +815,7 @@ shaka.util.StreamUtils = class {
       return 'opus';
     }
 
-    // Some Tizen devices seem to misreport AC-3 support, but correctly
-    // report EC-3 support.  So query EC-3 as a fallback for AC-3.
-    // See https://github.com/shaka-project/shaka-player/issues/2989 for
-    // details.
-    if (shaka.util.Platform.isTizen()) {
-      return codecs.toLowerCase() == 'ac-3' ? 'ec-3' : codecs;
-    } else {
-      return codecs;
-    }
+    return codecs;
   }
 
 

package/lib/util/xml_utils.js

@@ -384,6 +384,11 @@ shaka.util.XmlUtils = class {
       return null;
     }
 
+    // Cobalt browser doesn't support document.createNodeIterator.
+    if (!('createNodeIterator' in document)) {
+      return rootElem;
+    }
+
     // SECURITY: Verify that the document does not contain elements from the
     // HTML or SVG namespaces, which could trigger script execution and XSS.
     const iterator = document.createNodeIterator(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.3.13",
+  "version": "4.3.15",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -42,13 +42,13 @@
     "karma-coverage": "^2.2.0",
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-ajax": "^0.1.13",
-    "karma-local-wd-launcher": "^1.6.6",
+    "karma-local-wd-launcher": "^1.6.7",
     "karma-opera-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-spec-reporter": "^0.0.34",
     "karma-webdriver-launcher": "^1.0.8",
     "lcevc_dil.js": "^1.1.20",
-    "less": "https://gitpkg.now.sh/joeyparrish/less.js/packages/less?28c63a43",
+    "less": "^4.2.0",
     "less-plugin-clean-css": "github:austingardner/less-plugin-clean-css#4e9e77bf",
     "material-design-lite": "^1.3.0",
     "mux.js": "^6.2.0",

package/test/cea/cea_decoder_unit.js

@@ -44,6 +44,39 @@ describe('CeaDecoder', () => {
       decoder.clear();
     });
 
+    it('painton captions on CC4', () => {
+      const controlCount = 0x03;
+      const captionData = 0xc0 | controlCount;
+      const paintonCaptionCC4Packet = new Uint8Array([
+        ...atscCaptionInitBytes, captionData, /* padding= */ 0xff,
+        0xfd, 0x9d, 0x29, // Paint-on mode (RDC control code).
+        0xfd, 0xf4, 0xe5, // t, e
+        0xfd, 0x73, 0xf4, // s, t
+      ]);
+
+      const startTimeCaption1 = 1;
+      const startTimeCaption2 = 2;
+      const expectedText = 'test';
+
+      const topLevelCue = new shaka.text.Cue(startTimeCaption1,
+          startTimeCaption2, '');
+      topLevelCue.nestedCues = [
+        CeaUtils.createDefaultCue(
+            startTimeCaption1, startTimeCaption2, expectedText),
+      ];
+
+      const expectedCaptions = [{
+        stream: 'CC4',
+        cue: topLevelCue,
+      }];
+
+      decoder.extract(paintonCaptionCC4Packet, startTimeCaption1);
+      decoder.extract(eraseDisplayedMemory, startTimeCaption2);
+      const captions = decoder.decode();
+
+      expect(captions).toEqual(expectedCaptions);
+    });
+
     it('green and underlined popon caption data on CC3', () => {
       const controlCount = 0x08;
       const captionData = 0xc0 | controlCount;
@@ -486,6 +519,13 @@ describe('CeaDecoder', () => {
 
       expect(decoder.reset).toHaveBeenCalledTimes(1);
     });
+
+    it('does not attempt to extract SEI packet that is too short', () => {
+      const badData = new Uint8Array([0xb5]);
+      decoder.extract(badData, 0);
+      const captions = decoder.decode();
+      expect(captions.length).toBe(0);
+    });
   });
 
   describe('decodes CEA-708', () => {

package/test/dash/dash_parser_live_unit.js

@@ -607,12 +607,12 @@ describe('DashParser Live', () => {
     expect(onError).toHaveBeenCalledTimes(1);
   });
 
-  it('uses @minimumUpdatePeriod', async () => {
+  it('still updates when @minimumUpdatePeriod is zero', async () => {
     const lines = [
       '<SegmentTemplate startNumber="1" media="s$Number$.mp4" duration="2" />',
     ];
     // updateTime parameter sets @minimumUpdatePeriod in the manifest.
-    const manifestText = makeSimpleLiveManifestText(lines, updateTime);
+    const manifestText = makeSimpleLiveManifestText(lines, /* updateTime= */ 0);
 
     /** @type {!jasmine.Spy} */
     const tickAfter = updateTickSpy();
@@ -622,16 +622,14 @@ describe('DashParser Live', () => {
     await parser.start('dummy://foo', playerInterface);
 
     expect(tickAfter).toHaveBeenCalledTimes(1);
-    const delay = tickAfter.calls.mostRecent().args[0];
-    expect(delay).toBe(updateTime);
   });
 
-  it('still updates when @minimumUpdatePeriod is zero', async () => {
+  it('uses @minimumUpdatePeriod', async () => {
     const lines = [
       '<SegmentTemplate startNumber="1" media="s$Number$.mp4" duration="2" />',
     ];
     // updateTime parameter sets @minimumUpdatePeriod in the manifest.
-    const manifestText = makeSimpleLiveManifestText(lines, /* updateTime= */ 0);
+    const manifestText = makeSimpleLiveManifestText(lines, updateTime);
 
     /** @type {!jasmine.Spy} */
     const tickAfter = updateTickSpy();
@@ -640,10 +638,9 @@ describe('DashParser Live', () => {
     fakeNetEngine.setResponseText('dummy://foo', manifestText);
     await parser.start('dummy://foo', playerInterface);
 
-    const waitTime = shaka.dash.DashParser['MIN_UPDATE_PERIOD_'];
     expect(tickAfter).toHaveBeenCalledTimes(1);
     const delay = tickAfter.calls.mostRecent().args[0];
-    expect(delay).toBe(waitTime);
+    expect(delay).toBe(updateTime);
   });
 
   it('does not update when @minimumUpdatePeriod is missing', async () => {

package/test/hls/hls_parser_unit.js

@@ -739,6 +739,45 @@ describe('HlsParser', () => {
     await testHlsParser(master, media, manifest);
   });
 
+  it('parses audio+video variant with global closed captions', async () => {
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="eng",CHANNELS="2",',
+      'URI="audio"\n',
+      '#EXT-X-MEDIA:TYPE=CLOSED-CAPTIONS,GROUP-ID="cap1",LANGUAGE="eng",',
+      'INSTREAM-ID="CC1"\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1,mp4a",',
+      'RESOLUTION=960x540,FRAME-RATE=60,AUDIO="aud1"\n',
+      'video\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 closedCaptions = new Map([['CC1', 'en']]);
+    const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+      manifest.anyTimeline();
+      manifest.addPartialVariant((variant) => {
+        variant.addPartialStream(ContentType.VIDEO, (stream) => {
+          stream.closedCaptions = closedCaptions;
+          stream.mime('video/mp4', 'avc1');
+        });
+        variant.addPartialStream(ContentType.AUDIO, (stream) => {
+          stream.mime('audio/mp4', 'mp4a');
+        });
+      });
+      manifest.sequenceMode = true;
+    });
+
+    await testHlsParser(master, media, manifest);
+  });
+
   it('parses audio+video variant with no closed captions', async () => {
     const master = [
       '#EXTM3U\n',
@@ -2926,7 +2965,8 @@ describe('HlsParser', () => {
     const media = [
       '#EXTM3U\n',
       '#EXT-X-PLAYLIST-TYPE:VOD\n',
-      '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+      '#EXT-X-BYTERANGE:616@0\n',
+      '#EXT-X-MAP:URI="init.mp4"\n',
       '#EXTINF:5,\n',
       'main.mp4\n',
       '#EXT-X-MAP:URI="init2.mp4",BYTERANGE="616@0"\n',
@@ -2954,8 +2994,15 @@ describe('HlsParser', () => {
     // uri.
     const initSegments = Array.from(actualVideo.segmentIndex).map(
         (seg) => seg.initSegmentReference);
-    expect(initSegments[0].getUris()[0]).toBe('test:/init.mp4');
-    expect(initSegments[1].getUris()[0]).toBe('test:/init2.mp4');
+    expect(initSegments.length).toBe(2);
+    const firstInitSegment = initSegments[0];
+    expect(firstInitSegment.getUris()[0]).toBe('test:/init.mp4');
+    expect(firstInitSegment.startByte).toBe(0);
+    expect(firstInitSegment.endByte).toBe(615);
+    const secondInitSegment = initSegments[1];
+    expect(secondInitSegment.getUris()[0]).toBe('test:/init2.mp4');
+    expect(secondInitSegment.startByte).toBe(0);
+    expect(secondInitSegment.endByte).toBe(615);
   });
 
   it('parses variants encrypted with AES-128', async () => {
@@ -3696,6 +3743,34 @@ describe('HlsParser', () => {
       await verifyError(master, media, error, /* onCreateSegmentIndex= */ true);
     });
 
+    it('if SAMPLE-AES encryption with MSE and mp2t content', async () => {
+      const master = [
+        '#EXTM3U\n',
+        '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1",',
+        'RESOLUTION=960x540,FRAME-RATE=60\n',
+        'video\n',
+      ].join('');
+
+      const media = [
+        '#EXTM3U\n',
+        '#EXT-X-TARGETDURATION:6\n',
+        '#EXT-X-PLAYLIST-TYPE:VOD\n',
+        '#EXT-X-KEY:METHOD=SAMPLE-AES,',
+        'URI="fake",\n',
+        '#EXTINF:5,\n',
+        '#EXT-X-BYTERANGE:121090@616\n',
+        'main.ts',
+      ].join('');
+
+      const error = new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MANIFEST,
+          Code.HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED);
+
+      await verifyError(master, media, error, /* onCreateSegmentIndex= */ true);
+    });
+
+
     describe('if required tags are missing', () => {
       /**
        * @param {string} master

package/test/media/buffering_observer_unit.js

@@ -11,15 +11,28 @@ describe('BufferingObserver', () => {
   const thresholdAfterStarving = 5;
   const thresholdAfterSatisfied = 2;
 
+  const originalDateNow = Date.now;
+
+  /** @type {!Date} */
+  let baseTime;
+
   /** @type {!shaka.media.BufferingObserver} */
   let controller;
 
   beforeEach(() => {
+    // Any test using Date needs to have Date mocked to avoid flake.
+    baseTime = new Date(2015, 11, 30);
+    Date.now = () => baseTime.getTime();
+
     controller = new BufferingObserver(
         thresholdAfterStarving,
         thresholdAfterSatisfied);
   });
 
+  afterEach(() => {
+    Date.now = originalDateNow;
+  });
+
   describe('when satisfied', () => {
     beforeEach(() => {
       controller.setState(State.SATISFIED);

package/test/media/content_workarounds_unit.js

@@ -7,7 +7,7 @@
 describe('ContentWorkarounds', () => {
   const encryptionBoxes = {
     'encv': ['hev1', 'hvc1', 'avc1', 'avc3'],
-    'enca': ['ac-3', 'ec-3', 'mp4a'],
+    'enca': ['ac-3', 'ec-3', 'ac-4', 'mp4a'],
   };
   for (const encryptionBox of Object.keys(encryptionBoxes)) {
     for (const box of encryptionBoxes[encryptionBox]) {

package/test/media/drm_engine_unit.js

@@ -2100,7 +2100,7 @@ describe('DrmEngine', () => {
         videoRobustness: 'really_really_ridiculously_good',
         serverCertificate: serverCert,
         serverCertificateUri: '',
-        initData: ['blah'],
+        initData: [{keyId: 'a'}],
         keyIds: new Set(['deadbeefdeadbeefdeadbeefdeadbeef']),
       };
       const drmInfoAudio = {
@@ -2111,7 +2111,7 @@ describe('DrmEngine', () => {
         audioRobustness: 'good',
         serverCertificate: undefined,
         serverCertificateUri: '',
-        initData: ['init data'],
+        initData: [{keyId: 'b'}],
         keyIds: new Set(['eadbeefdeadbeefdeadbeefdeadbeefd']),
       };
       const drmInfoDesired = {
@@ -2123,7 +2123,7 @@ describe('DrmEngine', () => {
         videoRobustness: 'really_really_ridiculously_good',
         serverCertificate: serverCert,
         serverCertificateUri: '',
-        initData: ['blah', 'init data'],
+        initData: [{keyId: 'a'}, {keyId: 'b'}],
         keyIds: new Set([
           'deadbeefdeadbeefdeadbeefdeadbeef',
           'eadbeefdeadbeefdeadbeefdeadbeefd',
@@ -2177,6 +2177,33 @@ describe('DrmEngine', () => {
           [drmInfoAudio]);
       expect(returned).toEqual([drmInfoDesired]);
     });
+
+    it('does not match incompatible drmInfos', () => {
+      // Different key systems do not match.
+      const drmInfo1 = {
+        keySystem: 'drm.abc',
+        licenseServerUri: undefined,
+        distinctiveIdentifierRequired: false,
+        persistentStateRequired: false,
+        serverCertificate: undefined,
+        serverCertificateUri: '',
+        initData: [],
+        keyIds: new Set(),
+      };
+      const drmInfo2 = {
+        keySystem: 'drm.foobar',
+        licenseServerUri: undefined,
+        distinctiveIdentifierRequired: false,
+        persistentStateRequired: false,
+        serverCertificate: undefined,
+        serverCertificateUri: '',
+        initData: [],
+        keyIds: new Set(),
+      };
+      const returned1 = shaka.media.DrmEngine.getCommonDrmInfos(
+          [drmInfo1], [drmInfo2]);
+      expect(returned1).toEqual([]);
+    });
   }); // describe('getCommonDrmInfos')
 
   describe('configure', () => {

package/test/media/media_source_engine_unit.js

@@ -560,7 +560,7 @@ describe('MediaSourceEngine', () => {
       await mediaSourceEngine.appendBuffer(
           ContentType.TEXT, data, reference, /* hasClosedCaptions= */ false);
       expect(mockTextEngine.appendBuffer).toHaveBeenCalledWith(
-          data, 0, 10);
+          data, 0, 10, 'foo://bar');
     });
 
     it('appends transmuxed data and captions', async () => {

package/test/media/transmuxer_integration.js

@@ -102,8 +102,8 @@ describe('Transmuxer', () => {
     });
   });
 
-  it('getOrginalMimeType returns the correct mimeType', () => {
-    expect(transmuxer.getOrginalMimeType()).toBe(transmuxerMimeType);
+  it('getOriginalMimeType returns the correct mimeType', () => {
+    expect(transmuxer.getOriginalMimeType()).toBe(transmuxerMimeType);
   });
 
   describe('transmuxing', () => {

package/test/offline/storage_integration.js

@@ -1741,6 +1741,9 @@ filterDescribe('Storage', storageSupport, () => {
 
     /** @override */
     onExpirationUpdated(session, number) {}
+
+    /** @override */
+    onInitialVariantChosen(variant) {}
   };
 
   /**

package/test/player_integration.js

@@ -59,6 +59,46 @@ describe('Player', () => {
     document.body.removeChild(video);
   });
 
+  describe('seek range', () => {
+    // Regression test for Issue #3675.
+    it('has a reasonable seek range after going from live to VOD', async () => {
+      const netEngine = player.getNetworkingEngine();
+      const startTime = Date.now();
+      netEngine.registerRequestFilter((type, request) => {
+        if (type != shaka.net.NetworkingEngine.RequestType.MANIFEST) {
+          return;
+        }
+        // Simulate a live stream by providing different manifests over time.
+        const time = (Date.now() - startTime) / 1000;
+        const manifestNumber = Math.min(5, Math.floor(0.5 + time / 2));
+        request.uris = [
+          '/base/test/test/assets/3675/dash_' + manifestNumber + '.mpd',
+        ];
+        console.log('getting manifest', request.uris);
+      });
+
+      // Play the stream.
+      await player.load('/base/test/test/assets/3675/dash_0.mpd');
+      await video.play();
+
+      // Wait for the stream to be over.
+      eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
+      /** @type {shaka.test.Waiter} */
+      const waiter = new shaka.test.Waiter(eventManager)
+          .setPlayer(player)
+          .timeoutAfter(40)
+          .failOnTimeout(true);
+      await waiter.waitForEnd(video);
+
+      // The stream should have transitioned to VOD by now.
+      expect(player.isLive()).toBe(false);
+
+      // Check that the final seek range is as expected.
+      const seekRange = player.seekRange();
+      expect(seekRange.end).toBeCloseTo(14);
+    });
+  });
+
   describe('attach', () => {
     beforeEach(async () => {
       // To test attach, we want to construct a player without a video element
@@ -903,46 +943,6 @@ describe('Player', () => {
     });
   });
 
-  describe('seek range', () => {
-    // Regression test for Issue #3675.
-    it('has a reasonable seek range after going from live to VOD', async () => {
-      const netEngine = player.getNetworkingEngine();
-      const startTime = Date.now();
-      netEngine.registerRequestFilter((type, request) => {
-        if (type != shaka.net.NetworkingEngine.RequestType.MANIFEST) {
-          return;
-        }
-        // Simulate a live stream by providing different manifests over time.
-        const time = (Date.now() - startTime) / 1000;
-        const manifestNumber = Math.min(5, Math.floor(0.5 + time / 2));
-        request.uris = [
-          '/base/test/test/assets/3675/dash_' + manifestNumber + '.mpd',
-        ];
-        console.log('getting manifest', request.uris);
-      });
-
-      // Play the stream.
-      await player.load('/base/test/test/assets/3675/dash_0.mpd');
-      await video.play();
-
-      // Wait for the stream to be over.
-      eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
-      /** @type {shaka.test.Waiter} */
-      const waiter = new shaka.test.Waiter(eventManager)
-          .setPlayer(player)
-          .timeoutAfter(40)
-          .failOnTimeout(true);
-      await waiter.waitForEnd(video);
-
-      // The stream should have transitioned to VOD by now.
-      expect(player.isLive()).toBe(false);
-
-      // Check that the final seek range is as expected.
-      const seekRange = player.seekRange();
-      expect(seekRange.end).toBeCloseTo(14);
-    });
-  });
-
   describe('buffering', () => {
     const startBuffering = jasmine.objectContaining({buffering: true});
     const endBuffering = jasmine.objectContaining({buffering: false});
@@ -1197,13 +1197,21 @@ describe('Player', () => {
         'com.widevine.alpha': bogusUrl,
         'com.microsoft.playready': bogusUrl,
       });
-      await player.load('test:sintel-enc_compiled');
+
+      // This load may be interrupted, so ignore errors and don't wait.
+      const loadPromise =
+          player.load('test:sintel-enc_compiled').catch(() => {});
 
       await errorPromise;
       expect(unloadPromise).not.toBeNull();
+
       if (unloadPromise) {
         await unloadPromise;
       }
+
+      // This should be done, and errors ignored.  But don't leave any Promise
+      // unresolved.
+      await loadPromise;
     });
   });  // describe('unloading')
 

package/test/player_load_graph_integration.js

@@ -464,11 +464,11 @@ describe('Player Load Graph', () => {
 
       // Make the two requests one-after-another so that we don't have any idle
       // time between them.
-      const attachRequest = player.attach(video);
-      const loadRequest = player.load('test:sintel');
+      const attach = player.attach(video);
+      const load = player.load('test:sintel');
 
-      await attachRequest;
-      await expectAsync(loadRequest).toBeRejected();
+      await attach;
+      await expectAsync(load).toBeRejected();
 
       // Wait a couple interrupter cycles to allow the player to enter idle
       // state.
@@ -506,10 +506,12 @@ describe('Player Load Graph', () => {
       // Normally the player would initialize media source after attaching to
       // the media element, however since we don't support media source, it
       // should stop at the attach state.
-      player.attach(video, /* initMediaSource= */ true);
+      const attach = player.attach(video, /* initMediaSource= */ true);
 
       const event = await spyIsCalled(stateIdleSpy);
       expect(event.state).toBe('attach');
+
+      await attach;
     });
 
     it('loading ignores media source path', async () => {
@@ -518,10 +520,12 @@ describe('Player Load Graph', () => {
       // Normally the player would load content like this with the media source
       // path, but since we don't have media source support, it should use the
       // src= path.
-      player.load(SMALL_MP4_CONTENT_URI);
+      const load = player.load(SMALL_MP4_CONTENT_URI);
 
       const event = await spyIsCalled(stateIdleSpy);
       expect(event.state).toBe('src-equals');
+
+      await load;
     });
 
     it('unloading ignores init media source flag', async () => {
@@ -531,10 +535,12 @@ describe('Player Load Graph', () => {
       // Normally the player would try to go to the media source state because
       // we are saying to initialize media source after unloading, but since we
       // don't have media source, it should stop at the attach state.
-      player.unload(/* initMediaSource= */ true);
+      const unload = player.unload(/* initMediaSource= */ true);
 
       const event = await spyIsCalled(stateIdleSpy);
       expect(event.state).toBe('attach');
+
+      await unload;
     });
   });