shaka-player 4.3.14 → 4.3.15

package/lib/deprecate/deprecate.js

@@ -107,7 +107,7 @@ shaka.Deprecate = class {
       libraryVersion,
       '. Additional information:',
       description,
-    ].join('');
+    ].join(' ');
 
     shaka.log.alwaysError(errorMessage);
     goog.asserts.assert(false, errorMessage);

package/lib/hls/hls_parser.js

@@ -3382,7 +3382,22 @@ shaka.hls.HlsParser = class {
    * @return {?shaka.extern.DrmInfo}
    * @private
    */
-  static identityDrmParser_(drmTag) {
+  static identityDrmParser_(drmTag, mimeType) {
+    if (mimeType == 'video/mp2t') {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MANIFEST,
+          shaka.util.Error.Code.HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED);
+    }
+
+    if (shaka.util.Platform.isMediaKeysPolyfilled()) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MANIFEST,
+          shaka.util.Error.Code
+              .HLS_MSE_ENCRYPTED_LEGACY_APPLE_MEDIA_KEYS_NOT_SUPPORTED);
+    }
+
     const method = drmTag.getRequiredAttrValue('METHOD');
     const VALID_METHODS = ['SAMPLE-AES', 'SAMPLE-AES-CTR'];
     if (!VALID_METHODS.includes(method)) {

package/lib/media/manifest_parser.js

@@ -176,7 +176,8 @@ shaka.media.ManifestParser = class {
         shaka.util.Error.Severity.CRITICAL,
         shaka.util.Error.Category.MANIFEST,
         shaka.util.Error.Code.UNABLE_TO_GUESS_MANIFEST_TYPE,
-        uri);
+        uri,
+        mimeType);
   }
 
 

package/lib/player.js

@@ -2120,7 +2120,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.abrManager_ = abrFactory();
       if (typeof this.abrManager_.setMediaElement != 'function') {
         shaka.Deprecate.deprecateFeature(5,
-            'AbrManager',
+            'AbrManager w/o setMediaElement',
             'Please use an AbrManager with setMediaElement function.');
         this.abrManager_.setMediaElement = () => {};
       }
@@ -7032,7 +7032,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.3.14' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.3.15' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/mediasource.js

@@ -32,11 +32,12 @@ shaka.polyfill.MediaSource = class {
 
     if (!window.MediaSource) {
       shaka.log.info('No MSE implementation available.');
-    } else if (window.cast && cast.__platform__ &&
-               cast.__platform__.canDisplayType) {
+    } else if (shaka.util.Platform.isChromecast()) {
       shaka.log.info('Patching Chromecast MSE bugs.');
-      // Chromecast cannot make accurate determinations via isTypeSupported.
-      shaka.polyfill.MediaSource.patchCastIsTypeSupported_();
+      // Chromecast fails on some TS content, even though it is supposed to
+      // support it.  Better to transmux.
+      // See https://github.com/shaka-project/shaka-player/issues/5278
+      shaka.polyfill.MediaSource.rejectContainer_('mp2t');
     } else if (safariVersion) {
       // NOTE:  shaka.Player.isBrowserSupported() has its own restrictions on
       // Safari version.
@@ -161,38 +162,6 @@ shaka.polyfill.MediaSource = class {
     };
   }
 
-  /**
-   * Patch isTypeSupported() to chain to a private API on the Chromecast which
-   * can query for support of detailed content parameters.
-   *
-   * @private
-   */
-  static patchCastIsTypeSupported_() {
-    const originalIsTypeSupported = MediaSource.isTypeSupported;
-
-    MediaSource.isTypeSupported = (mimeType) => {
-      // Parse the basic MIME type from its parameters.
-      const pieces = mimeType.split(/ *; */);
-      pieces.shift();  // Remove basic MIME type from pieces.
-
-      const hasCodecs = pieces.some((piece) => piece.startsWith('codecs='));
-      if (!hasCodecs) {
-        // Though the original reason for this special case was not documented,
-        // it is presumed to be because the platform won't accept a MIME type
-        // without codecs in canDisplayType.  It is valid, however, in
-        // isTypeSupported.
-        return originalIsTypeSupported(mimeType);
-      }
-
-      // Only canDisplayType can check extended MIME type parameters on this
-      // platform (such as frame rate, resolution, etc).
-      // In previous versions of this polyfill, the MIME type parameters were
-      // manipulated, filtered, or extended.  This is no longer true, so we pass
-      // the full MIME type to the platform as we received it.
-      return cast.__platform__.canDisplayType(mimeType);
-    };
-  }
-
   /**
    * Patch isTypeSupported() to translate vp09 codec strings into vp9, to allow
    * such content to play on older smart TVs.

package/lib/text/vtt_text_parser.js

@@ -673,13 +673,14 @@ shaka.text.VttTextParser = class {
         refCue.fontFamily, cue.fontFamily);
     cue.fontSize = VttTextParser.getOrDefault_(
         refCue.fontSize, cue.fontSize);
+    cue.textShadow = VttTextParser.getOrDefault_(
+        refCue.textShadow, cue.textShadow);
 
     // Overwrite with new values as unable to determine
     // if new value is set or not
     cue.fontWeight = refCue.fontWeight;
     cue.fontStyle = refCue.fontStyle;
     cue.opacity = refCue.opacity;
-    cue.textShadow = refCue.textShadow;
     cue.wrapLine = refCue.wrapLine;
   }
 

package/lib/util/error.js

@@ -506,6 +506,7 @@ shaka.util.Error.Code = {
    *   <li>Configure the server to accept a HEAD request for the manifest.
    * </ul>
    * <br> error.data[0] is the manifest URI.
+   * <br> error.data[1] is the detected or specified MIME type.
    */
   'UNABLE_TO_GUESS_MANIFEST_TYPE': 4000,
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.3.14",
+  "version": "4.3.15",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -48,7 +48,7 @@
     "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/hls/hls_parser_unit.js

@@ -3743,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/player_integration.js

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

package/test/player_src_equals_integration.js

@@ -114,8 +114,8 @@ describe('Player Src Equals', () => {
     expect(video.currentTime).toBeLessThan(2.0);
 
     // Trigger a seek and then wait for the seek to take effect.
-    // This seek target is very close to the duration of the video.
-    video.currentTime = 10;
+    // This seek target is very close to the duration of the video (10.01s).
+    video.currentTime = 9.5;
     await waiter.waitForMovementOrFailOnTimeout(video, /* timeout= */10);
 
     // Make sure the playhead is roughly where we expect it to be after

package/test/player_unit.js

@@ -559,15 +559,21 @@ describe('Player', () => {
     });
 
     describe('when config.streaming.preferNativeHls is set to true', () => {
-      beforeEach(() => {
+      beforeAll(() => {
         shaka.media.ManifestParser.registerParserByMime(
             'application/x-mpegurl',
             () => new shaka.test.FakeManifestParser(manifest));
       });
 
+      afterAll(() => {
+        // IMPORTANT: restore the ORIGINAL parser.  DO NOT just unregister the
+        // fake!
+        shaka.media.ManifestParser.registerParserByMime(
+            'application/x-mpegurl',
+            () => new shaka.hls.HlsParser());
+      });
+
       afterEach(() => {
-        shaka.media.ManifestParser.unregisterParserByMime(
-            'application/x-mpegurl');
         video.canPlayType.calls.reset();
       });
 

package/test/text/vtt_text_parser_unit.js

@@ -1072,6 +1072,37 @@ describe('VttTextParser', () => {
         {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
+  it('passes text-shadow when multiple classes included', () => {
+    verifyHelper(
+        [
+          {
+            startTime: 20,
+            endTime: 40,
+            payload: '',
+            nestedCues: [
+              {
+                startTime: 20,
+                endTime: 40,
+                payload: 'Test',
+                fontStyle: Cue.fontStyle.ITALIC,
+                textShadow: 'black 5%',
+              },
+            ],
+          },
+        ],
+        'WEBVTT\n\n' +
+        'STYLE\n' +
+        '::cue(.shadow) {\n' +
+        '  text-shadow: black 5%;\n' +
+        '}\n' +
+        '::cue(.italic) {\n' +
+        '  font-style: italic;\n' +
+        '}\n\n' +
+        '00:00:20.000 --> 00:00:40.000\n' +
+        '<c.shadow.italic>Test</c>',
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
+  });
+
   it('supports karaoke style text', () => {
     verifyHelper(
         [

package/ui/less/containers.less

@@ -24,6 +24,7 @@
   /* Set the fonts for all other content. */
   * {
     font-family: Roboto-Regular, Roboto, sans-serif, TengwarTelcontar;
+    -webkit-font-smoothing: antialiased;
   }
 }