shaka-player 4.3.11 → 4.3.13

package/docs/tutorials/faq.md

@@ -153,7 +153,7 @@ In other environments, for example Electron, it is appropriate.
 In those cases, before Shaka Player loads a manifest, you can register the
 existing http plugin for `file://` requests:
 ```js
-shaka.net.NetworkingEngine.registerScheme('file', shaka.net.HttpXHRPlugin);
+shaka.net.NetworkingEngine.registerScheme('file', shaka.net.HttpXHRPlugin.parse);
 ```
 
 <hr>

package/docs/tutorials/offline.md

@@ -537,7 +537,7 @@ function downloadContent(manifestUri, title) {
     'downloaded': Date()
   };
 
-  return window.storage.store(manifestUri, metadata);
+  return window.storage.store(manifestUri, metadata).promise;
 }
 
 /*

package/lib/dash/dash_parser.js

@@ -522,7 +522,10 @@ shaka.dash.DashParser = class {
       // Just update the variants and text streams, which may change as periods
       // are added or removed.
       this.manifest_.variants = this.periodCombiner_.getVariants();
-      this.manifest_.textStreams = this.periodCombiner_.getTextStreams();
+      const textStreams = this.periodCombiner_.getTextStreams();
+      if (textStreams.length > 0) {
+        this.manifest_.textStreams = textStreams;
+      }
       this.manifest_.imageStreams = this.periodCombiner_.getImageStreams();
 
       // Re-filter the manifest.  This will check any configured restrictions on

package/lib/hls/hls_parser.js

@@ -774,7 +774,7 @@ shaka.hls.HlsParser = class {
     // enough info here to determine the presentation type and duration.
     if (playlist.type == shaka.hls.PlaylistType.MEDIA) {
       if (this.isLive_()) {
-        this.changePresentationTimelineToLive_();
+        this.changePresentationTimelineToLive_(playlist);
         const delay = this.updatePlaylistDelay_;
         this.updatePlaylistTimer_.tickAfter(/* seconds= */ delay);
       }
@@ -1440,7 +1440,14 @@ shaka.hls.HlsParser = class {
     for (const tag of closedCaptionsTags) {
       goog.asserts.assert(tag.name == 'EXT-X-MEDIA',
           'Should only be called on media tags!');
-      const language = this.getLanguage_(tag);
+      const languageValue = tag.getAttributeValue('LANGUAGE');
+      let language = this.getLanguage_(tag);
+      if (!languageValue) {
+        const nameValue = tag.getAttributeValue('NAME');
+        if (nameValue) {
+          language = nameValue;
+        }
+      }
 
       // The GROUP-ID value is a quoted-string that specifies the group to which
       // the Rendition belongs.
@@ -1449,7 +1456,9 @@ shaka.hls.HlsParser = class {
       // The value of INSTREAM-ID is a quoted-string that specifies a Rendition
       // within the segments in the Media Playlist. This attribute is REQUIRED
       // if the TYPE attribute is CLOSED-CAPTIONS.
-      const instreamId = tag.getRequiredAttrValue('INSTREAM-ID');
+      // We need replace SERVICE string by our internal svc string.
+      const instreamId = tag.getRequiredAttrValue('INSTREAM-ID')
+          .replace('SERVICE', 'svc');
       if (!this.groupIdToClosedCaptionsMap_.get(groupId)) {
         this.groupIdToClosedCaptionsMap_.set(groupId, new Map());
       }
@@ -1709,7 +1718,7 @@ shaka.hls.HlsParser = class {
       if (this.isLive_() && !wasLive) {
         // Now that we know that the presentation is live, convert the timeline
         // to live.
-        this.changePresentationTimelineToLive_();
+        this.changePresentationTimelineToLive_(playlist);
       }
 
       // Copy values from the real stream info to our initial one.
@@ -2323,9 +2332,10 @@ shaka.hls.HlsParser = class {
   }
 
   /**
+   * @param {!shaka.hls.Playlist} playlist
    * @private
    */
-  changePresentationTimelineToLive_() {
+  changePresentationTimelineToLive_(playlist) {
     // The live edge will be calculated from segments, so we don't need to
     // set a presentation start time.  We will assert later that this is
     // working as expected.
@@ -2346,8 +2356,12 @@ shaka.hls.HlsParser = class {
     } else if (this.lowLatencyPresentationDelay_) {
       presentationDelay = this.lowLatencyPresentationDelay_;
     } else {
-      const numberOfSegments = this.config_.hls.liveSegmentsDelay;
-      presentationDelay = this.maxTargetDuration_ * numberOfSegments;
+      const playlistSegments = playlist.segments.length;
+      let delaySegments = this.config_.hls.liveSegmentsDelay;
+      if (delaySegments > (playlistSegments - 2)) {
+        delaySegments = Math.max(1, playlistSegments - 2);
+      }
+      presentationDelay = this.maxTargetDuration_ * delaySegments;
     }
 
     this.presentationTimeline_.setPresentationStartTime(0);
@@ -2357,13 +2371,13 @@ shaka.hls.HlsParser = class {
 
   /**
    * Get the InitSegmentReference for a segment if it has a EXT-X-MAP tag.
-   * @param {string} playlistUri The absolute uri of the media playlist.
+   * @param {!shaka.hls.Playlist} playlist
    * @param {!Array.<!shaka.hls.Tag>} tags Segment tags
    * @param {!Map.<string, string>} variables
    * @return {shaka.media.InitSegmentReference}
    * @private
    */
-  getInitSegmentReference_(playlistUri, tags, variables) {
+  getInitSegmentReference_(playlist, tags, variables) {
     /** @type {?shaka.hls.Tag} */
     const mapTag = shaka.hls.Utils.getFirstTagWithName(tags, 'EXT-X-MAP');
 
@@ -2374,7 +2388,7 @@ shaka.hls.HlsParser = class {
     const verbatimInitSegmentUri = mapTag.getRequiredAttrValue('URI');
     const absoluteInitSegmentUri = this.variableSubstitution_(
         shaka.hls.Utils.constructAbsoluteUri(
-            playlistUri, verbatimInitSegmentUri),
+            playlist.absoluteUri, verbatimInitSegmentUri),
         variables);
 
     const mapTagKey = [
@@ -2382,8 +2396,18 @@ shaka.hls.HlsParser = class {
       mapTag.getAttributeValue('BYTERANGE', ''),
     ].join('-');
     if (!this.mapTagToInitSegmentRefMap_.has(mapTagKey)) {
+      /** @type {shaka.extern.HlsAes128Key|undefined} */
+      let aes128Key = undefined;
+      for (const tag of tags) {
+        if (tag.name == 'EXT-X-KEY') {
+          if (tag.getRequiredAttrValue('METHOD') == 'AES-128' &&
+              tag.id < mapTag.id) {
+            aes128Key = this.parseAES128DrmTag_(tag, playlist);
+          }
+        }
+      }
       const initSegmentRef = this.createInitSegmentReference_(
-          absoluteInitSegmentUri, mapTag);
+          absoluteInitSegmentUri, mapTag, aes128Key);
       this.mapTagToInitSegmentRefMap_.set(mapTagKey, initSegmentRef);
     }
     return this.mapTagToInitSegmentRefMap_.get(mapTagKey);
@@ -2394,10 +2418,11 @@ shaka.hls.HlsParser = class {
    * playlist.
    * @param {string} absoluteInitSegmentUri
    * @param {!shaka.hls.Tag} mapTag EXT-X-MAP
+   * @param {shaka.extern.HlsAes128Key=} aes128Key
    * @return {!shaka.media.InitSegmentReference}
    * @private
    */
-  createInitSegmentReference_(absoluteInitSegmentUri, mapTag) {
+  createInitSegmentReference_(absoluteInitSegmentUri, mapTag, aes128Key) {
     let startByte = 0;
     let endByte = null;
     const byterange = mapTag.getAttributeValue('BYTERANGE');
@@ -2408,12 +2433,25 @@ shaka.hls.HlsParser = class {
       const byteLength = Number(blocks[0]);
       startByte = Number(blocks[1]);
       endByte = startByte + byteLength - 1;
+
+      if (aes128Key) {
+        // MAP segment encrypted with method 'AES-128', when served with
+        // HTTP Range, has the unencrypted size specified in the range.
+        // See: https://tools.ietf.org/html/draft-pantos-hls-rfc8216bis-08#section-6.3.6
+        const length = (endByte + 1) - startByte;
+        if (length % 16) {
+          endByte += (16 - (length % 16));
+        }
+      }
     }
 
     const initSegmentRef = new shaka.media.InitSegmentReference(
         () => [absoluteInitSegmentUri],
         startByte,
-        endByte);
+        endByte,
+        /* mediaQuality= */ null,
+        /* timescale= */ null,
+        aes128Key);
     return initSegmentRef;
   }
 
@@ -2427,15 +2465,13 @@ shaka.hls.HlsParser = class {
    * @param {!Map.<string, string>} variables
    * @param {string} absoluteMediaPlaylistUri
    * @param {string} type
-   * @param {number} timestampOffset
    * @param {shaka.extern.HlsAes128Key=} hlsAes128Key
    * @return {shaka.media.SegmentReference}
    * @private
    */
   createSegmentReference_(
       initSegmentReference, previousReference, hlsSegment, startTime,
-      variables, absoluteMediaPlaylistUri, type, timestampOffset,
-      hlsAes128Key) {
+      variables, absoluteMediaPlaylistUri, type, hlsAes128Key) {
     const tags = hlsSegment.tags;
     const absoluteSegmentUri = this.variableSubstitution_(
         hlsSegment.absoluteUri, variables);
@@ -2539,7 +2575,7 @@ shaka.hls.HlsParser = class {
             pStartByte,
             pEndByte,
             initSegmentReference,
-            /* timestampOffset= */ 0, // This value is ignored in sequence mode.
+            /* timestampOffset= */ 0,
             /* appendWindowStart= */ 0,
             /* appendWindowEnd= */ Infinity,
             /* partialReferences= */ [],
@@ -2571,8 +2607,11 @@ shaka.hls.HlsParser = class {
         return null;
       }
       endTime = startTime + duration;
-    } else {
+    } else if (partialSegmentRefs.length) {
       endTime = partialSegmentRefs[partialSegmentRefs.length - 1].endTime;
+    } else {
+      // Skip segments without duration and without partialsegments
+      return null;
     }
 
     // If the segment has EXT-X-BYTERANGE tag, set the start byte and end byte
@@ -2612,7 +2651,7 @@ shaka.hls.HlsParser = class {
         startByte,
         endByte,
         initSegmentReference,
-        timestampOffset, // This value is ignored in sequence mode.
+        /* timestampOffset= */ 0,
         /* appendWindowStart= */ 0,
         /* appendWindowEnd= */ Infinity,
         partialSegmentRefs,
@@ -2697,7 +2736,6 @@ shaka.hls.HlsParser = class {
     const references = [];
 
     let previousReference = null;
-    let lastDiscontinuityStartTime = firstStartTime;
 
     for (let i = 0; i < hlsSegments.length; i++) {
       const item = hlsSegments[i];
@@ -2709,7 +2747,6 @@ shaka.hls.HlsParser = class {
           item.tags, 'EXT-X-DISCONTINUITY');
       if (discontinuityTag) {
         discontinuitySequence++;
-        lastDiscontinuityStartTime = startTime;
       }
 
       // Apply new AES-128 tags as you see them, keeping a running total.
@@ -2725,8 +2762,8 @@ shaka.hls.HlsParser = class {
 
       mediaSequenceToStartTime.set(position, startTime);
 
-      initSegmentRef = this.getInitSegmentReference_(playlist.absoluteUri,
-          item.tags, variables);
+      initSegmentRef = this.getInitSegmentReference_(playlist, item.tags,
+          variables);
 
       // If the stream is low latency and the user has not configured the
       // lowLatencyMode, but if it has been configured to activate the
@@ -2748,7 +2785,6 @@ shaka.hls.HlsParser = class {
           variables,
           playlist.absoluteUri,
           type,
-          lastDiscontinuityStartTime,
           hlsAes128Key);
 
       if (reference) {

package/lib/media/segment_reference.js

@@ -27,11 +27,14 @@ shaka.media.InitSegmentReference = class {
    * @param {?number} endByte The offset from the start of the resource
    *   to the end of the segment, inclusive.  A value of null indicates that the
    *   segment extends to the end of the resource.
-   * @param {null|shaka.extern.MediaQualityInfo=} mediaQuality Information about
-   *   the quality of the media associated with this init segment.
-   * @param {number=} timescale
+   * @param {(null|shaka.extern.MediaQualityInfo)=} mediaQuality Information
+   *   about the quality of the media associated with this init segment.
+   * @param {(null|number)=} timescale
+   * @param {?shaka.extern.HlsAes128Key=} aes128Key
+   *  The segment's AES-128-CBC full segment encryption key and iv.
    */
-  constructor(uris, startByte, endByte, mediaQuality = null, timescale) {
+  constructor(uris, startByte, endByte, mediaQuality = null, timescale = null,
+      aes128Key = null) {
     /** @type {function():!Array.<string>} */
     this.getUris = uris;
 
@@ -44,8 +47,11 @@ shaka.media.InitSegmentReference = class {
     /** @const {shaka.extern.MediaQualityInfo|null} */
     this.mediaQuality = mediaQuality;
 
-    /** @type {number|undefined} */
+    /** @type {number|null} */
     this.timescale = timescale;
+
+    /** @type {?shaka.extern.HlsAes128Key} */
+    this.hlsAes128Key = aes128Key;
   }
 
   /**

package/lib/media/streaming_engine.js

@@ -1357,16 +1357,11 @@ shaka.media.StreamingEngine = class {
             'ReadableStream is not supported by the browser.');
         }
         const fetchSegment = this.fetch_(mediaState, reference);
-        let result = await fetchSegment;
+        const result = await fetchSegment;
         this.destroyer_.ensureNotDestroyed();
         if (this.fatalError_) {
           return;
         }
-        if (reference.hlsAes128Key) {
-          goog.asserts.assert(iter, 'mediaState.segmentIterator should exist');
-          result = await this.aes128Decrypt_(result, reference, iter);
-        }
-        this.destroyer_.ensureNotDestroyed();
 
         // If the text stream gets switched between fetch_() and append_(), the
         // new text parser is initialized, but the new init segment is not
@@ -1450,13 +1445,13 @@ shaka.media.StreamingEngine = class {
 
   /**
    * @param {!BufferSource} rawResult
-   * @param {!shaka.media.SegmentReference} reference
+   * @param {shaka.extern.HlsAes128Key} aes128Key
    * @param {!shaka.media.SegmentIterator} iter
    * @return {!Promise.<!BufferSource>} finalResult
    * @private
    */
-  async aes128Decrypt_(rawResult, reference, iter) {
-    const key = reference.hlsAes128Key;
+  async aes128Decrypt_(rawResult, aes128Key, iter) {
+    const key = aes128Key;
     if (!key.cryptoKey) {
       goog.asserts.assert(key.fetchKey, 'If AES-128 cryptoKey was not ' +
           'preloaded, fetchKey function should be provided');
@@ -1693,10 +1688,10 @@ shaka.media.StreamingEngine = class {
       }
     }
 
-    const lastDiscontinuitySequence =
-        mediaState.lastSegmentReference ?
-            mediaState.lastSegmentReference.discontinuitySequence : null;
     if (this.manifest_.sequenceMode) {
+      const lastDiscontinuitySequence =
+          mediaState.lastSegmentReference ?
+              mediaState.lastSegmentReference.discontinuitySequence : null;
       // Across discontinuity bounds, we should resync timestamps for
       // sequence mode playbacks.  The next segment appended should
       // land at its theoretical timestamp from the segment index.
@@ -1706,18 +1701,6 @@ shaka.media.StreamingEngine = class {
         operations.push(this.playerInterface_.mediaSourceEngine.resync(
             mediaState.type, reference.startTime));
       }
-    } else {
-      // In segments mode, we need to resync to set the timestampOffset
-      // to the start of the current discontinuity sequence. This is
-      // because individual discontinuity sequences may have internal
-      // timestamps that overlap, so we adjust the timestampOffset to avoid
-      // having the SourceBuffer get overwritten.
-      if (reference.discontinuitySequence != lastDiscontinuitySequence) {
-        operations.push(
-            this.playerInterface_.mediaSourceEngine.resync(
-                mediaState.type,
-                reference.timestampOffset));
-      }
     }
 
     await Promise.all(operations);
@@ -2104,7 +2087,14 @@ shaka.media.StreamingEngine = class {
     mediaState.operation = op;
     const response = await op.promise;
     mediaState.operation = null;
-    return response.data;
+
+    let result = response.data;
+    if (reference.hlsAes128Key) {
+      const iter = mediaState.segmentIterator;
+      goog.asserts.assert(iter, 'mediaState.segmentIterator should exist');
+      result = await this.aes128Decrypt_(result, reference.hlsAes128Key, iter);
+    }
+    return result;
   }
 
 

package/lib/player.js

@@ -2651,16 +2651,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return;
     }
 
-    this.selectAudioLanguage(preferredAudioLanguage);
-
     const preferredVariantRole = this.config_.preferredVariantRole;
-
-    // If the user has not selected a role preference, the previous match is
-    // selected.
-    if (preferredVariantRole == '') {
-      return;
-    }
-
     this.selectAudioLanguage(preferredAudioLanguage, preferredVariantRole);
   }
 
@@ -2671,7 +2662,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    */
   setupPreferredTextOnSrc_() {
     const preferredTextLanguage = this.config_.preferredTextLanguage;
-    const preferForcedSubs = this.config_.preferForcedSubs;
 
     // If the user has not selected a preference, the browser preference is
     // left.
@@ -2679,16 +2669,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return;
     }
 
-    this.selectTextLanguage(preferredTextLanguage, '', preferForcedSubs);
-
+    const preferForcedSubs = this.config_.preferForcedSubs;
     const preferredTextRole = this.config_.preferredTextRole;
 
-    // If the user has not selected a role preference, the previous match is
-    // selected.
-    if (preferredTextRole == '') {
-      return;
-    }
-
     this.selectTextLanguage(preferredTextLanguage, preferredTextRole,
         preferForcedSubs);
   }
@@ -4141,8 +4124,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @export
    */
   selectAudioLanguage(language, role, channelsCount = 0) {
-    const LanguageUtils = shaka.util.LanguageUtils;
-
     if (this.manifest_ && this.playhead_) {
       this.currentAdaptationSetCriteria_ =
           new shaka.media.PreferenceBasedCriteria(language, role || '',
@@ -4180,33 +4161,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // If we haven't switched yet, just use ABR to find a new track.
       this.chooseVariantAndSwitch_();
     } else if (this.video_ && this.video_.audioTracks) {
-      const audioTracks = Array.from(this.video_.audioTracks);
-      const selectedLanguage = LanguageUtils.normalize(language);
-
-      let languageMatch = null;
-      let languageAndRoleMatch = null;
-
-      for (const audioTrack of audioTracks) {
-        const track = shaka.util.StreamUtils.html5AudioTrackToTrack(audioTrack);
-
-        if (LanguageUtils.normalize(track.language) == selectedLanguage) {
-          languageMatch = audioTrack;
-
-          if (role) {
-            if (track.roles.includes(role)) {
-              languageAndRoleMatch = audioTrack;
-            }
-          } else {  // no role
-            if (track.roles.length == 0) {
-              languageAndRoleMatch = audioTrack;
-            }
-          }
-        }
-      }
-      if (languageAndRoleMatch) {
-        this.switchHtml5Track_(languageAndRoleMatch);
-      } else if (languageMatch) {
-        this.switchHtml5Track_(languageMatch);
+      const track = shaka.util.StreamUtils.filterStreamsByLanguageAndRole(
+          this.getVariantTracks(), language, role || '', false)[0];
+      if (track) {
+        this.selectVariantTrack(track);
       }
     }
   }
@@ -4222,8 +4180,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @export
    */
   selectTextLanguage(language, role, forced = false) {
-    const LanguageUtils = shaka.util.LanguageUtils;
-
     if (this.manifest_ && this.playhead_) {
       this.currentTextLanguage_ = language;
       this.currentTextRole_ = role || '';
@@ -4244,13 +4200,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         }
       }
     } else {
-      const selectedLanguage = LanguageUtils.normalize(language);
-
-      const track = this.getTextTracks().find((t) => {
-        return LanguageUtils.normalize(t.language) == selectedLanguage &&
-          (!role || t.roles.includes(role)) && t.forced == forced;
-      });
-
+      const track = shaka.util.StreamUtils.filterStreamsByLanguageAndRole(
+          this.getTextTracks(), language, role || '', forced)[0];
       if (track) {
         this.selectTextTrack(track);
       }
@@ -7020,7 +6971,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v4.3.11-uncompiled';
+shaka.Player.version = 'v4.3.13-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/ttml_text_parser.js

@@ -214,11 +214,12 @@ shaka.text.TtmlTextParser = class {
       }
     }
 
-    const parentIsContent = isContent;
     if (cueNode.nodeName == 'p' || imageElement) {
       isContent = true;
     }
 
+    const parentIsContent = isContent;
+
     const spaceStyle = cueElement.getAttribute('xml:space') ||
         (whitespaceTrim ? 'default' : 'preserve');
 

package/lib/text/ui_text_displayer.js

@@ -481,6 +481,43 @@ shaka.text.UITextDisplayer = class {
     this.currentCuesMap_.set(cue, {cueElement, wrapper, regionElement});
   }
 
+  /**
+   * Compute cue position alignment
+   * See https://www.w3.org/TR/webvtt1/#webvtt-cue-position-alignment
+   *
+   * @param {!shaka.extern.Cue} cue
+   * @private
+   */
+  computeCuePositionAlignment_(cue) {
+    const Cue = shaka.text.Cue;
+    const {direction, positionAlign, textAlign} = cue;
+
+    if (positionAlign !== Cue.positionAlign.AUTO) {
+      // Position align is not AUTO: use it
+      return positionAlign;
+    }
+
+    // Position align is AUTO: use text align to compute its value
+
+    if (textAlign === Cue.textAlign.LEFT ||
+      (textAlign === Cue.textAlign.START &&
+        direction === Cue.direction.HORIZONTAL_LEFT_TO_RIGHT) ||
+      (textAlign === Cue.textAlign.END &&
+        direction === Cue.direction.HORIZONTAL_RIGHT_TO_LEFT)) {
+      return Cue.positionAlign.LEFT;
+    }
+
+    if (textAlign === Cue.textAlign.RIGHT ||
+      (textAlign === Cue.textAlign.START &&
+        direction === Cue.direction.HORIZONTAL_RIGHT_TO_LEFT) ||
+      (textAlign === Cue.textAlign.END &&
+        direction === Cue.direction.HORIZONTAL_LEFT_TO_RIGHT)) {
+      return Cue.positionAlign.RIGHT;
+    }
+
+    return Cue.positionAlign.CENTER;
+  }
+
   /**
    * @param {!HTMLElement} cueElement
    * @param {!shaka.extern.Cue} cue
@@ -617,7 +654,15 @@ shaka.text.UITextDisplayer = class {
     // TODO: Implement line alignment with line number.
     // TODO: Implement lineAlignment of 'CENTER'.
     if (cue.line != null) {
-      if (cue.lineInterpretation == Cue.lineInterpretation.PERCENTAGE) {
+      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) {
+        lineInterpretation = Cue.lineInterpretation.PERCENTAGE;
+      }
+      if (lineInterpretation == Cue.lineInterpretation.PERCENTAGE) {
         style.position = 'absolute';
         if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
           style.width = '100%';
@@ -658,9 +703,10 @@ shaka.text.UITextDisplayer = class {
 
     // The positionAlign attribute is an alignment for the text container in
     // the dimension of the writing direction.
-    if (cue.positionAlign == Cue.positionAlign.LEFT) {
+    const computedPositionAlign = this.computeCuePositionAlignment_(cue);
+    if (computedPositionAlign == Cue.positionAlign.LEFT) {
       style.cssFloat = 'left';
-    } else if (cue.positionAlign == Cue.positionAlign.RIGHT) {
+    } else if (computedPositionAlign == Cue.positionAlign.RIGHT) {
       style.cssFloat = 'right';
     }
 

package/lib/util/cmcd_manager.js

@@ -331,12 +331,17 @@ shaka.util.CmcdManager = class {
    * @private
    */
   getObjectTypeFromMimeType_(mimeType) {
-    switch (mimeType) {
+    switch (mimeType.toLowerCase()) {
       case 'video/webm':
       case 'video/mp4':
+      case 'video/mpeg':
+      case 'video/mp2t':
         return shaka.util.CmcdManager.ObjectType.MUXED;
 
       case 'application/x-mpegurl':
+      case 'application/vnd.apple.mpegurl':
+      case 'application/dash+xml':
+      case 'video/vnd.mpeg.dash.mpd':
         return shaka.util.CmcdManager.ObjectType.MANIFEST;
 
       default:

package/lib/util/manifest_parser_utils.js

@@ -29,13 +29,19 @@ shaka.util.ManifestParserUtils = class {
       return baseUris;
     }
 
+    if (baseUris.length == 1 && relativeUris.length == 1) {
+      const baseUri = new goog.Uri(baseUris[0]);
+      const relativeUri = new goog.Uri(relativeUris[0]);
+      return [baseUri.resolve(relativeUri).toString()];
+    }
+
     const relativeAsGoog = relativeUris.map((uri) => new goog.Uri(uri));
     // Resolve each URI relative to each base URI, creating an Array of Arrays.
     // Then flatten the Arrays into a single Array.
-    return baseUris.map((uri) => new goog.Uri(uri))
-        .map((base) => relativeAsGoog.map((i) => base.resolve(i)))
-        .reduce(Functional.collapseArrays, [])
-        .map((uri) => uri.toString());
+    return baseUris.map((uri) => {
+      const base = new goog.Uri(uri);
+      return relativeAsGoog.map((i) => base.resolve(i).toString());
+    }).reduce(Functional.collapseArrays, []);
   }
 
 

package/lib/util/player_configuration.js

@@ -69,8 +69,8 @@ shaka.util.PlayerConfiguration = class {
       advanced: {},    // key is arbitrary key system ID, value is a record type
       delayLicenseRequestUntilPlayed: false,
       initDataTransform: (initData, initDataType, drmInfo) => {
-        const keySystem = drmInfo.keySystem;
-        if (keySystem == 'com.apple.fps.1_0' && initDataType == 'skd') {
+        if (shaka.util.Platform.isMediaKeysPolyfilled() &&
+            initDataType == 'skd') {
           const cert = drmInfo.serverCertificate;
           const contentId =
               shaka.util.FairPlayUtils.defaultGetContentId(initData);