shaka-player 4.8.7 → 4.8.9

package/externs/shaka/player.js

@@ -1391,7 +1391,7 @@ shaka.extern.ManifestConfiguration;
  * @property {number} liveSyncMinPlaybackRate
  *   Minimum playback rate used for latency chasing. It is recommended to use a
  *   value between 0 and 1. Effective only if liveSync is true. Defaults to
- *   <code>1</code>.
+ *   <code>0.95</code>.
  * @property {boolean} liveSyncPanicMode
  *   If <code>true</code>, panic mode for live sync is enabled. When enabled,
  *   will set the playback rate to the <code>liveSyncMinPlaybackRate</code>

package/lib/cea/cea608_data_channel.js

@@ -642,6 +642,15 @@ shaka.cea.Cea608DataChannel = class {
     // b1 -> |P|0|0|1|X|X|X|X|
     return (b1 & 0x70) === 0x10;
   }
+
+  /**
+   * Checks if the data contains a XDS control code.
+   * @param {number} b1 Byte 1.
+   * @return {boolean}
+   */
+  static isXdsControlCode(b1) {
+    return b1 >= 0x01 && b1 <= 0x0F;
+  }
 };
 
 /**

package/lib/cea/cea_decoder.js

@@ -307,16 +307,20 @@ shaka.cea.CeaDecoder = class {
     ccPacket.ccData1 &= 0x7f;
     ccPacket.ccData2 &= 0x7f;
 
+    // Ignore XDS
+    if (shaka.cea.Cea608DataChannel.isXdsControlCode(ccPacket.ccData1)) {
+      return null;
+    }
+
     // Check for empty captions and skip them.
     if (!ccPacket.ccData1 && !ccPacket.ccData2) {
       return null;
     }
 
-    this.streams_.add(selectedMode);
-
     // Process the clean CC data pair.
     let parsedClosedCaption = null;
     if (shaka.cea.Cea608DataChannel.isControlCode(ccPacket.ccData1)) {
+      this.streams_.add(selectedMode);
       parsedClosedCaption = selectedStream.handleControlCode(ccPacket);
     } else {
       // Handle as a Basic North American Character.

package/lib/dash/segment_template.js

@@ -506,7 +506,12 @@ shaka.dash.SegmentTemplate = class {
       // references were generated.  Otherwise, the update would start creating
       // negative positions for segments in periods which begin in the future.
       let nextPosition = Math.max(minPosition, maxPosition + 1);
-      segmentIndex.updateEvery(segmentDuration, () => {
+      let updateTime = segmentDuration;
+      // For low latency we need to evict very frequently.
+      if (context.representation.availabilityTimeOffset) {
+        updateTime = 0.1;
+      }
+      segmentIndex.updateEvery(updateTime, () => {
         // Evict any references outside the window.
         const availabilityStartTime =
           presentationTimeline.getSegmentAvailabilityStart();

package/lib/media/gap_jumping_controller.js

@@ -13,6 +13,7 @@ goog.require('shaka.media.TimeRangesUtils');
 goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IReleasable');
+goog.require('shaka.util.Platform');
 goog.require('shaka.util.Timer');
 
 
@@ -217,7 +218,14 @@ shaka.media.GapJumpingController = class {
 
     // StreamingEngine can buffer past the seek end, but still don't allow
     // seeking past it.
-    const jumpTo = buffered.start(gapIndex);
+    let jumpTo = buffered.start(gapIndex);
+    // Workaround for Xbox with Legacy Edge. On this platform video element
+    // often rounds value we want to set as currentTime and we are not able
+    // to jump over the gap.
+    if (shaka.util.Platform.isLegacyEdge() ||
+        shaka.util.Platform.isXboxOne()) {
+      jumpTo = Math.ceil((jumpTo + 0.01) * 100) / 100;
+    }
     const seekEnd = this.timeline_.getSeekRangeEnd();
     if (jumpTo >= seekEnd) {
       return;

package/lib/media/manifest_filterer.js

@@ -41,27 +41,23 @@ shaka.media.ManifestFilterer = class {
   }
 
   /**
-   * Filters a manifest, removing unplayable streams/variants.
+   * Filters a manifest, removing unplayable streams/variants and  choosing
+   * the codecs.
    *
    * @param {?shaka.extern.Manifest} manifest
    * @return {!Promise.<boolean>} tracksChanged
    */
   async filterManifest(manifest) {
-    await this.filterManifestWithStreamUtils_(manifest);
-    return this.filterManifestWithRestrictions(manifest);
-  }
-
-  /**
-   * Filters a manifest, removing unplayable streams/variants.
-   *
-   * @param {?shaka.extern.Manifest} manifest
-   * @private
-   */
-  async filterManifestWithStreamUtils_(manifest) {
     goog.asserts.assert(manifest, 'Manifest should exist!');
     await shaka.util.StreamUtils.filterManifest(this.drmEngine_, manifest,
         this.config_.drm.preferredKeySystems);
+    shaka.util.StreamUtils.chooseCodecsAndFilterManifest(
+        manifest,
+        this.config_.preferredVideoCodecs,
+        this.config_.preferredAudioCodecs,
+        this.config_.preferredDecodingAttributes);
     this.checkPlayableVariants_(manifest);
+    return this.filterManifestWithRestrictions(manifest);
   }
 
 

package/lib/media/preload_manager.js

@@ -553,7 +553,9 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
 
     const tracksChangedInitial = this.manifestFilterer_.applyRestrictions(
         this.manifest_);
-    if (tracksChangedInitial) {
+    const tracksChangedBefore = await this.manifestFilterer_.filterManifest(
+        this.manifest_);
+    if (tracksChangedInitial || tracksChangedBefore) {
       const event = this.makeEvent_(
           shaka.util.FakeEvent.EventName.TracksChanged);
       await Promise.resolve();
@@ -568,7 +570,6 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
 
     // Now that we have drm information, filter the manifest (again) so that
     // we can ensure we only use variants with the selected key system.
-    // const tracksChanged =
     const tracksChangedAfter = await this.manifestFilterer_.filterManifest(
         this.manifest_);
     if (tracksChangedAfter) {
@@ -630,14 +631,6 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
               this.config_.preferredVideoLabel,
               this.config_.mediaSource.codecSwitchingStrategy,
               this.config_.manifest.dash.enableAudioGroups);
-
-      // If the content is multi-codec and the browser can play more than one of
-      // them, choose codecs now before we initialize streaming.
-      shaka.util.StreamUtils.chooseCodecsAndFilterManifest(
-          this.manifest_,
-          this.config_.preferredVideoCodecs,
-          this.config_.preferredAudioCodecs,
-          this.config_.preferredDecodingAttributes);
     }
 
     // Make the ABR manager.

package/lib/player.js

@@ -2369,7 +2369,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.config_.streaming.vodDynamicPlaybackRate) {
       const onTimeUpdate = () => this.onTimeUpdate_();
       this.loadEventManager_.listen(mediaElement, 'timeupdate', onTimeUpdate);
-    } else if (!isLive) {
+    }
+    if (!isLive) {
       const onVideoProgress = () => this.onVideoProgress_();
       this.loadEventManager_.listen(
           mediaElement, 'timeupdate', onVideoProgress);
@@ -2732,7 +2733,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.config_.streaming.vodDynamicPlaybackRate) {
       const onTimeUpdate = () => this.onTimeUpdate_();
       this.loadEventManager_.listen(mediaElement, 'timeupdate', onTimeUpdate);
-    } else if (!isLive) {
+    }
+    if (!isLive) {
       const onVideoProgress = () => this.onVideoProgress_();
       this.loadEventManager_.listen(
           mediaElement, 'timeupdate', onVideoProgress);
@@ -6527,8 +6529,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     shaka.log.debug('switch_');
     goog.asserts.assert(this.config_.abr.enabled,
         'AbrManager should not call switch while disabled!');
-    goog.asserts.assert(this.manifest_, 'We need a manifest to switch ' +
-                                        'variants.');
+
+    if (!this.manifest_) {
+      // It could come from a preload manager operation.
+      return;
+    }
 
     if (!this.streamingEngine_) {
       // There's no way to change it.
@@ -7234,7 +7239,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.8.7' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.8.9' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/patchedmediakeys_cert.js

@@ -0,0 +1,62 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.provide('shaka.polyfill.PatchedMediaKeysCert');
+
+goog.require('shaka.log');
+goog.require('shaka.polyfill');
+goog.require('shaka.util.Platform');
+
+
+/**
+ * @summary A polyfill to fix setServerCertificate implementation on
+ * older platforms which claim to support modern EME.
+ * @export
+ */
+shaka.polyfill.PatchedMediaKeysCert = class {
+  /**
+   * Installs the polyfill if needed.
+   * @export
+   */
+  static install() {
+    if (!window.MediaKeys) {
+      // No MediaKeys available
+      return;
+    }
+    // eslint-disable-next-line no-restricted-syntax
+    if (MediaKeys.prototype.setServerCertificate &&
+        !shaka.polyfill.PatchedMediaKeysCert.hasInvalidImplementation_()) {
+      // setServerCertificate is there and userAgent seems to be valid.
+      return;
+    }
+
+    shaka.log.info('Patching MediaKeys.setServerCertificate');
+    // eslint-disable-next-line no-restricted-syntax
+    MediaKeys.prototype.setServerCertificate =
+      shaka.polyfill.PatchedMediaKeysCert.setServerCertificate_;
+  }
+
+  /**
+   * @param {!BufferSource} certificate
+   * @return {!Promise<boolean>}
+   * @private
+   */
+  static setServerCertificate_(certificate) {
+    shaka.log.debug('PatchedMediaKeysCert.setServerCertificate');
+    return Promise.resolve(false);
+  }
+
+  /**
+   * @return {boolean}
+   * @private
+   */
+  static hasInvalidImplementation_() {
+    return shaka.util.Platform.isTizen3() || shaka.util.Platform.isTizen4() ||
+      shaka.util.Platform.isTizen5_0() || shaka.util.Platform.isWebOS3();
+  }
+};
+
+shaka.polyfill.register(shaka.polyfill.PatchedMediaKeysCert.install);

package/lib/util/platform.js

@@ -108,6 +108,33 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('Tizen');
   }
 
+  /**
+   * Check if the current platform is a Tizen 6 TV.
+   *
+   * @return {boolean}
+   */
+  static isTizen6() {
+    return shaka.util.Platform.userAgentContains_('Tizen 6');
+  }
+
+  /**
+   * Check if the current platform is a Tizen 5.0 TV.
+   *
+   * @return {boolean}
+   */
+  static isTizen5_0() {
+    return shaka.util.Platform.userAgentContains_('Tizen 5.0');
+  }
+
+  /**
+   * Check if the current platform is a Tizen 5 TV.
+   *
+   * @return {boolean}
+   */
+  static isTizen5() {
+    return shaka.util.Platform.userAgentContains_('Tizen 5');
+  }
+
   /**
    * Check if the current platform is a Tizen 4 TV.
    *
@@ -588,8 +615,8 @@ shaka.util.Platform = class {
    */
   static supportsSmoothCodecSwitching() {
     const Platform = shaka.util.Platform;
-    if (Platform.isTizen2() || Platform.isTizen3() ||
-        Platform.isTizen4() || Platform.isWebOS3() ||
+    if (Platform.isTizen2() || Platform.isTizen3() || Platform.isTizen4() ||
+        Platform.isTizen5() || Platform.isTizen6() || Platform.isWebOS3() ||
         Platform.isWebOS4() || Platform.isWebOS5()) {
       return false;
     }

package/lib/util/player_configuration.js

@@ -239,7 +239,7 @@ shaka.util.PlayerConfiguration = class {
       liveSyncMaxLatency: 1,
       liveSyncPlaybackRate: 1.1,
       liveSyncMinLatency: 0,
-      liveSyncMinPlaybackRate: 1,
+      liveSyncMinPlaybackRate: 0.95,
       liveSyncPanicMode: false,
       liveSyncPanicThreshold: 60,
       allowMediaSourceRecoveries: true,

package/lib/util/stream_utils.js

@@ -548,7 +548,7 @@ shaka.util.StreamUtils = class {
       if (!a) {
         return b;
       } else {
-        const res = shaka.util.ObjectUtils.cloneObject(a);
+        const res = shaka.util.ObjectUtils.shallowCloneObject(a);
         res.supported = a.supported && b.supported;
         res.powerEfficient = a.powerEfficient && b.powerEfficient;
         res.smooth = a.smooth && b.smooth;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.8.7",
+  "version": "4.8.9",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [