shaka-player 4.9.29 → 4.9.30

package/lib/dash/dash_parser.js

@@ -1285,11 +1285,13 @@ shaka.dash.DashParser = class {
     for (let i = 0; i < periodNodes.length; i++) {
       const elem = periodNodes[i];
       const next = periodNodes[i + 1];
-      const start = /** @type {number} */ (
+      let start = /** @type {number} */ (
         TXml.parseAttr(elem, 'start', TXml.parseDuration, prevEnd));
       const periodId = elem.attributes['id'];
       const givenDuration =
           TXml.parseAttr(elem, 'duration', TXml.parseDuration);
+      start = (i == 0 && start == 0 && this.isTransitionFromDynamicToStatic_) ?
+          seekRangeStart : start;
 
       let periodDuration = null;
       if (next) {
@@ -1299,7 +1301,7 @@ shaka.dash.DashParser = class {
         const nextStart =
             TXml.parseAttr(next, 'start', TXml.parseDuration);
         if (nextStart != null) {
-          periodDuration = nextStart - start;
+          periodDuration = nextStart - start + seekRangeStart;
         }
       } else if (presentationDuration != null) {
         // "The Period extends until the Period.start of the next Period, or
@@ -2575,25 +2577,51 @@ shaka.dash.DashParser = class {
           return intValue;
         }
 
+        case 'tag:dolby.com,2015:dash:audio_channel_configuration:2015': {
+          // ETSI TS 103 190-2 v1.2.1, Annex G.3
+          // LSB-to-MSB order
+          const channelCountMapping =
+            [2, 1, 2, 2, 2, 2, 1, 2, 2, 1, 1, 1, 1, 2, 1, 1, 2, 2];
+          const hexValue = parseInt(value, 16);
+          if (!hexValue) {  // 0 or NaN
+            shaka.log.warning('Channel parsing failure! ' +
+                          'Ignoring scheme and value', scheme, value);
+            continue;
+          }
+          let numBits = 0;
+          for (let i = 0; i < channelCountMapping.length; i++) {
+            if (hexValue & (1<<i)) {
+              numBits += channelCountMapping[i];
+            }
+          }
+          if (numBits) {
+            return numBits;
+          }
+          continue;
+        }
+
         case 'tag:dolby.com,2014:dash:audio_channel_configuration:2011':
         case 'urn:dolby:dash:audio_channel_configuration:2011': {
-          // A hex-encoded 16-bit integer, in which each bit represents a
-          // channel.
-          let hexValue = parseInt(value, 16);
+          // Defined by https://ott.dolby.com/OnDelKits/DDP/Dolby_Digital_Plus_Online_Delivery_Kit_v1.5/Documentation/Content_Creation/SDM/help_files/topics/ddp_mpeg_dash_c_mpd_auchlconfig.html
+          // keep list in order of the spec; reverse for LSB-to-MSB order
+          const channelCountMapping =
+            [1, 1, 1, 1, 1, 2, 2, 1, 1, 2, 2, 2, 1, 2, 1, 1].reverse();
+          const hexValue = parseInt(value, 16);
           if (!hexValue) {  // 0 or NaN
             shaka.log.warning('Channel parsing failure! ' +
                           'Ignoring scheme and value', scheme, value);
             continue;
           }
-          // Count the 1-bits in hexValue.
           let numBits = 0;
-          while (hexValue) {
-            if (hexValue & 1) {
-              ++numBits;
+          for (let i = 0; i < channelCountMapping.length; i++) {
+            if (hexValue & (1<<i)) {
+              numBits += channelCountMapping[i];
             }
-            hexValue >>= 1;
           }
-          return numBits;
+          if (numBits) {
+            return numBits;
+          }
+          continue;
         }
 
         // Defined by https://dashif.org/identifiers/audio_source_metadata/ and clause 8.2, in ISO/IEC 23001-8.

package/lib/dash/segment_template.js

@@ -778,7 +778,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
       if (currentTimeline.length) {
         const lastCurrentEntry = currentTimeline[currentTimeline.length - 1];
         newEntries = info.timeline.filter((entry) => {
-          return entry.start >= lastCurrentEntry.end;
+          return entry.end > lastCurrentEntry.end;
         });
       } else {
         newEntries = info.timeline.slice();

package/lib/media/drm_engine.js

@@ -743,6 +743,17 @@ shaka.media.DrmEngine = class {
           return;
         }
       }
+      let duplicate = false;
+      this.storedPersistentSessions_.forEach((metadata, sessionId) => {
+        if (!duplicate &&
+            shaka.util.BufferUtils.equal(initData, metadata.initData)) {
+          duplicate = true;
+        }
+      });
+      if (duplicate) {
+        shaka.log.debug('Ignoring duplicate init data.');
+        return;
+      }
     }
 
     // If there are pre-existing sessions that have all been loaded

package/lib/media/media_source_engine.js

@@ -116,7 +116,7 @@ shaka.media.MediaSourceEngine = class {
     /** @private {boolean} */
     this.playbackHasBegun_ = false;
 
-    /** @private {(MediaSource|ManagedMediaSource)} */
+    /** @private {MediaSource} */
     this.mediaSource_ = this.createMediaSource(this.mediaSourceOpen_);
 
     /** @private {boolean} */
@@ -175,13 +175,16 @@ shaka.media.MediaSourceEngine = class {
    * Replaced by unit tests.
    *
    * @param {!shaka.util.PublicPromise} p
-   * @return {!(MediaSource|ManagedMediaSource)}
+   * @return {!MediaSource}
    */
   createMediaSource(p) {
+    /** @type {!MediaSource} */
+    let mediaSource;
+
     if (window.ManagedMediaSource) {
       this.video_.disableRemotePlayback = true;
 
-      const mediaSource = new ManagedMediaSource();
+      mediaSource = new ManagedMediaSource();
 
       this.eventManager_.listen(
           mediaSource, 'startstreaming', () => {
@@ -192,39 +195,25 @@ shaka.media.MediaSourceEngine = class {
           mediaSource, 'endstreaming', () => {
             this.streamingAllowed_ = false;
           });
-
-      this.eventManager_.listenOnce(
-          mediaSource, 'sourceopen', () => this.onSourceOpen_(p));
-
-      // Correctly set when playback has begun.
-      this.eventManager_.listenOnce(this.video_, 'playing', () => {
-        this.playbackHasBegun_ = true;
-      });
-
-      this.url_ = shaka.media.MediaSourceEngine.createObjectURL(mediaSource);
-
-      this.video_.src = this.url_;
-
-      return mediaSource;
     } else {
-      const mediaSource = new MediaSource();
+      mediaSource = new MediaSource();
+    }
 
-      // Set up MediaSource on the video element.
-      this.eventManager_.listenOnce(
-          mediaSource, 'sourceopen', () => this.onSourceOpen_(p));
+    // Set up MediaSource on the video element.
+    this.eventManager_.listenOnce(
+        mediaSource, 'sourceopen', () => this.onSourceOpen_(p));
 
-      // Correctly set when playback has begun.
-      this.eventManager_.listenOnce(this.video_, 'playing', () => {
-        this.playbackHasBegun_ = true;
-      });
+    // Correctly set when playback has begun.
+    this.eventManager_.listenOnce(this.video_, 'playing', () => {
+      this.playbackHasBegun_ = true;
+    });
 
-      // Store the object URL for releasing it later.
-      this.url_ = shaka.media.MediaSourceEngine.createObjectURL(mediaSource);
+    // Store the object URL for releasing it later.
+    this.url_ = shaka.media.MediaSourceEngine.createObjectURL(mediaSource);
 
-      this.video_.src = this.url_;
+    this.video_.src = this.url_;
 
-      return mediaSource;
-    }
+    return mediaSource;
   }
 
   /**

package/lib/media/playhead.js

@@ -427,7 +427,9 @@ shaka.media.MediaSourcePlayhead = class {
         // infinite loop on systems where changing currentTime takes a
         // significant amount of time (e.g. Chromecast).
         const time = Date.now() / 1000;
-        if (!this.lastCorrectiveSeek_ || this.lastCorrectiveSeek_ < time - 1) {
+        const seekDelay = shaka.util.Platform.isFuchsiaCastDevice() ? 3 : 1;
+        if (!this.lastCorrectiveSeek_ ||
+            this.lastCorrectiveSeek_ < time - seekDelay) {
           this.lastCorrectiveSeek_ = time;
           canCorrectiveSeek = true;
         }

package/lib/player.js

@@ -2803,6 +2803,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       }
     }
     mediaElement.src = playbackUri;
+    // If ManagedMediaSource exists, we've disabled remote playback on our own.
+    // Reenable it so AirPlay can be used via RemotePlayback API.
+    if (this.mediaSourceEngine_ && window.ManagedMediaSource) {
+      mediaElement.disableRemotePlayback = false;
+    }
 
     // Tizen 3 / WebOS won't load anything unless you call load() explicitly,
     // no matter the value of the preload attribute.  This is harmful on some
@@ -7530,7 +7535,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat, max-len
-shaka.Player.version = 'v4.9.29' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.30' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/util/platform.js

@@ -629,7 +629,7 @@ shaka.util.Platform = class {
    *
    * Some devices are known not to support `MediaSource.changeType`
    * well. These devices should use the reload strategy. If a device
-   * reports that it supports `changeType` but support it reliabley
+   * reports that it supports `changeType` but support it unreliably
    * it should be added to this list.
    *
    * @return {boolean}
@@ -638,7 +638,8 @@ shaka.util.Platform = class {
     const Platform = shaka.util.Platform;
     if (Platform.isTizen2() || Platform.isTizen3() || Platform.isTizen4() ||
         Platform.isTizen5() || Platform.isTizen6() || Platform.isWebOS3() ||
-        Platform.isWebOS4() || Platform.isWebOS5()) {
+        Platform.isWebOS4() || Platform.isWebOS5() || Platform.isPS4() ||
+        Platform.isPS5()) {
       return false;
     }
     // Older chromecasts without GoogleTV seem to not support SMOOTH properly.

package/lib/util/player_configuration.js

@@ -11,6 +11,7 @@ goog.require('shaka.abr.SimpleAbrManager');
 goog.require('shaka.config.AutoShowText');
 goog.require('shaka.config.CodecSwitchingStrategy');
 goog.require('shaka.log');
+goog.require('shaka.media.Capabilities');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.ConfigUtils');
 goog.require('shaka.util.FairPlayUtils');
@@ -103,7 +104,8 @@ shaka.util.PlayerConfiguration = class {
 
     let codecSwitchingStrategy = shaka.config.CodecSwitchingStrategy.RELOAD;
     let multiTypeVariantsAllowed = false;
-    if (shaka.util.Platform.supportsSmoothCodecSwitching()) {
+    if (shaka.media.Capabilities.isChangeTypeSupported() &&
+        shaka.util.Platform.supportsSmoothCodecSwitching()) {
       codecSwitchingStrategy = shaka.config.CodecSwitchingStrategy.SMOOTH;
       multiTypeVariantsAllowed = true;
     }

package/package.json

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

package/ui/externs/ui.js

@@ -226,7 +226,8 @@ shaka.extern.UIVolumeBarColors;
  * @property {boolean} seekOnTaps
  *   Indicates whether or not a fast-forward and rewind tap button that seeks
  *   video some seconds.
- *   Defaults to true.
+ *   Defaults to true if the browser <code>navigator.maxTouchPoints > 0</code>
+ *   is true.
  * @property {number} tapSeekDistance
  *   The time interval, in seconds, to seek when the user presses the left or
  *   right part of the video. If less than or equal to 0,

package/ui/remote_button.js

@@ -72,7 +72,7 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
 
     shaka.ui.Utils.setDisplay(this.remoteButton_, false);
 
-    if (!this.video.remote || this.video.disableRemotePlayback) {
+    if (!this.video.remote) {
       this.remoteButton_.classList.add('shaka-hidden');
     } else {
       this.eventManager.listen(
@@ -138,10 +138,11 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
     } else if (this.video.remote.state == 'disconnected') {
       const handleAvailabilityChange = (availability) => {
         if (this.player) {
+          const disableRemote = this.video.disableRemotePlayback;
           const loadMode = this.player.getLoadMode();
           const srcMode = loadMode == shaka.Player.LoadMode.SRC_EQUALS;
           shaka.ui.Utils.setDisplay(
-              this.remoteButton_, srcMode && availability);
+              this.remoteButton_, srcMode && availability && !disableRemote);
         } else {
           shaka.ui.Utils.setDisplay(this.remoteButton_, false);
         }

package/ui/ui.js

@@ -252,7 +252,7 @@ shaka.ui.Overlay = class {
       fullScreenElement: this.videoContainer_,
       preferDocumentPictureInPicture: true,
       showAudioChannelCountVariants: true,
-      seekOnTaps: true,
+      seekOnTaps: navigator.maxTouchPoints > 0,
       tapSeekDistance: 10,
       refreshTickInSeconds: 0.125,
       displayInVrMode: false,
@@ -275,6 +275,9 @@ shaka.ui.Overlay = class {
           (name) => name != 'play_pause' && name != 'volume');
     }
 
+    // Set this button here to push it at the end.
+    config.overflowMenuButtons.push('save_video_frame');
+
     return config;
   }
 
@@ -476,6 +479,8 @@ shaka.ui.Overlay = class {
       video.removeAttribute('src');
     }
 
+    await player.attach(shaka.util.Dom.asHTMLMediaElement(video));
+
     for (const elem of video.querySelectorAll('source')) {
       try { // eslint-disable-next-line no-await-in-loop
         await ui.getControls().getPlayer().load(elem.getAttribute('src'));
@@ -484,8 +489,6 @@ shaka.ui.Overlay = class {
         shaka.log.error('Error auto-loading asset', e);
       }
     }
-
-    await player.attach(shaka.util.Dom.asHTMLMediaElement(video));
   }