shaka-player 4.13.1 → 4.13.2

package/lib/media/preload_manager.js

@@ -92,7 +92,10 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     /** @private {boolean} */
     this.parserEntrusted_ = false;
 
-    /** @private {!shaka.media.RegionTimeline} */
+    /**
+     * @private {!shaka.media.RegionTimeline<
+     *     shaka.extern.TimelineRegionInfo>}
+     */
     this.regionTimeline_ = typedPlayerInterface.regionTimeline;
 
     /** @private {boolean} */
@@ -288,7 +291,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
   /**
    * Gets the region timeline, if it exists. Also marks that the timeline should
    * not be released if this manager is destroyed.
-   * @return {?shaka.media.RegionTimeline}
+   * @return {?shaka.media.RegionTimeline<shaka.extern.TimelineRegionInfo>}
    */
   receiveRegionTimeline() {
     this.regionTimelineEntrusted_ = true;
@@ -296,7 +299,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
   }
 
   /**
-   * @return {?shaka.media.RegionTimeline}
+   * @return {?shaka.media.RegionTimeline<shaka.extern.TimelineRegionInfo>}
    */
   getRegionTimeline() {
     return this.regionTimeline_;
@@ -837,7 +840,8 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
  * @typedef {{
  *   config: !shaka.extern.PlayerConfiguration,
  *   manifestPlayerInterface: !shaka.extern.ManifestParser.PlayerInterface,
- *   regionTimeline: !shaka.media.RegionTimeline,
+ *   regionTimeline: !shaka.media.RegionTimeline<
+ *       shaka.extern.TimelineRegionInfo>,
  *   qualityObserver: ?shaka.media.QualityObserver,
  *   createDrmEngine: function():!shaka.drm.DrmEngine,
  *   networkingEngine: !shaka.net.NetworkingEngine,
@@ -849,7 +853,8 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
  * @property {!shaka.extern.PlayerConfiguration} config
  * @property {!shaka.extern.ManifestParser.PlayerInterface
  *           } manifestPlayerInterface
- * @property {!shaka.media.RegionTimeline} regionTimeline
+ * @property {!shaka.media.RegionTimeline<shaka.extern.TimelineRegionInfo>
+ *           } regionTimeline
  * @property {?shaka.media.QualityObserver} qualityObserver
  * @property {function():!shaka.drm.DrmEngine} createDrmEngine
  * @property {!shaka.net.NetworkingEngine} networkingEngine

package/lib/media/region_observer.js

@@ -18,6 +18,7 @@ goog.require('shaka.util.FakeEventTarget');
  * ('enter', 'exit', 'skip') as the playhead moves.
  *
  * @implements {shaka.media.IPlayheadObserver}
+ * @template T
  * @final
  */
 shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
@@ -26,13 +27,13 @@ shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
    * own the timeline, only uses it. This means that the observer should NOT
    * destroy the timeline.
    *
-   * @param {!shaka.media.RegionTimeline} timeline
+   * @param {!shaka.media.RegionTimeline<T>} timeline
    * @param {boolean} startsPastZero
    */
   constructor(timeline, startsPastZero) {
     super();
 
-    /** @private {shaka.media.RegionTimeline} */
+    /** @private {shaka.media.RegionTimeline<T>} */
     this.timeline_ = timeline;
 
     /**
@@ -50,8 +51,7 @@ shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
      * When the value here differs from what we calculate, it means we moved and
      * should fire an event.
      *
-     * @private {!Map<shaka.extern.TimelineRegionInfo,
-     *                 shaka.media.RegionObserver.RelativePosition_>}
+     * @private {!Map<T, shaka.media.RegionObserver.RelativePosition_>}
      */
     this.oldPosition_ = new Map();
 
@@ -109,7 +109,7 @@ shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
     this.eventManager_ = new shaka.util.EventManager();
 
     this.eventManager_.listen(this.timeline_, 'regionremove', (event) => {
-      /** @type {shaka.extern.TimelineRegionInfo} */
+      /** @type {T} */
       const region = event['region'];
       this.oldPosition_.delete(region);
     });
@@ -162,7 +162,7 @@ shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
    * same parameters: region and seeking.
    *
    * @param {string} eventType
-   * @param {shaka.extern.TimelineRegionInfo} region
+   * @param {T} region
    * @param {boolean} seeking
    * @private
    */
@@ -179,7 +179,8 @@ shaka.media.RegionObserver = class extends shaka.util.FakeEventTarget {
    * at |seconds|. We treat the region's start and end times as inclusive
    * bounds.
    *
-   * @param {shaka.extern.TimelineRegionInfo} region
+   * @template T
+   * @param {T} region
    * @param {number} seconds
    * @return {shaka.media.RegionObserver.RelativePosition_}
    * @private
@@ -218,7 +219,7 @@ shaka.media.RegionObserver.RelativePosition_ = {
  * region that the playhead is interacting with and whether or not the playhead
  * moving is part of a seek event.
  *
- * @typedef {function(shaka.extern.TimelineRegionInfo, boolean)}
+ * @typedef {function(?, boolean)}
  */
 shaka.media.RegionObserver.EventListener;
 

package/lib/media/region_timeline.js

@@ -18,6 +18,7 @@ goog.require('shaka.util.Timer');
  * deleted, the 'regionremove' event will be fired.
  *
  * @implements {shaka.util.IReleasable}
+ * @template T
  * @final
  */
 shaka.media.RegionTimeline = class extends shaka.util.FakeEventTarget {
@@ -27,7 +28,7 @@ shaka.media.RegionTimeline = class extends shaka.util.FakeEventTarget {
   constructor(getSeekRange) {
     super();
 
-    /** @private {!Set<shaka.extern.TimelineRegionInfo>} */
+    /** @private {!Set<T>} */
     this.regions_ = new Set();
 
     /** @private {!function():{start: number, end: number}} */
@@ -54,7 +55,7 @@ shaka.media.RegionTimeline = class extends shaka.util.FakeEventTarget {
   }
 
   /**
-   * @param {shaka.extern.TimelineRegionInfo} region
+   * @param {T} region
    */
   addRegion(region) {
     const similarRegion = this.findSimilarRegion_(region);
@@ -97,18 +98,19 @@ shaka.media.RegionTimeline = class extends shaka.util.FakeEventTarget {
    * to be the same region. If no similar region can be found, |null| will be
    * returned.
    *
-   * @param {shaka.extern.TimelineRegionInfo} region
-   * @return {?shaka.extern.TimelineRegionInfo}
+   * @param {T} region
+   * @return {?T}
    * @private
    */
   findSimilarRegion_(region) {
+    const isDiffNegligible = (a, b) => Math.abs(a - b) < 0.1;
     for (const existing of this.regions_) {
       // The same scheme ID and time range means that it is similar-enough to
       // be the same region.
       const isSimilar = existing.schemeIdUri == region.schemeIdUri &&
-                        existing.id == region.id &&
-                        existing.startTime == region.startTime &&
-                        existing.endTime == region.endTime;
+          existing.id == region.id &&
+          isDiffNegligible(existing.startTime, region.startTime) &&
+          isDiffNegligible(existing.endTime, region.endTime);
 
       if (isSimilar) {
         return existing;
@@ -123,7 +125,7 @@ shaka.media.RegionTimeline = class extends shaka.util.FakeEventTarget {
    * others to see what regions are in the timeline while not being able to
    * change the collection.
    *
-   * @return {!Iterable<shaka.extern.TimelineRegionInfo>}
+   * @return {!Iterable<T>}
    */
   regions() {
     return this.regions_;

package/lib/media/streaming_engine.js

@@ -1368,12 +1368,17 @@ shaka.media.StreamingEngine = class {
       return null;
     }
 
+    // Update updateIntervalSeconds according to our current playbackrate,
+    // and always considering a minimum of 1.
+    const updateIntervalSeconds = this.config_.updateIntervalSeconds /
+        Math.max(1, Math.abs(this.playerInterface_.getPlaybackRate()));
+
     if (!this.playerInterface_.mediaSourceEngine.isStreamingAllowed() &&
         mediaState.type != ContentType.TEXT) {
       // It is not allowed to add segments yet, so we schedule an update to
       // check again later. So any prediction we make now could be terribly
       // invalid soon.
-      return this.config_.updateIntervalSeconds / 2;
+      return updateIntervalSeconds / 2;
     }
 
     const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
@@ -1445,9 +1450,8 @@ shaka.media.StreamingEngine = class {
       shaka.log.v2(logPrefix, 'buffering goal met');
 
       // Do not try to predict the next update.  Just poll according to
-      // configuration (seconds). The playback rate can change at any time, so
-      // any prediction we make now could be terribly invalid soon.
-      return this.config_.updateIntervalSeconds / 2;
+      // configuration (seconds).
+      return updateIntervalSeconds / 2;
     }
 
     // Lack of segment iterator is the best indicator stream has changed.
@@ -1459,7 +1463,7 @@ shaka.media.StreamingEngine = class {
       // In any case just try again... if the manifest is incomplete or is not
       // being updated then we'll idle forever; otherwise, we'll end up getting
       // a SegmentReference eventually.
-      return this.config_.updateIntervalSeconds;
+      return updateIntervalSeconds;
     }
     // Get media state adaptation and reset this value. By guarding it during
     // actual stream change we ensure it won't be cleaned by accident on regular
@@ -1498,7 +1502,7 @@ shaka.media.StreamingEngine = class {
       // For example, let video buffering catch up to audio buffering before
       // fetching another audio segment.
       shaka.log.v2(logPrefix, 'waiting for other streams to buffer');
-      return this.config_.updateIntervalSeconds;
+      return updateIntervalSeconds;
     }
 
     if (mediaState.segmentPrefetch && mediaState.segmentIterator &&
@@ -1821,7 +1825,19 @@ shaka.media.StreamingEngine = class {
           JSON.stringify(buffered));
 
       if (!mediaState.waitingToClearBuffer) {
-        this.playerInterface_.onSegmentAppended(reference, mediaState.stream);
+        let otherState = null;
+        if (mediaState.type === ContentType.VIDEO) {
+          otherState = this.mediaStates_.get(ContentType.AUDIO);
+        } else if (mediaState.type === ContentType.AUDIO) {
+          otherState = this.mediaStates_.get(ContentType.VIDEO);
+        }
+        if (otherState && otherState.type == ContentType.AUDIO) {
+          this.playerInterface_.onSegmentAppended(reference, mediaState.stream,
+              otherState.stream.isAudioMuxedInVideo);
+        } else {
+          this.playerInterface_.onSegmentAppended(reference, mediaState.stream,
+              mediaState.stream.codecs.includes(','));
+        }
       }
 
       // Update right away.
@@ -2885,7 +2901,7 @@ shaka.media.StreamingEngine = class {
  *   onError: function(!shaka.util.Error),
  *   onEvent: function(!Event),
  *   onSegmentAppended: function(!shaka.media.SegmentReference,
- *     !shaka.extern.Stream),
+ *     !shaka.extern.Stream, boolean),
  *   onInitSegmentAppended: function(!number,!shaka.media.InitSegmentReference),
  *   beforeAppendSegment: function(
  *     shaka.util.ManifestParserUtils.ContentType,!BufferSource):Promise,
@@ -2910,7 +2926,7 @@ shaka.media.StreamingEngine = class {
  * @property {function(!Event)} onEvent
  *   Called when an event occurs that should be sent to the app.
  * @property {function(!shaka.media.SegmentReference,
- *     !shaka.extern.Stream)} onSegmentAppended
+ *     !shaka.extern.Stream, boolean)} onSegmentAppended
  *   Called after a segment is successfully appended to a MediaSource.
  * @property {function(!number,
  *                     !shaka.media.InitSegmentReference)} onInitSegmentAppended

package/lib/player.js

@@ -54,6 +54,7 @@ goog.require('shaka.util.Functional');
 goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.LanguageUtils');
 goog.require('shaka.util.ManifestParserUtils');
+goog.require('shaka.util.MapUtils');
 goog.require('shaka.util.MediaReadyState');
 goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Mutex');
@@ -698,7 +699,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     /** @private {shaka.media.BufferingObserver} */
     this.bufferObserver_ = null;
 
-    /** @private {shaka.media.RegionTimeline} */
+    /**
+     * @private {shaka.media.RegionTimeline<
+     *     shaka.extern.TimelineRegionInfo>}
+     */
     this.regionTimeline_ = null;
 
     /** @private {shaka.util.CmcdManager} */
@@ -3591,6 +3595,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     // Create the region observer. This will allow us to notify the app when we
     // move in and out of timeline regions.
+    /** @type {!shaka.media.RegionObserver<shaka.extern.TimelineRegionInfo>} */
     const regionObserver = new shaka.media.RegionObserver(
         this.regionTimeline_, startsPastZero);
 
@@ -3808,10 +3813,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       netEngine: this.networkingEngine_,
       onError: (error) => this.onError_(error),
       onEvent: (event) => this.dispatchEvent(event),
-      onSegmentAppended: (reference, stream) => {
+      onSegmentAppended: (reference, stream, isMuxed) => {
         this.onSegmentAppended_(
-            reference.startTime, reference.endTime, stream.type,
-            stream.codecs.includes(','));
+            reference.startTime, reference.endTime, stream.type, isMuxed);
       },
       onInitSegmentAppended: (position, initSegment) => {
         const mediaQuality = initSegment.getMediaQuality();
@@ -4723,7 +4727,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       shaka.log.alwaysWarn('A trick play rate of 0 is unsupported!');
       return;
     }
-    this.trickPlayEventManager_.removeAll();
 
     this.playRateController_.set(rate);
 
@@ -4732,26 +4735,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.streamingEngine_.setTrickPlay(
           useTrickPlayTrack && Math.abs(rate) > 1);
     }
-    if (this.isLive()) {
-      this.trickPlayEventManager_.listen(this.video_, 'timeupdate', () => {
-        const currentTime = this.video_.currentTime;
-        const seekRange = this.seekRange();
-        const safeSeekOffset = this.config_.streaming.safeSeekOffset;
-
-        // Cancel trick play if we hit the beginning or end of the seekable
-        // (Sub-second accuracy not required here)
-        if (rate > 0) {
-          if (Math.floor(currentTime) >= Math.floor(seekRange.end)) {
-            this.cancelTrickPlay();
-          }
-        } else {
-          if (Math.floor(currentTime) <=
-              Math.floor(seekRange.start + safeSeekOffset)) {
-            this.cancelTrickPlay();
-          }
-        }
-      });
-    }
+    this.setupTrickPlayEventListeners_(rate);
   }
 
   /**
@@ -5825,12 +5809,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * is playing.
    */
   getLiveLatency() {
-    if (!this.video_) {
+    if (!this.video_ || !this.video_.currentTime) {
       return null;
     }
     const now = this.getPresentationStartTimeAsDate().getTime() +
       this.video_.currentTime * 1000;
-    return Date.now() - now;
+
+    return Math.floor(Date.now() - now);
   }
 
   /**
@@ -6867,6 +6852,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // The playback rate has changed. This could be us or someone else.
       // If this was us, setting the rate again will be a no-op.
       this.playRateController_.set(newRate);
+
+      if (this.loadMode_ == shaka.Player.LoadMode.MEDIA_SOURCE) {
+        this.abrManager_.playbackRateChanged(newRate);
+      }
+      this.setupTrickPlayEventListeners_(newRate);
     }
 
     const event = shaka.Player.makeEvent_(
@@ -6874,6 +6864,36 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     this.dispatchEvent(event);
   }
 
+  /**
+   * Configures all the necessary listeners when trick play is being performed.
+   *
+   * @param {number} rate
+   * @private
+   */
+  setupTrickPlayEventListeners_(rate) {
+    this.trickPlayEventManager_.removeAll();
+    if (this.isLive()) {
+      this.trickPlayEventManager_.listen(this.video_, 'timeupdate', () => {
+        const currentTime = this.video_.currentTime;
+        const seekRange = this.seekRange();
+        const safeSeekOffset = this.config_.streaming.safeSeekOffset;
+
+        // Cancel trick play if we hit the beginning or end of the seekable
+        // (Sub-second accuracy not required here)
+        if (rate > 0) {
+          if (Math.floor(currentTime) >= Math.floor(seekRange.end)) {
+            this.cancelTrickPlay();
+          }
+        } else {
+          if (Math.floor(currentTime) <=
+              Math.floor(seekRange.start + safeSeekOffset)) {
+            this.cancelTrickPlay();
+          }
+        }
+      });
+    }
+  }
+
   /**
    * Try updating the state history. If the player has not finished
    * initializing, this will be a no-op.
@@ -8042,6 +8062,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     // Only filter tracks for keys if we have some key statuses to look at.
     if (keyIds.length) {
+      const currentKeySystem = this.keySystem();
+      const clearKeys = shaka.util.MapUtils.asMap(this.config_.drm.clearKeys);
+
       for (const variant of this.manifest_.variants) {
         const streams = shaka.util.StreamUtils.getVariantStreams(variant);
 
@@ -8051,16 +8074,42 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           // Only update if we have key IDs for the stream.  If the keys aren't
           // all present, then the track should be restricted.
           if (stream.keyIds.size) {
-            variant.allowedByKeySystem = true;
-
-            for (const keyId of stream.keyIds) {
-              const keyStatus = keyStatusMap[isGlobalStatus ? '00' : keyId];
-              if (keyStatus || this.drmEngine_.hasManifestInitData()) {
-                variant.allowedByKeySystem = variant.allowedByKeySystem &&
-                    !!keyStatus && !restrictedStatuses.includes(keyStatus);
-              }
-            }
-          }
+            // If we are not using clearkeys, and the stream has drmInfos we
+            // only want to check the keyIds of the keySystem we are using.
+            // Other keySystems might have other keyIds that might not be
+            // valid in this case. This can happen in HLS if the manifest
+            // has Widevine with keyIds and PlayReady without keyIds and we are
+            // using PlayReady.
+            if (stream.drmInfos.length && !clearKeys.size) {
+              for (const drmInfo of stream.drmInfos) {
+                if (drmInfo.keyIds.size &&
+                    drmInfo.keySystem == currentKeySystem) {
+                  variant.allowedByKeySystem = true;
+
+                  for (const keyId of drmInfo.keyIds) {
+                    const keyStatus =
+                        keyStatusMap[isGlobalStatus ? '00' : keyId];
+                    if (keyStatus || this.drmEngine_.hasManifestInitData()) {
+                      variant.allowedByKeySystem =
+                          variant.allowedByKeySystem &&
+                          !!keyStatus &&
+                          !restrictedStatuses.includes(keyStatus);
+                    } // if (keyStatus || this.drmEngine_.hasManifestInitData())
+                  } // for (const keyId of drmInfo.keyIds)
+                } // if (drmInfo.keyIds.size && ...
+              } // for (const drmInfo of stream.drmInfos
+            } else {
+              variant.allowedByKeySystem = true;
+
+              for (const keyId of stream.keyIds) {
+                const keyStatus = keyStatusMap[isGlobalStatus ? '00' : keyId];
+                if (keyStatus || this.drmEngine_.hasManifestInitData()) {
+                  variant.allowedByKeySystem = variant.allowedByKeySystem &&
+                      !!keyStatus && !restrictedStatuses.includes(keyStatus);
+                }
+              } // for (const keyId of stream.keyIds)
+            } // if (stream.drmInfos.length && !clearKeys.size)
+          } // if (stream.keyIds.size)
 
           if (originalAllowed != variant.allowedByKeySystem) {
             tracksChanged = true;
@@ -8386,7 +8435,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.13.1' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.13.2' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/cue.js

@@ -371,8 +371,12 @@ shaka.text.Cue = class {
     // performance optimization.  We can avoid the more expensive recursive
     // checks if the top-level properties don't match.
     // See: https://github.com/shaka-project/shaka-player/issues/3018
-    if (cue1.startTime != cue2.startTime || cue1.endTime != cue2.endTime ||
-      cue1.payload != cue2.payload) {
+    if (cue1.payload != cue2.payload) {
+      return false;
+    }
+    const isDiffNegligible = (a, b) => Math.abs(a - b) < 0.001;
+    if (!isDiffNegligible(cue1.startTime, cue2.startTime) ||
+        !isDiffNegligible(cue1.endTime, cue2.endTime)) {
       return false;
     }
     for (const k in cue1) {

package/lib/text/ui_text_displayer.js

@@ -55,6 +55,9 @@ shaka.text.UITextDisplayer = class {
     /** @private {?number} */
     this.aspectRatio_ = null;
 
+    /** @private {?shaka.extern.TextDisplayerConfiguration} */
+    this.config_ = null;
+
     /** @type {HTMLElement} */
     this.textContainer_ = shaka.util.Dom.createHTMLElement('div');
     this.textContainer_.classList.add('shaka-text-container');
@@ -77,7 +80,8 @@ shaka.text.UITextDisplayer = class {
       if (!this.video_.paused) {
         this.updateCaptions_();
       }
-    }).tickEvery(/* seconds= */ 0.25);
+    });
+    this.configureCaptionsTimer_();
 
     /**
      * Maps cues to cue elements. Specifically points out the wrapper element of
@@ -101,6 +105,10 @@ shaka.text.UITextDisplayer = class {
       this.updateCaptions_(/* forceUpdate= */ true);
     });
 
+    this.eventManager_.listen(this.video_, 'ratechange', () => {
+      this.configureCaptionsTimer_();
+    });
+
     // From: https://html.spec.whatwg.org/multipage/media.html#dom-video-videowidth
     // Whenever the natural width or natural height of the video changes
     // (including, for example, because the selected video track was changed),
@@ -137,9 +145,8 @@ shaka.text.UITextDisplayer = class {
    * @export
    */
   configure(config) {
-    if (this.captionsTimer_) {
-      this.captionsTimer_.tickEvery(config.captionsUpdatePeriod);
-    }
+    this.config_ = config;
+    this.configureCaptionsTimer_();
   }
 
 
@@ -186,6 +193,7 @@ shaka.text.UITextDisplayer = class {
     this.cues_ = [];
     if (this.captionsTimer_) {
       this.captionsTimer_.stop();
+      this.captionsTimer_ = null;
     }
 
     this.currentCuesMap_.clear();
@@ -265,6 +273,19 @@ shaka.text.UITextDisplayer = class {
   enableTextDisplayer() {
   }
 
+  /**
+   * @private
+   */
+  configureCaptionsTimer_() {
+    if (this.captionsTimer_) {
+      const captionsUpdatePeriod = this.config_ ?
+          this.config_.captionsUpdatePeriod : 0.25;
+      const updateTime = captionsUpdatePeriod /
+          Math.max(1, Math.abs(this.video_.playbackRate));
+      this.captionsTimer_.tickEvery(updateTime);
+    }
+  }
+
   /**
    * @private
    */

package/lib/util/platform.js

@@ -307,13 +307,15 @@ shaka.util.Platform = class {
         !shaka.util.Platform.isTizen() &&
         !shaka.util.Platform.isEOS() &&
         !shaka.util.Platform.isAPL() &&
+        !shaka.util.Platform.isAPP() &&
         !shaka.util.Platform.isVirginMedia() &&
         !shaka.util.Platform.isOrange() &&
         !shaka.util.Platform.isPS4() &&
         !shaka.util.Platform.isAmazonFireTV() &&
         !shaka.util.Platform.isComcastX1() &&
         !shaka.util.Platform.isZenterio() &&
-        !shaka.util.Platform.isSkyQ();
+        !shaka.util.Platform.isSkyQ() &&
+        !shaka.util.Platform.isMultiChoice();
   }
 
   /**
@@ -396,6 +398,16 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('DT_STB_BCM');
   }
 
+  /**
+   * Check if the current platform is a MultiChoice STB.
+   * @return {boolean}
+   */
+  static isMultiChoice() {
+    // cspell: ignore MDMP
+    return shaka.util.Platform.userAgentContains_('MDMP1001S') ||
+      shaka.util.Platform.userAgentContains_('PS5525IMC');
+  }
+
   /**
    * Returns a major version number for Safari, or Safari-based iOS browsers.
    *
@@ -461,6 +473,14 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('PC=APL');
   }
 
+  /**
+   * Check if the current platform is an APPSTB set-top box.
+   * @return {boolean}
+   */
+  static isAPP() {
+    return shaka.util.Platform.userAgentContains_('PC=APPSTB');
+  }
+
   /**
    * Guesses if the platform is a mobile one (iOS or Android).
    *
@@ -568,7 +588,8 @@ shaka.util.Platform = class {
         Platform.isEOS() || Platform.isAPL() ||
         Platform.isVirginMedia() || Platform.isOrange() ||
         Platform.isComcastX1() || Platform.isChromecast() ||
-        Platform.isHisense() || Platform.isZenterio()) {
+        Platform.isHisense() || Platform.isZenterio() ||
+        Platform.isAPP() || Platform.isMultiChoice()) {
       return true;
     }
     return false;
@@ -662,7 +683,7 @@ shaka.util.Platform = class {
   static supportsSequenceMode() {
     const Platform = shaka.util.Platform;
     if (Platform.isTizen3() || Platform.isTizen2() ||
-        Platform.isWebOS3() || Platform.isPS4()) {
+        Platform.isWebOS3() || Platform.isPS4() || Platform.isPS5()) {
       return false;
     }
     return true;

package/lib/util/stream_utils.js

@@ -1267,6 +1267,9 @@ shaka.util.StreamUtils = class {
    * @return {shaka.extern.Track}
    */
   static variantToTrack(variant) {
+    const ManifestParserUtils = shaka.util.ManifestParserUtils;
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
+
     /** @type {?shaka.extern.Stream} */
     const audio = variant.audio;
     /** @type {?shaka.extern.Stream} */
@@ -1385,6 +1388,16 @@ shaka.util.StreamUtils = class {
         track.audioSamplingRate = video.audioSamplingRate;
         track.spatialAudio = video.spatialAudio;
         track.originalLanguage = video.originalLanguage;
+        track.audioMimeType = videoMimeType;
+        const allCodecs = videoCodec.split(',');
+        try {
+          track.videoCodec = ManifestParserUtils.guessCodecs(
+              ContentType.VIDEO, allCodecs);
+          track.audioCodec = ManifestParserUtils.guessCodecs(
+              ContentType.AUDIO, allCodecs);
+        } catch (e) {
+          // Ignore this error.
+        }
       }
     }
 

package/package.json

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

package/project-words.txt

@@ -160,6 +160,7 @@ linksource
 longname
 
 # 3rd party
+APPSTB
 Bitcodin
 Brightcove
 Broadpeak