shaka-player 3.3.4 → 4.0.0

package/test/media/drm_engine_unit.js

@@ -756,11 +756,6 @@ describe('DrmEngine', () => {
       expect(mockVideo.setMediaKeys).not.toHaveBeenCalled();
     });
 
-    it('sets MediaKeys for encrypted content', async () => {
-      await initAndAttach();
-      expect(mockVideo.setMediaKeys).toHaveBeenCalledWith(mockMediaKeys);
-    });
-
     it('sets server certificate if present in config', async () => {
       const cert = new Uint8Array(1);
       config.advanced['drm.abc'] = createAdvancedConfig(cert);
@@ -857,7 +852,7 @@ describe('DrmEngine', () => {
       /** @type {!Uint8Array} */
       const initData1 = new Uint8Array(5);
       /** @type {!Uint8Array} */
-      const initData2 = new Uint8Array(0);
+      const initData2 = new Uint8Array(1);
       /** @type {!Uint8Array} */
       const initData3 = new Uint8Array(10);
 
@@ -999,12 +994,23 @@ describe('DrmEngine', () => {
       mockVideo.setMediaKeys.and.returnValue(Promise.reject(
           new Error('whoops!')));
 
-      const expected = Util.jasmineError(new shaka.util.Error(
+      tweakDrmInfos((drmInfos) => {
+        drmInfos[0].initData = [
+          {initData: new Uint8Array(1), initDataType: 'cenc', keyId: null},
+        ];
+      });
+
+      onErrorSpy.and.stub();
+
+      await initAndAttach();
+
+      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.FAILED_TO_ATTACH_TO_VIDEO,
           'whoops!'));
-      await expectAsync(initAndAttach()).toBeRejectedWith(expected);
     });
 
     it('fails with an error if setServerCertificate fails', async () => {
@@ -1067,10 +1073,8 @@ describe('DrmEngine', () => {
         const initData1 = new Uint8Array(1);
         const initData2 = new Uint8Array(2);
 
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData1, keyId: null});
-        mockVideo.on['encrypted'](
-            {initDataType: 'cenc', initData: initData2, keyId: null});
+        await sendEncryptedEvent('webm', initData1);
+        await sendEncryptedEvent('cenc', initData2);
 
         expect(mockMediaKeys.createSession).toHaveBeenCalledTimes(2);
         expect(session1.generateRequest)
@@ -1081,32 +1085,23 @@ describe('DrmEngine', () => {
 
       it('suppresses duplicate initDatas', async () => {
         await initAndAttach();
+
         const initData1 = new Uint8Array(1);
-        const initData2 = new Uint8Array(1);  // identical to initData1
 
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData1, keyId: null});
-        mockVideo.on['encrypted'](
-            {initDataType: 'cenc', initData: initData2, keyId: null});
+        await sendEncryptedEvent('webm', initData1);
+        await sendEncryptedEvent('cenc'); // identical to webm initData
 
         expect(mockMediaKeys.createSession).toHaveBeenCalledTimes(1);
         expect(session1.generateRequest)
             .toHaveBeenCalledWith('webm', initData1);
       });
 
-      it('is ignored when init data is in DrmInfo', async () => {
-        // Set up an init data override in the manifest:
-        tweakDrmInfos((drmInfos) => {
-          drmInfos[0].initData = [
-            {initData: new Uint8Array(0), initDataType: 'cenc', keyId: null},
-          ];
-        });
-
+      it('set media keys when not already done at startup', async () => {
         await initAndAttach();
-        // We already created a session for the init data override.
+        await sendEncryptedEvent();
+
+        expect(mockVideo.setMediaKeys).toHaveBeenCalledTimes(1);
         expect(mockMediaKeys.createSession).toHaveBeenCalledTimes(1);
-        // We aren't even listening for 'encrypted' events.
-        expect(mockVideo.on['encrypted']).toBe(undefined);
       });
 
       it('dispatches an error if createSession fails', async () => {
@@ -1114,9 +1109,7 @@ describe('DrmEngine', () => {
         onErrorSpy.and.stub();
 
         await initAndAttach();
-        const initData1 = new Uint8Array(1);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData1, keyId: null});
+        await sendEncryptedEvent();
 
         expect(onErrorSpy).toHaveBeenCalled();
         const error = onErrorSpy.calls.argsFor(0)[0];
@@ -1136,9 +1129,7 @@ describe('DrmEngine', () => {
         onErrorSpy.and.stub();
 
         await initAndAttach();
-        const initData1 = new Uint8Array(1);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData1, keyId: null});
+        await sendEncryptedEvent();
 
         expect(onErrorSpy).toHaveBeenCalled();
         const error = onErrorSpy.calls.argsFor(0)[0];
@@ -1152,9 +1143,7 @@ describe('DrmEngine', () => {
     describe('message', () => {
       it('is listened for', async () => {
         await initAndAttach();
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         expect(session1.addEventListener).toHaveBeenCalledWith(
             'message', jasmine.any(Function), jasmine.anything());
@@ -1194,9 +1183,7 @@ describe('DrmEngine', () => {
         onErrorSpy.and.stub();
 
         await initAndAttach();
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         // Simulate a permission error from the web server.
         const netError = new shaka.util.Error(
@@ -1232,9 +1219,7 @@ describe('DrmEngine', () => {
       async function sendMessageTest(
           expectedUrl, messageType = 'license-request') {
         await initAndAttach();
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         const operation = shaka.util.AbortableOperation.completed({});
         fakeNetEngine.request.and.returnValue(operation);
@@ -1256,9 +1241,7 @@ describe('DrmEngine', () => {
     describe('keystatuseschange', () => {
       it('is listened for', async () => {
         await initAndAttach();
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         expect(session1.addEventListener).toHaveBeenCalledWith(
             'keystatuseschange', jasmine.any(Function), jasmine.anything());
@@ -1266,9 +1249,7 @@ describe('DrmEngine', () => {
 
       it('triggers callback', async () => {
         await initAndAttach();
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         const keyId1 = makeKeyId(1);
         const keyId2 = makeKeyId(2);
@@ -1294,10 +1275,7 @@ describe('DrmEngine', () => {
       // See https://github.com/shaka-project/shaka-player/issues/1541
       it('does not update public key statuses before callback', async () => {
         await initAndAttach();
-
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         const keyId1 = makeKeyId(1);
         const keyId2 = makeKeyId(2);
@@ -1374,9 +1352,7 @@ describe('DrmEngine', () => {
         await initAndAttach();
         expect(onErrorSpy).not.toHaveBeenCalled();
 
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         const keyId1 = makeKeyId(1);
         const keyId2 = makeKeyId(2);
@@ -1423,9 +1399,7 @@ describe('DrmEngine', () => {
         await initAndAttach();
         expect(onErrorSpy).not.toHaveBeenCalled();
 
-        const initData = new Uint8Array(0);
-        mockVideo.on['encrypted'](
-            {initDataType: 'webm', initData: initData, keyId: null});
+        await sendEncryptedEvent();
 
         const keyId1 = makeKeyId(1);
         const keyId2 = makeKeyId(2);
@@ -1469,9 +1443,7 @@ describe('DrmEngine', () => {
       const license = new Uint8Array(0);
 
       await initAndAttach();
-      const initData = new Uint8Array(0);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData, keyId: null});
+      await sendEncryptedEvent();
 
       fakeNetEngine.setResponseValue('http://abc.drm/license', license);
       const message = new Uint8Array(0);
@@ -1530,9 +1502,8 @@ describe('DrmEngine', () => {
 
     it('publishes an event if update succeeds', async () => {
       await initAndAttach();
-      const initData = new Uint8Array(1);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData, keyId: null});
+      await sendEncryptedEvent();
+
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
       session1.update.and.returnValue(Promise.resolve());
@@ -1548,9 +1519,7 @@ describe('DrmEngine', () => {
       const license = new Uint8Array(0);
 
       await initAndAttach();
-      const initData = new Uint8Array(0);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData, keyId: null});
+      await sendEncryptedEvent();
 
       fakeNetEngine.setResponseValue('http://abc.drm/license', license);
       const message = new Uint8Array(0);
@@ -1571,12 +1540,9 @@ describe('DrmEngine', () => {
   describe('destroy', () => {
     it('tears down MediaKeys and active sessions', async () => {
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      const initData2 = new Uint8Array(2);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData2, keyId: null});
+
+      await sendEncryptedEvent('webm');
+      await sendEncryptedEvent('cenc', new Uint8Array(2));
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1601,12 +1567,8 @@ describe('DrmEngine', () => {
       drmEngine.configure(config);
 
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      const initData2 = new Uint8Array(2);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData2, keyId: null});
+      await sendEncryptedEvent('webm');
+      await sendEncryptedEvent('cenc', new Uint8Array(2));
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1627,12 +1589,8 @@ describe('DrmEngine', () => {
 
     it('swallows errors when closing sessions', async () => {
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      const initData2 = new Uint8Array(2);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData2, keyId: null});
+      await sendEncryptedEvent('webm');
+      await sendEncryptedEvent('cenc', new Uint8Array(2));
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1648,12 +1606,8 @@ describe('DrmEngine', () => {
 
     it('swallows errors when clearing MediaKeys', async () => {
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      const initData2 = new Uint8Array(2);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData2, keyId: null});
+      await sendEncryptedEvent('webm');
+      await sendEncryptedEvent('cenc', new Uint8Array(2));
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1732,6 +1686,14 @@ describe('DrmEngine', () => {
       const p1 = new shaka.util.PublicPromise();
       mockVideo.setMediaKeys.and.returnValue(p1);
 
+      onErrorSpy.and.stub();
+
+      tweakDrmInfos((drmInfos) => {
+        drmInfos[0].initData = [
+          {initData: new Uint8Array(1), initDataType: 'cenc', keyId: null},
+        ];
+      });
+
       const init = expectAsync(initAndAttach()).toBeRejected();
 
       await shaka.test.Util.shortDelay();
@@ -1745,10 +1707,12 @@ describe('DrmEngine', () => {
       const destroy = drmEngine.destroy();
       const fail = async () => {
         await shaka.test.Util.shortDelay();
-        p1.reject(new Error(''));
+        shaka.log.warning('fail');
+        p1.reject(new Error('titi'));
       };
       const success = async () => {
         await shaka.test.Util.shortDelay();
+        shaka.log.warning('success');
         p2.resolve();
       };
       await Promise.all([init, destroy, fail(), success()]);
@@ -1760,6 +1724,12 @@ describe('DrmEngine', () => {
       const p1 = new shaka.util.PublicPromise();
       mockVideo.setMediaKeys.and.returnValue(p1);
 
+      tweakDrmInfos((drmInfos) => {
+        drmInfos[0].initData = [
+          {initData: new Uint8Array(1), initDataType: 'cenc', keyId: null},
+        ];
+      });
+
       const init = expectAsync(initAndAttach()).toBeRejected();
 
       await shaka.test.Util.shortDelay();
@@ -1837,9 +1807,7 @@ describe('DrmEngine', () => {
       session1.generateRequest.and.returnValue(p);
 
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
+      await sendEncryptedEvent();
 
       // We are now blocked on generateRequest:
       expect(session1.generateRequest).toHaveBeenCalledTimes(1);
@@ -1858,9 +1826,7 @@ describe('DrmEngine', () => {
       fakeNetEngine.request.and.returnValue(operation);
 
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
+      await sendEncryptedEvent();
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1889,9 +1855,7 @@ describe('DrmEngine', () => {
       fakeNetEngine.request.and.returnValue(operation);
 
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
+      await sendEncryptedEvent();
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1919,9 +1883,7 @@ describe('DrmEngine', () => {
       session1.update.and.returnValue(p);
 
       await initAndAttach();
-      const initData1 = new Uint8Array(1);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
+      await sendEncryptedEvent();
 
       const message = new Uint8Array(0);
       session1.on['message']({target: session1, message: message});
@@ -1955,12 +1917,8 @@ describe('DrmEngine', () => {
       session1.close.and.returnValue(rejected);
       session2.close.and.returnValue(rejected);
 
-      const initData1 = new Uint8Array(1);
-      const initData2 = new Uint8Array(2);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData1, keyId: null});
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData2, keyId: null});
+      await sendEncryptedEvent('webm');
+      await sendEncryptedEvent('cenc', new Uint8Array(2));
 
       // Still resolve these since we are mocking close and closed.  This
       // ensures DrmEngine is in the correct state.
@@ -2185,9 +2143,7 @@ describe('DrmEngine', () => {
       mockVideo.paused = true;
 
       await initAndAttach();
-      const initData = new Uint8Array(0);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData, keyId: null});
+      await sendEncryptedEvent();
 
       const operation = shaka.util.AbortableOperation.completed({});
       fakeNetEngine.request.and.returnValue(operation);
@@ -2213,9 +2169,7 @@ describe('DrmEngine', () => {
       mockVideo.paused = true;
 
       await initAndAttach();
-      const initData = new Uint8Array(0);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData, keyId: null});
+      await sendEncryptedEvent();
 
       const operation = shaka.util.AbortableOperation.completed({});
       fakeNetEngine.request.and.returnValue(operation);
@@ -2330,10 +2284,9 @@ describe('DrmEngine', () => {
       session1.expiration = NaN;
 
       await initAndAttach();
-      const initData = new Uint8Array(0);
+      await sendEncryptedEvent();
+
       const message = new Uint8Array(0);
-      mockVideo.on['encrypted'](
-          {initDataType: 'webm', initData: initData, keyId: null});
       session1.on['message']({target: session1, message: message});
       session1.update.and.returnValue(Promise.resolve());
     });
@@ -2496,4 +2449,17 @@ describe('DrmEngine', () => {
       callback(manifest.variants[0].audio.drmInfos);
     }
   }
+
+  /**
+   *
+   * @param {string} initDataType
+   * @param {Uint8Array} initData
+   * @param {string|null} keyId
+   */
+  async function sendEncryptedEvent(
+      initDataType = 'cenc', initData = new Uint8Array(1), keyId = null) {
+    mockVideo.on['encrypted']({initDataType, initData, keyId});
+
+    await Util.shortDelay();
+  }
 });

package/test/media/media_source_engine_integration.js

@@ -103,6 +103,7 @@ describe('MediaSourceEngine', () => {
     return {
       mimeType: streamMetadata.mimeType,
       codecs: streamMetadata.codecs,
+      drmInfos: [],
     };
   }
 
@@ -288,7 +289,27 @@ describe('MediaSourceEngine', () => {
     await mediaSourceEngine.setStreamProperties(ContentType.VIDEO,
         /* timestampOffset= */ 0,
         /* appendWindowStart= */ 5,
-        /* appendWindowEnd= */ 18);
+        /* appendWindowEnd= */ 18,
+        /* sequenceMode= */ false);
+    expect(buffered(ContentType.VIDEO, 0)).toBe(0);
+    await append(ContentType.VIDEO, 0);
+    expect(bufferStart(ContentType.VIDEO)).toBeCloseTo(5, 1);
+    expect(buffered(ContentType.VIDEO, 5)).toBeCloseTo(5, 1);
+    await append(ContentType.VIDEO, 1);
+    expect(buffered(ContentType.VIDEO, 5)).toBeCloseTo(13, 1);
+  });
+
+  it('does not initialize timestamp offset in sequence mode', async () => {
+    const initObject = new Map();
+    initObject.set(ContentType.VIDEO, getFakeStream(metadata.video));
+    await mediaSourceEngine.init(initObject, false);
+    await mediaSourceEngine.setDuration(presentationDuration);
+    await appendInit(ContentType.VIDEO);
+    await mediaSourceEngine.setStreamProperties(ContentType.VIDEO,
+        /* timestampOffset= */ 100,
+        /* appendWindowStart= */ 5,
+        /* appendWindowEnd= */ 18,
+        /* sequenceMode= */ true);
     expect(buffered(ContentType.VIDEO, 0)).toBe(0);
     await append(ContentType.VIDEO, 0);
     expect(bufferStart(ContentType.VIDEO)).toBeCloseTo(5, 1);
@@ -307,7 +328,8 @@ describe('MediaSourceEngine', () => {
     await mediaSourceEngine.setStreamProperties(ContentType.VIDEO,
         /* timestampOffset= */ 0,
         /* appendWindowStart= */ 0,
-        /* appendWindowEnd= */ 20);
+        /* appendWindowEnd= */ 20,
+        /* sequenceMode= */ false);
     await append(ContentType.VIDEO, 0);
     await append(ContentType.VIDEO, 1);
     expect(bufferStart(ContentType.VIDEO)).toBeCloseTo(0, 1);
@@ -319,7 +341,8 @@ describe('MediaSourceEngine', () => {
     await mediaSourceEngine.setStreamProperties(ContentType.VIDEO,
         /* timestampOffset= */ 15,
         /* appendWindowStart= */ 20,
-        /* appendWindowEnd= */ 35);
+        /* appendWindowEnd= */ 35,
+        /* sequenceMode= */ false);
     await append(ContentType.VIDEO, 0);
     await append(ContentType.VIDEO, 1);
     expect(bufferStart(ContentType.VIDEO)).toBeCloseTo(0, 1);

package/test/media/media_source_engine_unit.js

@@ -49,10 +49,10 @@ describe('MediaSourceEngine', () => {
   const buffer2 = /** @type {!ArrayBuffer} */ (/** @type {?} */ (2));
   const buffer3 = /** @type {!ArrayBuffer} */ (/** @type {?} */ (3));
 
-  const fakeVideoStream = {mimeType: 'video/foo'};
-  const fakeAudioStream = {mimeType: 'audio/foo'};
-  const fakeTextStream = {mimeType: 'text/foo'};
-  const fakeTransportStream = {mimeType: 'tsMimetype'};
+  const fakeVideoStream = {mimeType: 'video/foo', drmInfos: []};
+  const fakeAudioStream = {mimeType: 'audio/foo', drmInfos: []};
+  const fakeTextStream = {mimeType: 'text/foo', drmInfos: []};
+  const fakeTransportStream = {mimeType: 'tsMimetype', drmInfos: []};
 
   let audioSourceBuffer;
   let videoSourceBuffer;
@@ -812,7 +812,8 @@ describe('MediaSourceEngine', () => {
       await mediaSourceEngine.setStreamProperties(ContentType.TEXT,
           /* timestampOffset= */ 10,
           /* appendWindowStart= */ 0,
-          /* appendWindowEnd= */ 20);
+          /* appendWindowEnd= */ 20,
+          /* sequenceMode= */ false);
       expect(mockTextEngine.setTimestampOffset).toHaveBeenCalledWith(10);
       expect(mockTextEngine.setAppendWindow).toHaveBeenCalledWith(0, 20);
     });
@@ -1107,7 +1108,7 @@ describe('MediaSourceEngine', () => {
     });
 
     it('destroys text engines', async () => {
-      mediaSourceEngine.reinitText('text/vtt');
+      mediaSourceEngine.reinitText('text/vtt', false);
 
       await mediaSourceEngine.destroy();
       expect(mockTextEngine).toBeTruthy();