shaka-player 4.6.2 → 4.6.4

package/docs/tutorials/ui.md

@@ -204,11 +204,13 @@ constructor.
 // "local" because it is for local playback only, as opposed to the player proxy
 // object, which will route your calls to the ChromeCast receiver as necessary.
 const localPlayer = new shaka.Player();
-await localPlayer.attach(videoElement);
 // "Overlay" because the UI will add DOM elements inside the container,
 // to visually overlay the video element
 const ui = new shaka.ui.Overlay(localPlayer, videoContainerElement,
   videoElement);
+// Now that the player has been configured to be part of a UI, attach it to the
+// video.
+await localPlayer.attach(videoElement);
 
 // As with DOM-based setup, get access to the UI controls and player from the
 // UI.

package/externs/lcevc.js

@@ -1,3 +1,9 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2023 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /**
 * @fileoverview Externs for LcevcDec
 * compiler.

package/externs/shaka/codecs.js

@@ -1,3 +1,9 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2023 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /**
  * @typedef {{
  *   data: !Uint8Array,

package/externs/shaka/transmuxer.js

@@ -1,3 +1,9 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2023 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /**
  * @fileoverview Externs for Transmuxer.
  *

package/lib/ads/client_side_ad_manager.js

@@ -13,6 +13,10 @@ goog.provide('shaka.ads.ClientSideAdManager');
 
 goog.require('goog.asserts');
 goog.require('shaka.ads.ClientSideAd');
+goog.require('shaka.log');
+goog.require('shaka.util.Dom');
+goog.require('shaka.util.EventManager');
+goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IReleasable');
 
 /**

package/lib/ads/media_tailor_ad_manager.js

@@ -15,7 +15,12 @@ goog.require('goog.asserts');
 goog.require('shaka.ads.MediaTailorAd');
 goog.require('shaka.log');
 goog.require('shaka.net.NetworkingEngine');
+goog.require('goog.Uri');
+goog.require('shaka.util.EventManager');
+goog.require('shaka.util.Error');
+goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IReleasable');
+goog.require('shaka.util.PublicPromise');
 goog.require('shaka.util.StringUtils');
 
 

package/lib/ads/server_side_ad_manager.js

@@ -14,7 +14,11 @@ goog.provide('shaka.ads.ServerSideAdManager');
 goog.require('goog.asserts');
 goog.require('shaka.ads.ServerSideAd');
 goog.require('shaka.log');
+goog.require('shaka.util.EventManager');
+goog.require('shaka.util.Error');
+goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.IReleasable');
+goog.require('shaka.util.PublicPromise');
 
 
 /**

package/lib/dash/dash_parser.js

@@ -1433,11 +1433,11 @@ shaka.dash.DashParser = class {
             'Must have Segment* with non-text streams.');
 
         const duration = context.periodInfo.duration || 0;
+        const getBaseUris = context.representation.getBaseUris;
         streamInfo = {
           generateSegmentIndex: () => {
-            const baseUris = context.representation.getBaseUris();
             return Promise.resolve(shaka.media.SegmentIndex.forSingleSegment(
-                periodStart, duration, baseUris));
+                periodStart, duration, getBaseUris()));
           },
         };
       }

package/lib/hls/hls_parser.js

@@ -934,7 +934,8 @@ shaka.hls.HlsParser = class {
         return basicInfo;
       }
     } else if (extension == 'mp4' || extension == 'cmfv' ||
-        contentMimeType == 'video/mp4' || contentMimeType == 'audio/mp4' ||
+        extension == 'm4s' || contentMimeType == 'video/mp4' ||
+        contentMimeType == 'audio/mp4' ||
         contentMimeType == 'video/iso.segment') {
       const basicInfo = shaka.media.SegmentUtils.getBasicInfoFromMp4(
           initData, response.data);
@@ -3752,14 +3753,26 @@ shaka.hls.HlsParser = class {
 
     // If unable to guess mime type, request a segment and try getting it
     // from the response.
+    let contentMimeType;
+    const type = shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_SEGMENT;
     const headRequest = shaka.net.NetworkingEngine.makeRequest(
         middleSegmentUris, this.config_.retryParameters);
-    headRequest.method = 'HEAD';
-    const type = shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_SEGMENT;
-    const response = await this.makeNetworkRequest_(
-        headRequest, requestType, {type});
+    try {
+      headRequest.method = 'HEAD';
+      const response = await this.makeNetworkRequest_(
+          headRequest, requestType, {type});
+
+      contentMimeType = response.headers['content-type'];
+    } catch (error) {
+      if (error && error.code == shaka.util.Error.Code.HTTP_ERROR) {
+        headRequest.method = 'GET';
+        const response = await this.makeNetworkRequest_(
+            headRequest, requestType, {type});
+
+        contentMimeType = response.headers['content-type'];
+      }
+    }
 
-    const contentMimeType = response.headers['content-type'];
     if (contentMimeType) {
       // Split the MIME type in case the server sent additional parameters.
       return contentMimeType.split(';')[0];

package/lib/media/drm_engine.js

@@ -2038,9 +2038,6 @@ shaka.media.DrmEngine = class {
 
     for (const drm1 of drms1) {
       for (const drm2 of drms2) {
-        // This method is only called to compare drmInfos of a video and an
-        // audio adaptations, so we shouldn't have to worry about checking
-        // robustness.
         if (drm1.keySystem == drm2.keySystem) {
           const initDataMap = new Map();
           const bothInitDatas = (drm1.initData || [])

package/lib/media/media_source_engine.js

@@ -1661,6 +1661,7 @@ shaka.media.MediaSourceEngine = class {
     if (shaka.media.Capabilities.isChangeTypeSupported()) {
       if (this.transmuxers_[contentType]) {
         this.transmuxers_[contentType].destroy();
+        delete this.transmuxers_[contentType];
       }
       if (transmuxer) {
         this.transmuxers_[contentType] = transmuxer;
@@ -1859,8 +1860,8 @@ shaka.media.MediaSourceEngine = class {
       }
     }
 
-    const newCodec = MimeUtils.getCodecBase(
-        MimeUtils.getCodecs(newMimeType));
+    const newAllCodecs = MimeUtils.getCodecs(newMimeType);
+    const newCodec = MimeUtils.getCodecBase(newAllCodecs);
     const newBasicType = MimeUtils.getBasicType(newMimeType);
 
     // Current/new codecs base and basic type match then no need to switch
@@ -1868,10 +1869,15 @@ shaka.media.MediaSourceEngine = class {
       return false;
     }
 
-    if (this.config_.codecSwitchingStrategy ===
+    let allowChangeType = true;
+    if (this.needSplitMuxedContent_ || (newAllCodecs.split(',').length &&
+        transmuxer && !this.transmuxers_[contentType])) {
+      allowChangeType = false;
+    }
+
+    if (allowChangeType && this.config_.codecSwitchingStrategy ===
         shaka.config.CodecSwitchingStrategy.SMOOTH &&
-          shaka.media.Capabilities.isChangeTypeSupported() &&
-            !this.needSplitMuxedContent_) {
+          shaka.media.Capabilities.isChangeTypeSupported()) {
       await this.changeType(contentType, newMimeType, transmuxer);
     } else {
       if (transmuxer) {

package/lib/media/streaming_engine.js

@@ -6,7 +6,6 @@
 
 /**
  * @fileoverview
- * @suppress {missingRequire} TODO(b/152540451): this shouldn't be needed
  */
 
 goog.provide('shaka.media.StreamingEngine');
@@ -14,12 +13,14 @@ goog.provide('shaka.media.StreamingEngine');
 goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.media.InitSegmentReference');
+goog.require('shaka.media.ManifestParser');
 goog.require('shaka.media.MediaSourceEngine');
 goog.require('shaka.media.SegmentIterator');
 goog.require('shaka.media.SegmentReference');
 goog.require('shaka.media.SegmentPrefetch');
 goog.require('shaka.net.Backoff');
 goog.require('shaka.net.NetworkingEngine');
+goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.DelayedTick');
 goog.require('shaka.util.Destroyer');
 goog.require('shaka.util.Error');
@@ -28,6 +29,7 @@ goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.Id3Utils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MimeUtils');
+goog.require('shaka.util.Mp4BoxParsers');
 goog.require('shaka.util.Mp4Parser');
 goog.require('shaka.util.Networking');
 
@@ -2203,7 +2205,6 @@ shaka.media.StreamingEngine = class {
    *
    * @return {!Promise.<BufferSource>}
    * @private
-   * @suppress {strictMissingProperties}
    */
   async fetch_(mediaState, reference, streamDataCallback) {
     if (reference instanceof shaka.media.InitSegmentReference) {

package/lib/media/video_wrapper.js

@@ -183,8 +183,8 @@ shaka.media.VideoWrapper = class {
 
 /**
  * A class used to move the playhead away from its current time.  Sometimes,
- * Edge ignores re-seeks. After changing the current time, check every 100ms,
- * retrying if the change was not accepted.
+ * legacy Edge ignores re-seeks. After changing the current time, check every
+ * 100ms, retrying if the change was not accepted.
  *
  * Delay stats over 100 runs of a re-seeking integration test:
  *   Edge   -   0ms -   2%
@@ -194,7 +194,8 @@ shaka.media.VideoWrapper = class {
  *   Edge   - 400ms -   2%
  *   Chrome -   0ms - 100%
  *
- * TODO: File a bug on Edge about this.
+ * Unfortunately, legacy Edge is not receiving updates anymore, but it still
+ * must be supported as it is used for web browsers on XBox.
  *
  * @implements {shaka.util.IReleasable}
  * @final

package/lib/player.js

@@ -5144,7 +5144,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       } else {
         // eslint-disable-next-line no-restricted-syntax
         if (HTMLMediaElement.prototype.addTextTrack) {
-          return new shaka.text.SimpleTextDisplayer(this.video_);
+          return new shaka.text.SimpleTextDisplayer(
+              this.video_, shaka.Player.TextTrackLabel);
         } else {
           shaka.log.warning('Text tracks are not supported by the ' +
                             'browser, disabling.');
@@ -6386,6 +6387,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     }  // if (keyIds.size)
 
     if (tracksChanged) {
+      this.onTracksChanged_();
       const variantsUpdated = this.updateAbrManagerVariants_();
       if (!variantsUpdated) {
         return;
@@ -6397,10 +6399,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       shaka.log.debug('Choosing new streams after key status changed');
       this.chooseVariantAndSwitch_();
     }
-
-    if (tracksChanged) {
-      this.onTracksChanged_();
-    }
   }
 
   /**
@@ -6781,7 +6779,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.6.2' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.6.4' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/simple_text_displayer.js

@@ -6,7 +6,6 @@
 
 /**
  * @fileoverview
- * @suppress {missingRequire} TODO(b/152540451): this shouldn't be needed
  */
 
 goog.provide('shaka.text.SimpleTextDisplayer');
@@ -24,8 +23,11 @@ goog.require('shaka.text.Utils');
  * @export
  */
 shaka.text.SimpleTextDisplayer = class {
-  /** @param {HTMLMediaElement} video */
-  constructor(video) {
+  /**
+   * @param {HTMLMediaElement} video
+   * @param {string} label
+   */
+  constructor(video, label) {
     /** @private {TextTrack} */
     this.textTrack_ = null;
 
@@ -39,7 +41,7 @@ shaka.text.SimpleTextDisplayer = class {
       // element.
       track.mode = 'disabled';
 
-      if (track.label == shaka.Player.TextTrackLabel) {
+      if (track.label == label) {
         this.textTrack_ = track;
       }
     }
@@ -49,8 +51,7 @@ shaka.text.SimpleTextDisplayer = class {
       // kind to 'subtitles' or 'captions' when creating the TextTrack object.
       // The individual text tracks from the manifest will still have their own
       // kinds which can be displayed in the app's UI.
-      this.textTrack_ = video.addTextTrack(
-          'subtitles', shaka.Player.TextTrackLabel);
+      this.textTrack_ = video.addTextTrack('subtitles', label);
     }
     this.textTrack_.mode = 'hidden';
   }
@@ -80,7 +81,7 @@ shaka.text.SimpleTextDisplayer = class {
    * @export
    */
   append(cues) {
-    const flattenedCues = shaka.text.Utils.getCuesToFlatten(cues, []);
+    const flattenedCues = shaka.text.Utils.getCuesToFlatten(cues);
 
     // Convert cues.
     const textTrackCues = [];

package/lib/text/text_utils.js

@@ -15,16 +15,19 @@ shaka.text.Utils = class {
    * their contents should be combined and replace the payload of the parent.
    *
    * @param {!shaka.text.Cue} cue
+   * @param {?shaka.text.Cue=} parentCue
    * @return {string}
    * @private
    */
-  static flattenPayload_(cue) {
+  static flattenPayload_(cue, parentCue) {
     if (cue.lineBreak) {
       // This is a vertical lineBreak, so insert a newline.
       return '\n';
     }
     if (cue.nestedCues.length) {
-      return cue.nestedCues.map(shaka.text.Utils.flattenPayload_).join('');
+      return cue.nestedCues.map((nested) => {
+        return shaka.text.Utils.flattenPayload_(nested, cue);
+      }).join('');
     }
 
     // Handle bold, italics and underline
@@ -43,14 +46,22 @@ shaka.text.Utils = class {
       openStyleTags.push(['u']);
     }
     // Handle color classes, if the value consists of letters
+    let color = cue.color;
+    if (color == '' && parentCue) {
+      color = parentCue.color;
+    }
     let classes = '';
-    const color = shaka.text.Utils.getColorName_(cue.color);
-    if (color) {
-      classes += `.${color}`;
+    const colorName = shaka.text.Utils.getColorName_(color);
+    if (colorName) {
+      classes += `.${colorName}`;
+    }
+    let bgColor = cue.backgroundColor;
+    if (bgColor == '' && parentCue) {
+      bgColor = parentCue.backgroundColor;
     }
-    const bgColor = shaka.text.Utils.getColorName_(cue.backgroundColor);
-    if (bgColor) {
-      classes += `.bg_${bgColor}`;
+    const bgColorName = shaka.text.Utils.getColorName_(bgColor);
+    if (bgColorName) {
+      classes += `.bg_${bgColorName}`;
     }
     if (classes) {
       openStyleTags.push(['c', classes]);
@@ -69,7 +80,20 @@ shaka.text.Utils = class {
    * @private
    */
   static getColorName_(string) {
-    switch (string.toLowerCase()) {
+    let colorString = string.toLowerCase();
+    const rgb = colorString.replace(/\s/g, '')
+        .match(/^rgba?\((\d+),(\d+),(\d+),?([^,\s)]+)?/i);
+    if (rgb) {
+      colorString = '#' +
+          (parseInt(rgb[1], 10) | (1 << 8)).toString(16).slice(1) +
+          (parseInt(rgb[2], 10) | (1 << 8)).toString(16).slice(1) +
+          (parseInt(rgb[3], 10) | (1 << 8)).toString(16).slice(1);
+    } else if (colorString.startsWith('#') && colorString.length > 7) {
+      // With this we lose the alpha of the color, but it is better than having
+      // no color.
+      colorString = colorString.slice(0, 7);
+    }
+    switch (colorString) {
       case 'white':
       case '#fff':
       case '#ffffff':
@@ -92,6 +116,7 @@ shaka.text.Utils = class {
         return 'yellow';
       case 'magenta':
       case '#f0f':
+      case '#ff00ff':
         return 'magenta';
       case 'blue':
       case '#00f':
@@ -118,19 +143,20 @@ shaka.text.Utils = class {
    * isContainer = false.
    *
    * @param {!Array.<!shaka.text.Cue>} cues
-   * @param {!Array.<!shaka.text.Cue>} result
+   * @param {?shaka.text.Cue=} parentCue
    * @return {!Array.<!shaka.text.Cue>}
    */
-  static getCuesToFlatten(cues, result) {
+  static getCuesToFlatten(cues, parentCue) {
+    const result = [];
     for (const cue of cues) {
       if (cue.isContainer) {
         // Recurse to find the actual text payload cues.
-        shaka.text.Utils.getCuesToFlatten(cue.nestedCues, result);
+        result.push(...shaka.text.Utils.getCuesToFlatten(cue.nestedCues, cue));
       } else {
         // Flatten the payload.
         const flatCue = cue.clone();
         flatCue.nestedCues = [];
-        flatCue.payload = shaka.text.Utils.flattenPayload_(cue);
+        flatCue.payload = shaka.text.Utils.flattenPayload_(cue, parentCue);
         result.push(flatCue);
       }
     }

package/lib/text/ui_text_displayer.js

@@ -44,6 +44,9 @@ shaka.text.UITextDisplayer = class {
     /** @private {HTMLElement} */
     this.videoContainer_ = videoContainer;
 
+    /** @private {?number} */
+    this.aspectRatio_ = null;
+
     /** @type {HTMLElement} */
     this.textContainer_ = shaka.util.Dom.createHTMLElement('div');
     this.textContainer_.classList.add('shaka-text-container');
@@ -90,6 +93,23 @@ shaka.text.UITextDisplayer = class {
       this.updateCaptions_(/* forceUpdate= */ true);
     });
 
+    // 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),
+    // if the element's readyState attribute is not HAVE_NOTHING, the user
+    // agent must queue a media element task given the media element to fire an
+    // event named resize at the media element.
+    this.eventManager_.listen(this.video_, 'resize', () => {
+      const element = /** @type {!HTMLVideoElement} */ (this.video_);
+      const width = element.videoWidth;
+      const height = element.videoHeight;
+      if (width && height) {
+        this.aspectRatio_ = width / height;
+      } else {
+        this.aspectRatio_ = null;
+      }
+    });
+
     /** @private {ResizeObserver} */
     this.resizeObserver_ = null;
     if ('ResizeObserver' in window) {
@@ -400,6 +420,10 @@ shaka.text.UITextDisplayer = class {
    */
   getRegionElement_(cue) {
     const region = cue.region;
+    // from https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#caption-window-size
+    // if aspect ratio is 4/3, use that value, otherwise, use the 16:9 value
+    const lineWidthMultiple = this.aspectRatio_ === 4/3 ? 2.5 : 1.9;
+    const lineHeightMultiple = 5.33;
 
     const regionId = this.generateRegionId_(region);
     if (this.regionElements_.has(regionId)) {
@@ -417,11 +441,33 @@ shaka.text.UITextDisplayer = class {
     regionElement.id = 'shaka-text-region---' + regionId;
     regionElement.classList.add('shaka-text-region');
 
-    regionElement.style.height = region.height + heightUnit;
-    regionElement.style.width = region.width + widthUnit;
     regionElement.style.position = 'absolute';
-    regionElement.style.top = region.viewportAnchorY + viewportAnchorUnit;
-    regionElement.style.left = region.viewportAnchorX + viewportAnchorUnit;
+
+    const linesUnit = shaka.text.CueRegion.units.LINES;
+    if (region.heightUnits === linesUnit && region.widthUnits === linesUnit) {
+      regionElement.style.height = region.height * lineHeightMultiple + '%';
+      regionElement.style.width = region.width * lineWidthMultiple + '%';
+    } else {
+      regionElement.style.height = region.height + heightUnit;
+      regionElement.style.width = region.width + widthUnit;
+    }
+
+    if (region.viewportAnchorUnits === linesUnit) {
+      // from https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#positioning-in-cea-708
+      let top = region.viewportAnchorY / 75 * 100;
+      const windowWidth = this.aspectRatio_ === 4/3 ? 160 : 210;
+      let left = region.viewportAnchorX / windowWidth * 100;
+      // adjust top and left values based on the region anchor and window size
+      top -= region.regionAnchorY * region.height * lineHeightMultiple / 100;
+      left -= region.regionAnchorX * region.width * lineWidthMultiple / 100;
+      regionElement.style.top = top + '%';
+      regionElement.style.left = left + '%';
+    } else {
+      regionElement.style.top = region.viewportAnchorY -
+        region.regionAnchorY * region.height / 100 + viewportAnchorUnit;
+      regionElement.style.left = region.viewportAnchorX -
+        region.regionAnchorX * region.width / 100 + viewportAnchorUnit;
+    }
 
     regionElement.style.display = 'flex';
     regionElement.style.flexDirection = 'column';
@@ -661,37 +707,46 @@ shaka.text.UITextDisplayer = class {
     //   (for vertical growing left) is aligned at the line.
     // TODO: Implement line alignment with line number.
     // TODO: Implement lineAlignment of 'CENTER'.
-    if (cue.line != null) {
+    let line = cue.line;
+    if (line != null) {
       let lineInterpretation = cue.lineInterpretation;
       // HACK: the current implementation of UITextDisplayer only handled
-      // PERCENTAGE, as cue.line=0 is zero, we can interpret it as percentage
-      // safely.
-      if (cue.line == 0 &&
-          lineInterpretation == Cue.lineInterpretation.LINE_NUMBER) {
+      // PERCENTAGE, so we need convert LINE_NUMBER to PERCENTAGE
+      if (lineInterpretation == Cue.lineInterpretation.LINE_NUMBER) {
         lineInterpretation = Cue.lineInterpretation.PERCENTAGE;
+        let maxLines = 16;
+        // The maximum number of lines is different if it is a vertical video.
+        if (this.aspectRatio_ && this.aspectRatio_ < 1) {
+          maxLines = 32;
+        }
+        if (line < 0) {
+          line = 100 + line / maxLines * 100;
+        } else {
+          line = line / maxLines * 100;
+        }
       }
       if (lineInterpretation == Cue.lineInterpretation.PERCENTAGE) {
         style.position = 'absolute';
         if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
           style.width = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {
-            style.top = cue.line + '%';
+            style.top = line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
-            style.bottom = (100 - cue.line) + '%';
+            style.bottom = (100 - line) + '%';
           }
         } else if (cue.writingMode == Cue.writingMode.VERTICAL_LEFT_TO_RIGHT) {
           style.height = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {
-            style.left = cue.line + '%';
+            style.left = line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
-            style.right = (100 - cue.line) + '%';
+            style.right = (100 - line) + '%';
           }
         } else {
           style.height = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {
-            style.right = cue.line + '%';
+            style.right = line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
-            style.left = (100 - cue.line) + '%';
+            style.left = (100 - line) + '%';
           }
         }
       }

package/lib/text/web_vtt_generator.js

@@ -40,7 +40,7 @@ shaka.text.WebVttGenerator = class {
           milliseconds;
     };
 
-    const flattenedCues = shaka.text.Utils.getCuesToFlatten(cues, []);
+    const flattenedCues = shaka.text.Utils.getCuesToFlatten(cues);
 
     let webvttString = 'WEBVTT\n\n';
     for (const cue of flattenedCues) {

package/lib/util/mp4_box_parsers.js

@@ -301,11 +301,45 @@ shaka.util.Mp4BoxParsers = class {
    */
   static parseESDS(reader) {
     let codec = 'mp4a';
-    reader.skip(11);
-    codec += '.' + this.toHex_(reader.readUint8());
-    // this value is only a single digit
-    codec += '.' +
-        this.toHex_((reader.readUint8() >>> 2) & 0x3f).replace(/^0/, '');
+    let tag;
+    let oti;
+    while (reader.hasMoreData()) {
+      tag = reader.readUint8();
+      let byteRead = reader.readUint8();
+      while (byteRead & 0x80) {
+        byteRead = reader.readUint8();
+      }
+      if (tag == 0x03) {
+        reader.readUint16();
+        const flags = reader.readUint8();
+        if (flags & 0x80) {
+          reader.readUint16();
+        }
+        if (flags & 0x40) {
+          reader.skip(reader.readUint8());
+        }
+        if (flags & 0x20) {
+          reader.readUint16();
+        }
+      } else if (tag == 0x04) {
+        oti = reader.readUint8();
+        reader.skip(12);
+      } else if (tag == 0x05) {
+        break;
+      }
+    }
+    if (oti) {
+      codec += '.' + this.toHex_(oti);
+      if (tag == 0x05 && reader.hasMoreData()) {
+        const firstData = reader.readUint8();
+        let audioObjectType = (firstData & 0xF8) >> 3;
+        if (audioObjectType === 31 && reader.hasMoreData()) {
+          audioObjectType = 32 + ((firstData & 0x7) << 3) +
+              ((reader.readUint8() & 0xE0) >> 5);
+        }
+        codec += '.' + audioObjectType;
+      }
+    }
     return {codec};
   }
 

package/package.json

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