shaka-player 4.2.9 → 4.2.10

package/test/test/assets/text-clip-alt.vtt

@@ -0,0 +1,63 @@
+WEBVTT
+
+00:04.000 --> 00:07.300
+Journal de bord du capitaine.
+Date stellaire 41636.9.
+
+00:07.500 --> 00:11.800
+Comme nous le craignions, l'épave
+du cargo Odin de la Fédération,
+
+00:12.100 --> 00:16.400
+percuté par un astéroïde,
+ne révèle aucun signe de vie.
+
+00:16.700 --> 00:19.000
+Mais trois nacelles
+de sauvetage manquaient,
+
+00:19.300 --> 00:21.900
+laissant supposer
+qu'il y aurait des survivants.
+
+00:22.700 --> 00:27.700
+- Mise sur orbite Angel One, paré.
+- Quel genre d'endroit, Data ?
+
+00:28.200 --> 00:31.600
+Planète de Classe-M.
+Faune et flore à base de carbone.
+
+00:31.900 --> 00:34.300
+Population éparse
+et forme de vie intelligente.
+
+00:34.600 --> 00:38.400
+Développement technique équivalent
+au milieu du 20ème siècle terrien.
+
+00:38.800 --> 00:41.000
+C'est presque un retour aux sources.
+
+00:41.300 --> 00:43.600
+Si jamais des survivants
+ont pu aller si loin,
+
+00:43.800 --> 00:49.000
+c'était la planète la plus proche.
+La distance qui nous a pris 2 jours
+
+00:49.500 --> 00:52.400
+aurait pris 5 mois aux nacelles
+de sauvetage du Odin.
+
+00:52.600 --> 00:54.700
+Cinq mois, six jours, onze heures,
+deux min...
+
+00:54.900 --> 00:58.400
+- Merci, Data.
+- ..et 57 secondes.
+
+00:58.600 --> 01:01.300
+Signal audio provenant d'Angel One.

package/test/test/util/fake_drm_engine.js

@@ -81,6 +81,9 @@ shaka.test.FakeDrmEngine = class {
     /** @type {!jasmine.Spy} */
     this.supportsVariant = jasmine.createSpy('supportsVariant');
     this.supportsVariant.and.returnValue(true);
+
+    /** @type {!jasmine.Spy} */
+    this.setSrcEquals = jasmine.createSpy('setSrcEquals');
   }
 
   /**

package/test/test/util/simple_fakes.js

@@ -35,6 +35,9 @@ shaka.test.FakeAbrManager = class {
     /** @type {!jasmine.Spy} */
     this.stop = jasmine.createSpy('stop');
 
+    /** @type {!jasmine.Spy} */
+    this.release = jasmine.createSpy('release');
+
     /** @type {!jasmine.Spy} */
     this.enable = jasmine.createSpy('enable');
 
@@ -225,6 +228,9 @@ shaka.test.FakeVideo = class {
 
     /** @type {!jasmine.Spy} */
     this.dispatchEvent = jasmine.createSpy('dispatchEvent');
+
+    /** @type {!jasmine.Spy} */
+    this.canPlayType = jasmine.createSpy('canPlayType');
   }
 };
 

package/test/test/util/test_scheme.js

@@ -447,6 +447,7 @@ const widevineDrmServers = {
 
 /** @type {AVMetadataType} */
 const axinomMultiDrmVideoSegment = {
+  // Taken from Axinom's v6 test vector.
   initSegmentUri: '/base/test/test/assets/multidrm-video-init.mp4',
   mdhdOffset: 0x1d1,
   segmentUri: '/base/test/test/assets/multidrm-video-segment.mp4',
@@ -461,6 +462,7 @@ const axinomMultiDrmVideoSegment = {
 
 /** @type {AVMetadataType} */
 const axinomMultiDrmAudioSegment = {
+  // Taken from Axinom's v6 test vector.
   initSegmentUri: '/base/test/test/assets/multidrm-audio-init.mp4',
   mdhdOffset: 0x192,
   segmentUri: '/base/test/test/assets/multidrm-audio-segment.mp4',
@@ -475,20 +477,15 @@ const axinomMultiDrmAudioSegment = {
 
 /** @type {!Object.<string, string>} */
 const axinomDrmServers = {
+  // NOTE: These are not Axinom's actual servers.  These are test servers for
+  // Widevine and PlayReady that let us specify the known key IDs and keys for
+  // Axinom's v6 test vectors.  Axinom's own servers started returning 403
+  // errors for these older test vectors, and we were forced to switch to
+  // something stable and independent.
   'com.widevine.alpha':
-      'https://drm-widevine-licensing.axtest.net/AcquireLicense',
+      'https://cwip-shaka-proxy.appspot.com/specific_key?blodJidXR9eARuql0dNLWg=GX8m9XLIZNIzizrl0RTqnA',
   'com.microsoft.playready':
-      'https://drm-playready-licensing.axtest.net/AcquireLicense',
-};
-
-/** @type {!Object.<string, string>} */
-const axinomDrmHeaders = {
-  'X-AxDRM-Message':
-      'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5' +
-      'X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc' +
-      '2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIj' +
-      'oiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflO' +
-      'Pv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE',
+      'https://test.playready.microsoft.com/service/rightsmanager.asmx?cfg=(kid:6e5a1d26-2757-47d7-8046-eaa5d1d34b5a,contentkey:GX8m9XLIZNIzizrl0RTqnA==,sl:150)',
 };
 
 /** @type {TextMetadataType} */
@@ -601,7 +598,6 @@ shaka.test.TestScheme.DATA = {
     audio: axinomMultiDrmAudioSegment,
     text: vttSegment,
     licenseServers: axinomDrmServers,
-    licenseRequestHeaders: axinomDrmHeaders,
     duration: 30,
     sequenceMode: false,
   },
@@ -614,7 +610,6 @@ shaka.test.TestScheme.DATA = {
       initData: undefined,
     }),
     licenseServers: axinomDrmServers,
-    licenseRequestHeaders: axinomDrmHeaders,
     duration: 30,
     sequenceMode: false,
   },

package/test/text/mp4_vtt_parser_unit.js

@@ -171,6 +171,14 @@ describe('Mp4VttParser', () => {
     verifyHelper(cues, result);
   });
 
+  it('handles empty media segments', () => {
+    const parser = new shaka.text.Mp4VttParser();
+    parser.parseInit(vttInitSegment);
+    const time = {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0};
+    const result = parser.parseMedia(new Uint8Array(0), time);
+    verifyHelper([], result);
+  });
+
   it('rejects init segment with no vtt', () => {
     const error = shaka.test.Util.jasmineError(new shaka.util.Error(
         shaka.util.Error.Severity.CRITICAL,

package/test/util/mime_utils_unit.js

@@ -51,4 +51,14 @@ describe('MimeUtils', () => {
     expect(getNormalizedCodec('dvh1.05')).toBe('dovi');
     expect(getNormalizedCodec('dvhe.05')).toBe('dovi');
   });
+
+  it('isHlsType', () => {
+    const isHlsType = (mimeType) => shaka.util.MimeUtils.isHlsType(mimeType);
+
+    expect(isHlsType('application/x-mpegurl')).toBe(true);
+    expect(isHlsType('application/vnd.apple.mpegurl')).toBe(true);
+    expect(isHlsType('application/dash+xml')).toBe(false);
+    expect(isHlsType('application/vnd.ms-sstr+xml')).toBe(false);
+    expect(isHlsType('foo')).toBe(false);
+  });
 });