shaka-player 4.3.4 → 4.3.6

package/test/player_integration.js

@@ -319,6 +319,45 @@ describe('Player', () => {
       player.setTextTrackVisibility(true);
       expect(getTracksActive()).toEqual([false, true]);
     });
+
+    // https://github.com/shaka-project/shaka-player/issues/4821
+    it('loads a single text stream', async () => {
+      player.configure({preferredTextLanguage: 'en'});
+      await player.load('test:sintel_no_text_compiled');
+
+      // Add preferred language text track.
+      const locationUri = new goog.Uri(location.href);
+      const partialUri = new goog.Uri('/base/test/test/assets/text-clip.vtt');
+      const absoluteUri = locationUri.resolve(partialUri);
+      await player.addTextTrackAsync(
+          absoluteUri.toString(), 'en', 'subtitles', 'text/vtt');
+
+      // Add alternate language text track.
+      // Two text tracks with same timings but different text
+      // are necessary for test.
+      const partialUri2 =
+      new goog.Uri('/base/test/test/assets/text-clip-alt.vtt');
+      const absoluteUri2 = locationUri.resolve(partialUri2);
+      await player.addTextTrackAsync(
+          absoluteUri2.toString(), 'fr', 'subtitles', 'text/vtt');
+
+      const textTracks = player.getTextTracks();
+      expect(textTracks.length).toBe(2);
+      expect(textTracks[0].language).toBe('en');
+      expect(textTracks[1].language).toBe('fr');
+
+      // Enable text visibilty and immediately change language.
+      // Only one set of cues should be active.
+      // Cues should be of the selected language track.
+      player.setTextTrackVisibility(true);
+      player.selectTextLanguage('fr');
+      video.currentTime = 5;
+      video.play();
+      await waiter.waitForMovementOrFailOnTimeout(video, 10);
+
+      expect(video.textTracks[0].activeCues.length).toBe(1);
+      expect(player.getTextTracks()[1].active).toBe(true);
+    });
   });  // describe('setTextTrackVisibility')
 
   describe('autoShowText', () => {

package/test/player_unit.js

@@ -208,6 +208,7 @@ describe('Player', () => {
       await player.destroy();
 
       expect(abrManager.stop).toHaveBeenCalled();
+      expect(abrManager.release).toHaveBeenCalled();
       expect(networkingEngine.destroy).toHaveBeenCalled();
       expect(drmEngine.destroy).toHaveBeenCalled();
       expect(playhead.release).toHaveBeenCalled();
@@ -246,6 +247,7 @@ describe('Player', () => {
       parser.start.and.returnValue(p);
       parser.stop.and.callFake(() => {
         expect(abrManager.stop).not.toHaveBeenCalled();
+        expect(abrManager.release).not.toHaveBeenCalled();
         expect(networkingEngine.destroy).not.toHaveBeenCalled();
       });
       shaka.media.ManifestParser.registerParserByMime(
@@ -255,6 +257,7 @@ describe('Player', () => {
       await shaka.test.Util.shortDelay();
       await player.destroy();
       expect(abrManager.stop).toHaveBeenCalled();
+      expect(abrManager.release).toHaveBeenCalled();
       expect(networkingEngine.destroy).toHaveBeenCalled();
       expect(parser.stop).toHaveBeenCalled();
       await expectAsync(load).toBeRejected();
@@ -554,6 +557,60 @@ describe('Player', () => {
         expect(streamingEngine.unloadTextStream).not.toHaveBeenCalled();
       });
     });
+
+    describe('when config.streaming.preferNativeHls is set to true', () => {
+      beforeEach(() => {
+        shaka.media.ManifestParser.registerParserByMime(
+            'application/x-mpegurl',
+            () => new shaka.test.FakeManifestParser(manifest));
+      });
+
+      afterEach(() => {
+        shaka.media.ManifestParser.unregisterParserByMime(
+            'application/x-mpegurl');
+        video.canPlayType.calls.reset();
+      });
+
+      it('only applies to HLS streams', async () => {
+        video.canPlayType.and.returnValue('maybe');
+        spyOn(shaka.util.Platform, 'anyMediaElement').and.returnValue(video);
+        spyOn(shaka.util.Platform, 'supportsMediaSource').and.returnValue(true);
+        spyOn(shaka.util.Platform, 'isApple').and.returnValue(false);
+        // Make sure player.load() resolves for src=
+        spyOn(shaka.util.MediaReadyState, 'waitForReadyState').and.callFake(
+            (mediaElement, readyState, eventManager, callback) => {
+              callback();
+            });
+
+        player.configure({
+          streaming: {
+            preferNativeHls: true,
+            useNativeHlsOnSafari: false,
+          },
+        });
+
+        await player.load(fakeManifestUri, undefined, 'application/x-mpegurl');
+
+        expect(player.getLoadMode()).toBe(shaka.Player.LoadMode.SRC_EQUALS);
+      });
+
+      it('does not apply to non-HLS streams', async () => {
+        video.canPlayType.and.returnValue('maybe');
+        spyOn(shaka.util.Platform, 'supportsMediaSource').and.returnValue(true);
+        spyOn(shaka.util.Platform, 'isApple').and.returnValue(false);
+
+        player.configure({
+          streaming: {
+            preferNativeHls: true,
+            useNativeHlsOnSafari: false,
+          },
+        });
+
+        await player.load(fakeManifestUri, 0, fakeMimeType);
+
+        expect(player.getLoadMode()).toBe(shaka.Player.LoadMode.MEDIA_SOURCE);
+      });
+    });
   });  // describe('load/unload')
 
   describe('getConfiguration', () => {

package/test/polyfill/media_capabilities_unit.js

@@ -5,7 +5,6 @@
  */
 
 describe('MediaCapabilities', () => {
-  const Util = shaka.test.Util;
   const originalCast = window['cast'];
   const originalVendor = navigator.vendor;
   const originalUserAgent = navigator.userAgent;
@@ -70,6 +69,7 @@ describe('MediaCapabilities', () => {
       },
     };
     shaka.polyfill.MediaCapabilities.memoizedMediaKeySystemAccessRequests_ = {};
+    supportMap.clear();
 
     mockCanDisplayType = jasmine.createSpy('canDisplayType');
     mockCanDisplayType.and.returnValue(false);
@@ -163,30 +163,30 @@ describe('MediaCapabilities', () => {
           expect(result.keySystemAccess).toEqual(mockResult);
         });
 
-    it('throws when the cast namespace is not available', async () => {
-      // Temporarily remove window.cast to trigger error. It's restored after
-      // every test.
-      delete window['cast'];
+    it('falls back to isTypeSupported() when cast namespace is not available',
+        async () => {
+          // Temporarily remove window.cast to trigger error. It's restored
+          // after every test.
+          delete window['cast'];
 
-      const isChromecastSpy =
-          spyOn(shaka['util']['Platform'],
-              'isChromecast').and.returnValue(true);
-      const expected = Util.jasmineError(new shaka.util.Error(
-          shaka.util.Error.Severity.CRITICAL,
-          shaka.util.Error.Category.CAST,
-          shaka.util.Error.Code.CAST_API_UNAVAILABLE));
-      const isTypeSupportedSpy =
-          spyOn(window['MediaSource'], 'isTypeSupported').and.returnValue(true);
+          const isChromecastSpy =
+              spyOn(shaka['util']['Platform'],
+                  'isChromecast').and.returnValue(true);
+          expect(window['MediaSource']['isTypeSupported']).toBeDefined();
 
-      shaka.polyfill.MediaCapabilities.install();
-      await expectAsync(
-          navigator.mediaCapabilities.decodingInfo(mockDecodingConfig))
-          .toBeRejectedWith(expected);
+          shaka.polyfill.MediaCapabilities.install();
+          await navigator.mediaCapabilities.decodingInfo(mockDecodingConfig);
 
-      expect(isTypeSupportedSpy).not.toHaveBeenCalled();
-      // 1 (during install()) + 1 (for video config check).
-      expect(isChromecastSpy).toHaveBeenCalledTimes(2);
-    });
+          expect(mockCanDisplayType).not.toHaveBeenCalled();
+          // 1 (during install()) + 1 (for video config check).
+          expect(isChromecastSpy).toHaveBeenCalledTimes(2);
+          // 1 (fallback in canCastDisplayType()) +
+          // 1 (mockDecodingConfig.audio).
+          expect(supportMap.has(mockDecodingConfig.video.contentType))
+              .toBe(true);
+          expect(supportMap.has(mockDecodingConfig.audio.contentType))
+              .toBe(true);
+        });
 
     it('falls back to isTypeSupported() when canDisplayType() missing',
         async () => {

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/fake_media_source_engine.js

@@ -136,6 +136,10 @@ shaka.test.FakeMediaSourceEngine = class {
     /** @type {!jasmine.Spy} */
     this.updateLcevcDil =
         jasmine.createSpy('updateLcevcDil').and.stub();
+
+    /** @type {!jasmine.Spy} */
+    this.resync=
+        jasmine.createSpy('resync').and.stub();
   }
 
   /** @override */

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

@@ -455,6 +455,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',
@@ -469,6 +470,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',
@@ -483,20 +485,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} */
@@ -614,7 +611,6 @@ shaka.test.TestScheme.DATA = {
     audio: axinomMultiDrmAudioSegment,
     text: vttSegment,
     licenseServers: axinomDrmServers,
-    licenseRequestHeaders: axinomDrmHeaders,
     duration: 30,
   },
 
@@ -626,7 +622,6 @@ shaka.test.TestScheme.DATA = {
       initData: undefined,
     }),
     licenseServers: axinomDrmServers,
-    licenseRequestHeaders: axinomDrmHeaders,
     duration: 30,
   },
 

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/text/vtt_text_parser_unit.js

@@ -852,11 +852,35 @@ describe('VttTextParser', () => {
   it('support escaped html payload', () => {
     verifyHelper(
         [
-          {startTime: 20.1, endTime: 40.505, payload: '"Test & 1"\u{a0}'},
+          {
+            startTime: 20.1,
+            endTime: 40.505,
+            payload: '"Test & 1"\u{a0}',
+          },
+          {
+            startTime: 41,
+            endTime: 42,
+            payload: '',
+            nestedCues: [
+              {
+                startTime: 41,
+                endTime: 42,
+                payload: 'Test',
+                fontStyle: Cue.fontStyle.ITALIC,
+              },
+              {
+                startTime: 41,
+                endTime: 42,
+                payload: '&',
+              },
+            ],
+          },
         ],
         'WEBVTT\n\n' +
         '00:00:20.100 --> 00:00:40.505\n' +
-        '"Test & 1" ',
+        '"Test & 1" \n\n' +
+        '00:00:41.000 --> 00:00:42.000\n' +
+        '<i>Test</i>&amp;',
         {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 

package/test/text/web_vtt_layout_integration.js

@@ -265,7 +265,6 @@ filterDescribe('WebVTT layout', shaka.test.TextLayoutTests.supported, () => {
       await helper.checkScreenshot('line-85-position-50-size-63');
     });
 
-    // FIXME: UI version is slightly wrong: gaps between lines when bold
     it('bold long', async () => {
       parseAndDisplay([
         'WEBVTT\n',
@@ -278,7 +277,6 @@ filterDescribe('WebVTT layout', shaka.test.TextLayoutTests.supported, () => {
       await helper.checkScreenshot('bold-long');
     });
 
-    // FIXME: UI version is slightly wrong: gaps between lines when italic
     it('italic long', async () => {
       parseAndDisplay([
         'WEBVTT\n',
@@ -291,7 +289,6 @@ filterDescribe('WebVTT layout', shaka.test.TextLayoutTests.supported, () => {
       await helper.checkScreenshot('italic-long');
     });
 
-    // FIXME: UI version is slightly wrong: gaps between lines when italic
     it('underline long', async () => {
       parseAndDisplay([
         'WEBVTT\n',

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);
+  });
 });

package/ui/less/containers.less

@@ -103,6 +103,10 @@
  * below (Y axis) .shaka-play-button-container. */
 .shaka-canvas-container {
   .overlay-child();
+
+  /* Make sure pointer events can reach the video element in the case of native
+   * controls. */
+  pointer-events: none;
 }
 
 /* Container for controls positioned at the bottom of the video container: