shaka-player 4.3.9 → 4.4.0

package/test/hls/manifest_text_parser_unit.js

@@ -307,7 +307,7 @@ describe('ManifestTextParser', () => {
               new shaka.hls.Tag(/* id= */ 0, 'EXT-X-MEDIA-SEQUENCE', [], '1'),
             ],
             segments: [
-              new shaka.hls.Segment('https://test/test.mp4',
+              new shaka.hls.Segment('https://test/manifest.m3u8', 'https://test/test.mp4',
                   [
                     new shaka.hls.Tag(/* id= */ 2, 'EXTINF', [], '5.99467'),
                   ]),
@@ -332,7 +332,7 @@ describe('ManifestTextParser', () => {
               new shaka.hls.Tag(/* id= */ 0, 'EXT-X-MEDIA-SEQUENCE', [], '1'),
             ],
             segments: [
-              new shaka.hls.Segment('https://test/test.mp4', [
+              new shaka.hls.Segment('https://test/manifest.m3u8', 'https://test/test.mp4', [
                 new shaka.hls.Tag(
                     /* id= */ 2,
                     'EXTINF',
@@ -360,7 +360,7 @@ describe('ManifestTextParser', () => {
               new shaka.hls.Tag(/* id= */ 2, 'EXT-X-TARGETDURATION', [], '6'),
             ],
             segments: [
-              new shaka.hls.Segment('https://test/test.mp4',
+              new shaka.hls.Segment('https://test/manifest.m3u8', 'https://test/test.mp4',
                   [
                     new shaka.hls.Tag(/* id= */ 1, 'EXT-X-KEY',
                         [
@@ -393,7 +393,7 @@ describe('ManifestTextParser', () => {
               new shaka.hls.Tag(/* id= */ 0, 'EXT-X-MEDIA-SEQUENCE', [], '1'),
             ],
             segments: [
-              new shaka.hls.Segment('https://test/test.mp4',
+              new shaka.hls.Segment('https://test/manifest.m3u8', 'test.mp4',
                   [
                     new shaka.hls.Tag(/* id= */ 2, 'EXTINF', [], '5.99467'),
                   ]),
@@ -427,9 +427,9 @@ describe('ManifestTextParser', () => {
               new shaka.hls.Tag(/* id= */ 0, 'EXT-X-TARGETDURATION', [], '6'),
             ],
             segments: [
-              new shaka.hls.Segment('https://test/uri',
+              new shaka.hls.Segment('https://test/manifest.m3u8', 'uri',
                   [new shaka.hls.Tag(2, 'EXTINF', [], '5')]),
-              new shaka.hls.Segment('https://test/uri2',
+              new shaka.hls.Segment('https://test/manifest.m3u8', 'uri2',
                   [new shaka.hls.Tag(3, 'EXTINF', [], '4')]),
             ],
           },
@@ -449,9 +449,9 @@ describe('ManifestTextParser', () => {
               new shaka.hls.Tag(/* id= */ 4, 'EXT-X-ENDLIST', []),
             ],
             segments: [
-              new shaka.hls.Segment('https://test/uri',
+              new shaka.hls.Segment('https://test/manifest.m3u8', 'uri',
                   [new shaka.hls.Tag(2, 'EXTINF', [], '5')]),
-              new shaka.hls.Segment('https://test/uri2',
+              new shaka.hls.Segment('https://test/manifest.m3u8', 'uri2',
                   [new shaka.hls.Tag(3, 'EXTINF', [], '4')]),
             ],
           },
@@ -508,20 +508,23 @@ describe('ManifestTextParser', () => {
             ],
             segments: [
               new shaka.hls.Segment(
-                  /* absoluteUri= */ 'https://test/uri',
+                  /* absoluteMediaPlaylistUri= */ 'https://test/manifest.m3u8',
+                  /* verbatimSegmentUri= */ 'uri',
                   /* tags= */ [
                     new shaka.hls.Tag(3, 'EXTINF', [], '5'),
                     mapTag,
                   ]),
               new shaka.hls.Segment(
-                  /* absoluteUri= */ 'https://test/uri2',
+                  /* absoluteMediaPlaylistUri= */ 'https://test/manifest.m3u8',
+                  /* verbatimSegmentUri= */ 'uri2',
                   /* tags= */ [
                     new shaka.hls.Tag(6, 'EXTINF', [], '2'),
                     mapTag,
                   ],
                   /* partialSegments= */ partialSegments1),
               new shaka.hls.Segment(
-                  /* absoluteUri= */ '',
+                  /* absoluteMediaPlaylistUri= */ '',
+                  /* verbatimSegmentUri= */ '',
                   /* tags= */ [mapTag],
                   /* partialSegments= */ partialSegments2),
             ],
@@ -574,13 +577,15 @@ describe('ManifestTextParser', () => {
             ],
             segments: [
               new shaka.hls.Segment(
-                  /* absoluteUri= */ 'https://test/uri',
+                  /* absoluteMediaPlaylistUri= */ 'https://test/manifest.m3u8',
+                  /* verbatimSegmentUri= */ 'uri',
                   /* tags= */ [
                     new shaka.hls.Tag(3, 'EXTINF', [], '5'),
                     mapTag,
                   ]),
               new shaka.hls.Segment(
-                  /* absoluteUri= */ '',
+                  /* absoluteMediaPlaylistUri= */ '',
+                  /* verbatimSegmentUri= */ '',
                   /* tags= */ [preloadMapTag],
                   /* partialSegments= */ preloadSegment),
             ],

package/test/media/adaptation_set_criteria_unit.js

@@ -19,7 +19,7 @@ describe('AdaptationSetCriteria', () => {
         });
       });
 
-      const builder = new shaka.media.PreferenceBasedCriteria('en', '', 0);
+      const builder = new shaka.media.PreferenceBasedCriteria('en', '', 0, '');
       const set = builder.create(manifest.variants);
 
       checkSet(set, [
@@ -40,7 +40,7 @@ describe('AdaptationSetCriteria', () => {
         });
       });
 
-      const builder = new shaka.media.PreferenceBasedCriteria('en', '', 0);
+      const builder = new shaka.media.PreferenceBasedCriteria('en', '', 0, '');
       const set = builder.create(manifest.variants);
 
       checkSet(set, [
@@ -71,7 +71,8 @@ describe('AdaptationSetCriteria', () => {
         });
       });
 
-      const builder = new shaka.media.PreferenceBasedCriteria('en', 'main', 0);
+      const builder = new shaka.media.PreferenceBasedCriteria(
+          'en', 'main', 0, '');
       const set = builder.create(manifest.variants);
 
       checkSet(set, [
@@ -120,7 +121,7 @@ describe('AdaptationSetCriteria', () => {
         });
       });
 
-      const builder = new shaka.media.PreferenceBasedCriteria('en', '', 0);
+      const builder = new shaka.media.PreferenceBasedCriteria('en', '', 0, '');
       const set = builder.create(manifest.variants);
 
       // Which role is chosen is an implementation detail.
@@ -178,7 +179,7 @@ describe('AdaptationSetCriteria', () => {
         });
       });
 
-      const builder = new shaka.media.PreferenceBasedCriteria('zh', '', 0);
+      const builder = new shaka.media.PreferenceBasedCriteria('zh', '', 0, '');
       const set = builder.create(manifest.variants);
 
       // Which role is chosen is an implementation detail.
@@ -214,7 +215,7 @@ describe('AdaptationSetCriteria', () => {
         });
       });
 
-      const builder = new shaka.media.PreferenceBasedCriteria('zh', '', 0);
+      const builder = new shaka.media.PreferenceBasedCriteria('zh', '', 0, '');
       const set = builder.create(manifest.variants);
 
       // Which language is chosen is an implementation detail.
@@ -270,7 +271,8 @@ describe('AdaptationSetCriteria', () => {
             });
           });
 
-          const builder = new shaka.media.PreferenceBasedCriteria('zh', '', 0);
+          const builder = new shaka.media.PreferenceBasedCriteria(
+              'zh', '', 0, '');
           const set = builder.create(manifest.variants);
 
           // Which role is chosen is an implementation detail. Each role is
@@ -327,7 +329,8 @@ describe('AdaptationSetCriteria', () => {
             });
           });
 
-          const builder = new shaka.media.PreferenceBasedCriteria('zh', '', 0);
+          const builder = new shaka.media.PreferenceBasedCriteria(
+              'zh', '', 0, '');
           const set = builder.create(manifest.variants);
 
           checkSet(set, [
@@ -336,6 +339,34 @@ describe('AdaptationSetCriteria', () => {
           ]);
         });
 
+    it('chooses variants with preferred hdr level', () => {
+      const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        manifest.addVariant(1, (variant) => {
+          variant.addVideo(10, (stream) => {
+            stream.hdr = 'PQ';
+          });
+        });
+        manifest.addVariant(2, (variant) => {
+          variant.addVideo(20, (stream) => {
+            stream.hdr = 'SDR';
+          });
+        });
+        manifest.addVariant(3, (variant) => {
+          variant.addVideo(30, (stream) => {
+            stream.hdr = 'PQ';
+          });
+        });
+      });
+
+      const builder = new shaka.media.PreferenceBasedCriteria('', '', 0, 'PQ');
+      const set = builder.create(manifest.variants);
+
+      checkSet(set, [
+        manifest.variants[0],
+        manifest.variants[2],
+      ]);
+    });
+
     it('chooses variants with preferred audio channels count', () => {
       const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addVariant(1, (variant) => {
@@ -355,7 +386,7 @@ describe('AdaptationSetCriteria', () => {
         });
       });
 
-      const builder = new shaka.media.PreferenceBasedCriteria('', '', 2);
+      const builder = new shaka.media.PreferenceBasedCriteria('', '', 2, '');
       const set = builder.create(manifest.variants);
 
       checkSet(set, [
@@ -384,7 +415,8 @@ describe('AdaptationSetCriteria', () => {
         });
       });
 
-      const builder = new shaka.media.PreferenceBasedCriteria('', '', 6);
+      const builder =
+          new shaka.media.PreferenceBasedCriteria('', '', 6, '');
       const set = builder.create(manifest.variants);
 
       checkSet(set, [
@@ -413,7 +445,7 @@ describe('AdaptationSetCriteria', () => {
         });
       });
 
-      const builder = new shaka.media.PreferenceBasedCriteria('', '', 2);
+      const builder = new shaka.media.PreferenceBasedCriteria('', '', 2, '');
       const set = builder.create(manifest.variants);
 
       checkSet(set, [
@@ -441,8 +473,8 @@ describe('AdaptationSetCriteria', () => {
         });
       });
 
-      const builder =
-          new shaka.media.PreferenceBasedCriteria('', '', 0, 'preferredLabel');
+      const builder = new shaka.media.PreferenceBasedCriteria(
+          '', '', 0, '', 'preferredLabel');
       const set = builder.create(manifest.variants);
 
       checkSet(set, [
@@ -484,7 +516,7 @@ describe('AdaptationSetCriteria', () => {
       });
 
       const builder = new shaka.media.PreferenceBasedCriteria(
-          'zh', '', 0, 'preferredLabel');
+          'zh', '', 0, '', 'preferredLabel');
       const set = builder.create(manifest.variants);
 
       checkSet(set, [

package/test/media/adaptation_set_unit.js

@@ -211,6 +211,7 @@ describe('AdaptationSet', () => {
       keyIds: new Set(),
       label: null,
       language: '',
+      originalLanguage: null,
       mimeType: mimeType,
       originalId: String(id),
       primary: false,
@@ -218,6 +219,7 @@ describe('AdaptationSet', () => {
       forced: false,
       trickModeVideo: null,
       type: '',
+      accessibilityPurpose: null,
       external: false,
     };
   }

package/test/media/drm_engine_integration.js

@@ -49,6 +49,9 @@ describe('DrmEngine', () => {
   /** @type {!ArrayBuffer} */
   let audioSegment;
 
+  /** @type {shaka.extern.Stream} */
+  const fakeStream = shaka.test.StreamingEngineUtil.createMockVideoStream(1);
+
   beforeAll(async () => {
     video = shaka.test.UiUtils.createVideoElement();
     document.body.appendChild(video);
@@ -198,10 +201,10 @@ describe('DrmEngine', () => {
       await drmEngine.initForPlayback(variants, manifest.offlineSessionIds);
       await drmEngine.attach(video);
       await mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, videoInitSegment, null,
+          ContentType.VIDEO, videoInitSegment, null, fakeStream,
           /* hasClosedCaptions= */ false);
       await mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, audioInitSegment, null,
+          ContentType.AUDIO, audioInitSegment, null, fakeStream,
           /* hasClosedCaptions= */ false);
       await encryptedEventSeen;
       // With PlayReady, a persistent license policy can cause a different
@@ -237,10 +240,10 @@ describe('DrmEngine', () => {
       const reference = dummyReference(0, 10);
 
       await mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, videoSegment, reference,
+          ContentType.VIDEO, videoSegment, reference, fakeStream,
           /* hasClosedCaptions= */ false);
       await mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, audioSegment, reference,
+          ContentType.AUDIO, audioSegment, reference, fakeStream,
           /* hasClosedCaptions= */ false);
 
       expect(video.buffered.end(0)).toBeGreaterThan(0);
@@ -296,10 +299,10 @@ describe('DrmEngine', () => {
       await drmEngine.initForPlayback(variants, manifest.offlineSessionIds);
       await drmEngine.attach(video);
       await mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, videoInitSegment, null,
+          ContentType.VIDEO, videoInitSegment, null, fakeStream,
           /* hasClosedCaptions= */ false);
       await mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, audioInitSegment, null,
+          ContentType.AUDIO, audioInitSegment, null, fakeStream,
           /* hasClosedCaptions= */ false);
       await encryptedEventSeen;
 
@@ -320,10 +323,10 @@ describe('DrmEngine', () => {
       const reference = dummyReference(0, 10);
 
       await mediaSourceEngine.appendBuffer(
-          ContentType.VIDEO, videoSegment, reference,
+          ContentType.VIDEO, videoSegment, reference, fakeStream,
           /* hasClosedCaptions= */ false);
       await mediaSourceEngine.appendBuffer(
-          ContentType.AUDIO, audioSegment, reference,
+          ContentType.AUDIO, audioSegment, reference, fakeStream,
           /* hasClosedCaptions= */ false);
 
       expect(video.buffered.end(0)).toBeGreaterThan(0);

package/test/media/drm_engine_unit.js

@@ -214,7 +214,9 @@ describe('DrmEngine', () => {
       const variants = manifest.variants;
       await drmEngine.initForPlayback(variants, manifest.offlineSessionIds);
 
-      expect(variants[0].decodingInfos.length).toBe(2);
+      // should be only one variant, as preferredKeySystems is propagated
+      // to getDecodingInfos
+      expect(variants[0].decodingInfos.length).toBe(1);
       expect(shaka.media.DrmEngine.keySystem(drmEngine.getDrmInfo()))
           .toBe('drm.def');
     });
@@ -713,15 +715,27 @@ describe('DrmEngine', () => {
     });
 
     it('maps TS MIME types through the transmuxer', async () => {
-      const originalIsSupported = shaka.media.Transmuxer.isSupported;
+      const originalIsSupported =
+          shaka.transmuxer.TransmuxerEngine.isSupported;
+      const originalConvertCodecs =
+          shaka.transmuxer.TransmuxerEngine.convertCodecs;
 
       try {
         // Mock out isSupported on Transmuxer so that we don't have to care
         // about what MediaSource supports under that.  All we really care about
         // is the translation of MIME types.
-        shaka.media.Transmuxer.isSupported = (mimeType, contentType) => {
-          return mimeType.startsWith('video/mp2t');
-        };
+        shaka.transmuxer.TransmuxerEngine.isSupported =
+            (mimeType, contentType) => {
+              return mimeType.startsWith('video/mp2t');
+            };
+        shaka.transmuxer.TransmuxerEngine.convertCodecs =
+            (contentType, mimeType) => {
+              let newMimeType = mimeType.replace('mp2t', 'mp4');
+              if (contentType == 'audio') {
+                newMimeType = newMimeType.replace('video', 'audio');
+              }
+              return newMimeType;
+            };
 
         // The default mock for this is so unrealistic, some of our test
         // conditions would always fail.  Make it realistic enough for this
@@ -758,7 +772,9 @@ describe('DrmEngine', () => {
         expect(drmEngine.supportsVariant(variants[0])).toBeTruthy();
       } finally {
         // Restore the mock.
-        shaka.media.Transmuxer.isSupported = originalIsSupported;
+        shaka.transmuxer.TransmuxerEngine.isSupported = originalIsSupported;
+        shaka.transmuxer.TransmuxerEngine.convertCodecs =
+            originalConvertCodecs;
       }
     });
   });  // describe('init')
@@ -1093,6 +1109,178 @@ describe('DrmEngine', () => {
           shaka.util.Error.Code.FAILED_TO_GENERATE_LICENSE_REQUEST,
           message, nativeError, undefined));
     });
+
+    it('should throw a OFFLINE_SESSION_REMOVED error', async () => {
+      // Given persistent session is not available
+      session1.load.and.returnValue(false);
+
+      onErrorSpy.and.stub();
+
+      await drmEngine.initForPlayback(
+          manifest.variants, ['persistent-session-id']);
+      await drmEngine.attach(mockVideo);
+
+      expect(drmEngine.initialized()).toBe(true);
+
+      await Util.shortDelay();
+
+      expect(mockMediaKeys.createSession).toHaveBeenCalledTimes(1);
+      expect(mockMediaKeys.createSession)
+          .toHaveBeenCalledWith('persistent-license');
+      expect(session1.load).toHaveBeenCalledWith('persistent-session-id');
+
+      expect(onErrorSpy).toHaveBeenCalled();
+      const error = onErrorSpy.calls.argsFor(0)[0];
+      shaka.test.Util.expectToEqualError(error, new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.DRM,
+          shaka.util.Error.Code.OFFLINE_SESSION_REMOVED));
+    });
+
+    it('uses persistent session ids when available', async () => {
+      const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
+
+      const keyId1 = makeKeyId(1);
+      const keyId2 = makeKeyId(2);
+
+      /** @type {!Uint8Array} */
+      const initData1 = new Uint8Array(5);
+
+      // Key IDs in manifest
+      tweakDrmInfos((drmInfos) => {
+        drmInfos[0].keyIds = new Set([
+          Uint8ArrayUtils.toHex(keyId1), Uint8ArrayUtils.toHex(keyId2),
+        ]);
+        drmInfos[0].initData = [
+          {initData: initData1, initDataType: 'cenc', keyId: null},
+        ];
+      });
+
+      // Given persistent session is available
+      session1.load.and.returnValue(true);
+
+      config.persistentSessionOnlinePlayback = true;
+      config.persistentSessionsMetadata = [{
+        sessionId: 'persistent-session-id',
+        initData: initData1,
+        initDataType: 'cenc'}];
+
+      drmEngine.configure(config);
+
+      await initAndAttach();
+
+      await Util.shortDelay();
+
+      session1.keyStatuses.forEach.and.callFake((callback) => {
+        callback(keyId1, 'usable');
+        callback(keyId2, 'usable');
+      });
+
+      session1.on['keystatuseschange']({target: session1});
+
+      expect(mockMediaKeys.createSession).toHaveBeenCalledTimes(1);
+      expect(mockMediaKeys.createSession)
+          .toHaveBeenCalledWith('persistent-license');
+      expect(session1.load).toHaveBeenCalledWith('persistent-session-id');
+
+      expect(session2.generateRequest).not.toHaveBeenCalled();
+    });
+
+    it(
+        'tries persistent session ids before requesting a license',
+        async () => {
+          const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
+
+          const keyId1 = makeKeyId(1);
+
+          /** @type {!Uint8Array} */
+          const initData1 = new Uint8Array(5);
+
+          // Key IDs in manifest
+          tweakDrmInfos((drmInfos) => {
+            drmInfos[0].keyIds = new Set([
+              Uint8ArrayUtils.toHex(keyId1),
+            ]);
+            drmInfos[0].sessionType = 'temporary';
+            drmInfos[0].initData = [
+              {initData: initData1, initDataType: 'cenc', keyId: null},
+            ];
+          });
+
+          // Given persistent sessions aren't available
+          session1.load.and.returnValue(Promise.resolve(false));
+          session2.load.and.returnValue(
+              Promise.reject(new Error('This should be a recoverable error')));
+
+          manifest.offlineSessionIds = ['persistent-session-id-1'];
+
+          config.persistentSessionsMetadata = [{
+            sessionId: 'persistent-session-id-2',
+            initData: initData1,
+            initDataType: 'cenc'}];
+          config.persistentSessionOnlinePlayback = true;
+
+          drmEngine.configure(config);
+
+          onErrorSpy.and.stub();
+
+          await initAndAttach();
+
+          await Util.shortDelay();
+
+          shaka.test.Util.expectToEqualError(
+              onErrorSpy.calls.argsFor(0)[0],
+              new shaka.util.Error(
+                  shaka.util.Error.Severity.RECOVERABLE,
+                  shaka.util.Error.Category.DRM,
+                  shaka.util.Error.Code.OFFLINE_SESSION_REMOVED));
+
+          shaka.test.Util.expectToEqualError(
+              onErrorSpy.calls.argsFor(1)[0],
+              new shaka.util.Error(
+                  shaka.util.Error.Severity.RECOVERABLE,
+                  shaka.util.Error.Category.DRM,
+                  shaka.util.Error.Code.FAILED_TO_CREATE_SESSION,
+                  'This should be a recoverable error'));
+
+          // We need to go through the whole license request / update,
+          // otherwise the DrmEngine will be destroyed while waiting for
+          // sessions to be marked as loaded, throwing an unhandled exception
+          const operation = shaka.util.AbortableOperation.completed(
+              new Uint8Array(0));
+          fakeNetEngine.request.and.returnValue(operation);
+
+          await Util.shortDelay();
+
+          session3.on['message']({
+            target: session3,
+            message: new Uint8Array(0),
+            messageType: 'license-request'});
+
+          session3.keyStatuses.forEach.and.callFake((callback) => {
+            callback(keyId1, 'usable');
+          });
+
+          session3.on['keystatuseschange']({target: session3});
+
+          await Util.shortDelay();
+
+          expect(mockMediaKeys.createSession).toHaveBeenCalledTimes(3);
+          expect(mockMediaKeys.createSession)
+              .toHaveBeenCalledWith('persistent-license');
+          expect(session1.load)
+              .toHaveBeenCalledWith('persistent-session-id-1');
+
+          expect(mockMediaKeys.createSession)
+              .toHaveBeenCalledWith('persistent-license');
+          expect(session2.load)
+              .toHaveBeenCalledWith('persistent-session-id-2');
+
+          expect(mockMediaKeys.createSession)
+              .toHaveBeenCalledWith('temporary');
+          expect(session3.generateRequest)
+              .toHaveBeenCalledWith('cenc', initData1);
+        });
   });  // describe('attach')
 
   describe('events', () => {
@@ -1512,7 +1700,7 @@ describe('DrmEngine', () => {
 
       // Not mocked.  Run data through real data URI parser to ensure that it is
       // correctly formatted.
-      fakeNetEngine.request.and.callFake((type, request) => {
+      fakeNetEngine.request.and.callFake((type, request, context) => {
         const requestType = shaka.net.NetworkingEngine.RequestType.LICENSE;
 
         // A dummy progress callback.
@@ -1630,6 +1818,31 @@ describe('DrmEngine', () => {
       expect(session2.remove).toHaveBeenCalled();
     });
 
+    it(
+        // eslint-disable-next-line max-len
+        'tears down & does not remove active persistent sessions based on configuration flag',
+        async () => {
+          config.advanced['drm.abc'] = createAdvancedConfig(null);
+          config.advanced['drm.abc'].sessionType = 'persistent-license';
+          config.persistentSessionOnlinePlayback = true;
+
+          drmEngine.configure(config);
+
+          await initAndAttach();
+          await sendEncryptedEvent('cenc', new Uint8Array(2));
+
+          const message = new Uint8Array(0);
+          session1.on['message']({target: session1, message: message});
+          session1.update.and.returnValue(Promise.resolve());
+
+          await shaka.test.Util.shortDelay();
+          mockVideo.setMediaKeys.calls.reset();
+          await drmEngine.destroy();
+
+          expect(session1.close).toHaveBeenCalled();
+          expect(session1.remove).not.toHaveBeenCalled();
+        });
+
     it('swallows errors when closing sessions', async () => {
       await initAndAttach();
       await sendEncryptedEvent('webm');