shaka-player 4.6.3 → 4.7.0

package/externs/mediasession.js

@@ -32,6 +32,13 @@ const MediaSession = class {
     /** @type {?MediaMetadata} */
     this.metadata;
   }
+
+  setActionHandler(type, callback) {
+    /** @type {string} */
+    this.type = type;
+    /** @type {!function(!{action: string, seekOffset: ?number})} */
+    this.callback = callback;
+  }
 };
 
 

package/externs/shaka/abr_manager.js

@@ -121,6 +121,14 @@ shaka.extern.AbrManager = class {
    */
   setMediaElement(mediaElement) {}
 
+  /**
+   * Set CMSD manager.
+   *
+   * @param {shaka.util.CmsdManager} cmsdManager
+   * @exportDoc
+   */
+  setCmsdManager(cmsdManager) {}
+
   /**
    * Sets the ABR configuration.
    *

package/externs/shaka/manifest.js

@@ -158,7 +158,7 @@ shaka.extern.InitDataOverride;
  * }}
  *
  * @description
- * Maximum and minimun latency and playback rate for a manifest. When max
+ * Maximum and minimum latency and playback rate for a manifest. When max
  * latency is reached playbackrate is updated to maxPlaybackRate to decrease
  * latency. When min  latency is reached playbackrate is updated to
  * minPlaybackRate to increase  latency.
@@ -169,9 +169,9 @@ shaka.extern.InitDataOverride;
  * @property {?number} maxPlaybackRate
  *  Maximum playback rate.
  * @property {?number} minLatency
- *  Minimun latency in seconds.
+ *  Minimum latency in seconds.
  * @property {?number} minPlaybackRate
- *  Minimun playback rate.
+ *  Minimum playback rate.
  *
  * @exportDoc
  */

package/externs/shaka/player.js

@@ -855,7 +855,8 @@ shaka.extern.InitDataTransform;
  *   keySystemsByURI: !Object.<string, string>,
  *   manifestPreprocessor: function(!Element),
  *   sequenceMode: boolean,
- *   enableAudioGroups: boolean
+ *   enableAudioGroups: boolean,
+ *   multiTypeVariantsAllowed: boolean
  * }}
  *
  * @property {string} clockSyncUri
@@ -917,6 +918,16 @@ shaka.extern.InitDataTransform;
  *   If set, audio streams will be grouped and filtered by their parent
  *   adaptation set ID.
  *   <i>Defaults to <code>false</code>.</i>
+ * @property {boolean} multiTypeVariantsAllowed
+ *   If true, the manifest parser will create variants that have multiple
+ *   mimeTypes or codecs for video or for audio if there is no other choice.
+ *   Meant for content where some periods are only available in one mimeType or
+ *   codec, and other periods are only available in a different mimeType or
+ *   codec. For example, a stream with baked-in ads where the audio codec does
+ *   not match the main content.
+ *   Might result in undesirable behavior if mediaSource.codecSwitchingStrategy
+ *   is not set to SMOOTH.
+ *   Defaults to true if SMOOTH codec switching is supported, RELOAD overwise.
  * @exportDoc
  */
 shaka.extern.DashManifestConfiguration;
@@ -1123,7 +1134,9 @@ shaka.extern.ManifestConfiguration;
  *   liveSyncMaxLatency: number,
  *   liveSyncPlaybackRate: number,
  *   liveSyncMinLatency: number,
- *   liveSyncMinPlaybackRate: number
+ *   liveSyncMinPlaybackRate: number,
+ *   allowMediaSourceRecoveries: boolean,
+ *   minTimeBetweenRecoveries: number
  * }}
  *
  * @description
@@ -1253,12 +1266,19 @@ shaka.extern.ManifestConfiguration;
  *   between 1 and 2. Effective only if liveSync is true. Defaults to
  *   <code>1.1</code>.
  * @property {number} liveSyncMinLatency
- *   Minimun acceptable latency, in seconds. Effective only if liveSync is
+ *   Minimum acceptable latency, in seconds. Effective only if liveSync is
  *   true. Defaults to <code>0</code>.
  * @property {number} liveSyncMinPlaybackRate
- *   Minimun playback rate used for latency chasing. It is recommended to use a
+ *   Minimum playback rate used for latency chasing. It is recommended to use a
  *   value between 0 and 1. Effective only if liveSync is true. Defaults to
  *   <code>1</code>.
+ * @property {boolean} allowMediaSourceRecoveries
+ *   Indicate if we should recover from VIDEO_ERROR resetting Media Source.
+ *   Defaults to <code>true</code>.
+ * @property {number} minTimeBetweenRecoveries
+ *   The minimum time between recoveries when VIDEO_ERROR is reached, in
+ *   seconds.
+ *   Defaults to <code>5</code>.
  * @exportDoc
  */
 shaka.extern.StreamingConfiguration;
@@ -1459,6 +1479,32 @@ shaka.extern.AdvancedAbrConfiguration;
  */
 shaka.extern.CmcdConfiguration;
 
+
+/**
+ * @typedef {{
+ *   enabled: boolean,
+ *   applyMaximumSuggestedBitrate: boolean,
+ *   estimatedThroughputWeightRatio: number
+ * }}
+ *
+ * @description
+ *   Common Media Server Data (CMSD) configuration.
+ *
+ * @property {boolean} enabled
+ *   If <code>true</code>, enables reading CMSD data in media requests.
+ *   Defaults to <code>true</code>.
+ * @property {boolean} applyMaximumSuggestedBitrate
+ *   If true, we must apply the maximum suggested bitrate. If false, we ignore
+ *   this.
+ *   Defaults to <code>true</code>.
+ * @property {number} estimatedThroughputWeightRatio
+ *   How much the estimatedThroughput of the CMSD data should be weighted
+ *   against the default estimate, between 0 and 1.
+ *   Defaults to <code>0.5</code>.
+ * @exportDoc
+ */
+shaka.extern.CmsdConfiguration;
+
 /**
  * @typedef {{
  *   enabled: boolean,
@@ -1554,6 +1600,7 @@ shaka.extern.OfflineConfiguration;
  *   abrFactory: shaka.extern.AbrManager.Factory,
  *   abr: shaka.extern.AbrConfiguration,
  *   cmcd: shaka.extern.CmcdConfiguration,
+ *   cmsd: shaka.extern.CmsdConfiguration,
  *   lcevc: shaka.extern.LcevcConfiguration,
  *   offline: shaka.extern.OfflineConfiguration,
  *   preferredAudioLanguage: string,
@@ -1566,8 +1613,10 @@ shaka.extern.OfflineConfiguration;
  *   preferredAudioChannelCount: number,
  *   preferredVideoHdrLevel: string,
  *   preferredVideoLayout: string,
+ *   preferredVideoLabel: string,
  *   preferredDecodingAttributes: !Array.<string>,
  *   preferForcedSubs: boolean,
+ *   preferSpatialAudio: boolean,
  *   restrictions: shaka.extern.Restrictions,
  *   playRangeStart: number,
  *   playRangeEnd: number,
@@ -1592,6 +1641,8 @@ shaka.extern.OfflineConfiguration;
  *   ABR configuration and settings.
  * @property {shaka.extern.CmcdConfiguration} cmcd
  *   CMCD configuration and settings. (Common Media Client Data)
+ * @property {shaka.extern.CmsdConfiguration} cmsd
+ *   CMSD configuration and settings. (Common Media Server Data)
  * @property {shaka.extern.LcevcConfiguration} lcevc
  *   MPEG-5 LCEVC configuration and settings.
  *   (Low Complexity Enhancement Video Codec)
@@ -1603,6 +1654,8 @@ shaka.extern.OfflineConfiguration;
  *   Changing this during playback will not affect the current playback.
  * @property {string} preferredAudioLabel
  *   The preferred label to use for audio tracks
+ * @property {string} preferredVideoLabel
+ *   The preferred label to use for video tracks
  * @property {string} preferredTextLanguage
  *   The preferred language to use for text tracks.  If a matching text track
  *   is found, and the selected audio and text tracks have different languages,
@@ -1640,6 +1693,8 @@ shaka.extern.OfflineConfiguration;
  *   If the content has no forced captions and the value is true,
  *   no text track is chosen.
  *   Changing this during playback will not affect the current playback.
+ * @property {boolean} preferSpatialAudio
+ *   If true, a spatial audio track is preferred.  Defaults to false.
  * @property {shaka.extern.Restrictions} restrictions
  *   The application restrictions to apply to the tracks.  These are "hard"
  *   restrictions.  Any track that fails to meet these restrictions will not

package/lib/abr/simple_abr_manager.js

@@ -13,6 +13,8 @@ goog.require('shaka.log');
 goog.require('shaka.util.StreamUtils');
 goog.require('shaka.util.Timer');
 
+goog.requireType('shaka.util.CmsdManager');
+
 
 /**
  * @summary
@@ -112,6 +114,9 @@ shaka.abr.SimpleAbrManager = class {
         }
       }
     });
+
+    /** @private {?shaka.util.CmsdManager} */
+    this.cmsdManager_ = null;
   }
 
 
@@ -134,6 +139,8 @@ shaka.abr.SimpleAbrManager = class {
 
     this.resizeObserverTimer_.stop();
 
+    this.cmsdManager_ = null;
+
     // Don't reset |startupComplete_|: if we've left the startup interval, we
     // can start using bandwidth estimates right away after init() is called.
   }
@@ -171,8 +178,6 @@ shaka.abr.SimpleAbrManager = class {
    * @export
    */
   chooseVariant(preferFastSwitching = false) {
-    const SimpleAbrManager = shaka.abr.SimpleAbrManager;
-
     let maxHeight = Infinity;
     let maxWidth = Infinity;
 
@@ -208,12 +213,12 @@ shaka.abr.SimpleAbrManager = class {
     }
 
     // Get sorted Variants.
-    let sortedVariants = SimpleAbrManager.filterAndSortVariants_(
+    let sortedVariants = this.filterAndSortVariants_(
         this.config_.restrictions, variants,
         /* maxHeight= */ Infinity, /* maxWidth= */ Infinity);
 
     if (maxHeight != Infinity || maxWidth != Infinity) {
-      const resolutions = SimpleAbrManager.getResolutionList_(sortedVariants);
+      const resolutions = this.getResolutionList_(sortedVariants);
       for (const resolution of resolutions) {
         if (resolution.height >= maxHeight && resolution.width >= maxWidth) {
           maxHeight = resolution.height;
@@ -222,13 +227,11 @@ shaka.abr.SimpleAbrManager = class {
         }
       }
 
-      sortedVariants = SimpleAbrManager.filterAndSortVariants_(
+      sortedVariants = this.filterAndSortVariants_(
           this.config_.restrictions, variants, maxHeight, maxWidth);
     }
 
-    const defaultBandwidthEstimate = this.getDefaultBandwidth_();
-    const currentBandwidth = this.bandwidthEstimator_.getBandwidthEstimate(
-        defaultBandwidthEstimate);
+    const currentBandwidth = this.getBandwidthEstimate();
 
     if (variants.length && !sortedVariants.length) {
       // If we couldn't meet the ABR restrictions, we should still play
@@ -238,7 +241,7 @@ shaka.abr.SimpleAbrManager = class {
       // restrictions and keep just the first (lowest-bandwidth) one.
       shaka.log.warning('No variants met the ABR restrictions. ' +
                         'Choosing a variant by lowest bandwidth.');
-      sortedVariants = SimpleAbrManager.filterAndSortVariants_(
+      sortedVariants = this.filterAndSortVariants_(
           /* restrictions= */ null, variants,
           /* maxHeight= */ Infinity, /* maxWidth= */ Infinity);
       sortedVariants = [sortedVariants[0]];
@@ -323,8 +326,12 @@ shaka.abr.SimpleAbrManager = class {
    */
   getBandwidthEstimate() {
     const defaultBandwidthEstimate = this.getDefaultBandwidth_();
-    return this.bandwidthEstimator_.getBandwidthEstimate(
+    const bandwidthEstimate = this.bandwidthEstimator_.getBandwidthEstimate(
         defaultBandwidthEstimate);
+    if (this.cmsdManager_) {
+      return this.cmsdManager_.getBandwidthEstimate(bandwidthEstimate);
+    }
+    return bandwidthEstimate;
   }
 
 
@@ -368,6 +375,15 @@ shaka.abr.SimpleAbrManager = class {
   }
 
 
+  /**
+   * @override
+   * @export
+   */
+  setCmsdManager(cmsdManager) {
+    this.cmsdManager_ = cmsdManager;
+  }
+
+
   /**
    * @override
    * @export
@@ -408,9 +424,7 @@ shaka.abr.SimpleAbrManager = class {
     }
 
     const chosenVariant = this.chooseVariant();
-    const defaultBandwidthEstimate = this.getDefaultBandwidth_();
-    const bandwidthEstimate = this.bandwidthEstimator_.getBandwidthEstimate(
-        defaultBandwidthEstimate);
+    const bandwidthEstimate = this.getBandwidthEstimate();
     const currentBandwidthKbps = Math.round(bandwidthEstimate / 1000.0);
 
     if (chosenVariant) {
@@ -452,7 +466,19 @@ shaka.abr.SimpleAbrManager = class {
    *   |restrictions| and sorted in ascending order of bandwidth.
    * @private
    */
-  static filterAndSortVariants_(restrictions, variants, maxHeight, maxWidth) {
+  filterAndSortVariants_(restrictions, variants, maxHeight, maxWidth) {
+    if (this.cmsdManager_) {
+      const maxBitrate = this.cmsdManager_.getMaxBitrate();
+      if (maxBitrate) {
+        variants = variants.filter((variant) => {
+          if (!variant.bandwidth || !maxBitrate) {
+            return true;
+          }
+          return variant.bandwidth <= maxBitrate;
+        });
+      }
+    }
+
     if (restrictions) {
       variants = variants.filter((variant) => {
         // This was already checked in another scope, but the compiler doesn't
@@ -475,7 +501,7 @@ shaka.abr.SimpleAbrManager = class {
    * @return {!Array.<{height: number, width: number}>}
    * @private
    */
-  static getResolutionList_(variants) {
+  getResolutionList_(variants) {
     const resolutions = [];
     for (const variant of variants) {
       const video = variant.video;

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/cea/cea708_service.js

@@ -568,7 +568,7 @@ shaka.cea.Cea708Service = class {
     // Create the window if it doesn't exist.
     const windowAlreadyExists = this.windows_[windowNum] !== null;
     if (!windowAlreadyExists) {
-      const window = new shaka.cea.Cea708Window(windowNum);
+      const window = new shaka.cea.Cea708Window(windowNum, this.serviceNumber_);
       window.setStartTime(pts);
       this.windows_[windowNum] = window;
     }

package/lib/cea/cea708_window.js

@@ -9,7 +9,7 @@ goog.provide('shaka.cea.Cea708Window');
 goog.require('shaka.cea.CeaUtils');
 goog.require('shaka.cea.CeaUtils.StyledChar');
 goog.require('shaka.text.Cue');
-goog.require('shaka.util.Functional');
+goog.require('shaka.text.CueRegion');
 
 
 /**
@@ -19,7 +19,13 @@ shaka.cea.Cea708Window = class {
   /**
    * @param {number} windowNum
    */
-  constructor(windowNum) {
+  constructor(windowNum, parentService) {
+    /**
+     * Number for the parent service (1 - 63).
+     * @private {number}
+     */
+    this.parentService_ = parentService;
+
     /**
      * A number from 0 - 7 indicating the window number in the
      * service that owns this window.
@@ -132,11 +138,6 @@ shaka.cea.Cea708Window = class {
     this.backgroundColor_ = shaka.cea.CeaUtils.DEFAULT_BG_COLOR;
 
     this.resetMemory();
-
-    // TODO Support window positioning by mapping them to Regions.
-    // https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#positioning-in-cea-708
-    shaka.util.Functional.ignored(this.verticalAnchor_, this.relativeToggle_,
-        this.horizontalAnchor_, this.anchorId_, this.windowNum_);
   }
 
   /**
@@ -306,6 +307,8 @@ shaka.cea.Cea708Window = class {
       topLevelCue.textAlign = shaka.text.Cue.textAlign.CENTER;
     }
 
+    this.adjustRegion_(topLevelCue.region);
+
     const caption = shaka.cea.CeaUtils.getParsedCaption(
         topLevelCue, stream, this.memory_, this.startTime_, endTime);
     if (caption) {
@@ -398,6 +401,75 @@ shaka.cea.Cea708Window = class {
   setStartTime(pts) {
     this.startTime_ = pts;
   }
+
+  /**
+   * Support window positioning by mapping anchor related values to CueRegion.
+   * https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#positioning-in-cea-708
+   * @param {shaka.text.CueRegion} region
+   * @private
+   */
+  adjustRegion_(region) {
+    if (this.parentService_) {
+      region.id += 'svc' + this.parentService_;
+    }
+    region.id += 'win' + this.windowNum_;
+
+    region.height = this.rowCount_;
+    region.width = this.colCount_;
+    region.heightUnits = shaka.text.CueRegion.units.LINES;
+    region.widthUnits = shaka.text.CueRegion.units.LINES;
+
+    region.viewportAnchorX = this.horizontalAnchor_;
+    region.viewportAnchorY = this.verticalAnchor_;
+    // WebVTT's region viewport anchors are technically always in percentages.
+    // However, we don't know the aspect ratio of the video at this point,
+    // which determines how we interpret the horizontal anchor.
+    // So, we expose the additonal flag to reflect whether these viewport anchor
+    // values can be used be used as is or should be converted to percentages.
+    region.viewportAnchorUnits = this.relativeToggle_ ?
+      shaka.text.CueRegion.units.PERCENTAGE : shaka.text.CueRegion.units.LINES;
+
+    const AnchorId = shaka.cea.Cea708Window.AnchorId;
+
+    switch (this.anchorId_) {
+      case AnchorId.UPPER_LEFT:
+        region.regionAnchorX = 0;
+        region.regionAnchorY = 0;
+        break;
+      case AnchorId.UPPER_CENTER:
+        region.regionAnchorX = 50;
+        region.regionAnchorY = 0;
+        break;
+      case AnchorId.UPPER_RIGHT:
+        region.regionAnchorX = 100;
+        region.regionAnchorY = 0;
+        break;
+      case AnchorId.MIDDLE_LEFT:
+        region.regionAnchorX = 0;
+        region.regionAnchorY = 50;
+        break;
+      case AnchorId.MIDDLE_CENTER:
+        region.regionAnchorX = 50;
+        region.regionAnchorY = 50;
+        break;
+      case AnchorId.MIDDLE_RIGHT:
+        region.regionAnchorX = 100;
+        region.regionAnchorY = 50;
+        break;
+      case AnchorId.LOWER_LEFT:
+        region.regionAnchorX = 0;
+        region.regionAnchorY = 100;
+        break;
+      case AnchorId.LOWER_CENTER:
+        region.regionAnchorX = 50;
+        region.regionAnchorY = 100;
+        break;
+      case AnchorId.LOWER_RIGHT:
+        region.regionAnchorX = 100;
+        region.regionAnchorY = 100;
+        break;
+    }
+  }
 };
 
 /**
@@ -411,6 +483,22 @@ shaka.cea.Cea708Window.TextJustification = {
   FULL: 3,
 };
 
+/**
+ * Possible AnchorId values.
+ * @const @enum {number}
+ */
+shaka.cea.Cea708Window.AnchorId = {
+  UPPER_LEFT: 0,
+  UPPER_CENTER: 1,
+  UPPER_RIGHT: 2,
+  MIDDLE_LEFT: 3,
+  MIDDLE_CENTER: 4,
+  MIDDLE_RIGHT: 5,
+  LOWER_LEFT: 6,
+  LOWER_CENTER: 7,
+  LOWER_RIGHT: 8,
+};
+
 /**
  * Can be indexed 0-31 for 4:3 format, and 0-41 for 16:9 formats.
  * Thus the absolute maximum is 42 columns for the 16:9 format.

package/lib/dash/dash_parser.js

@@ -14,6 +14,7 @@ goog.require('shaka.dash.SegmentBase');
 goog.require('shaka.dash.SegmentList');
 goog.require('shaka.dash.SegmentTemplate');
 goog.require('shaka.log');
+goog.require('shaka.media.Capabilities');
 goog.require('shaka.media.ManifestParser');
 goog.require('shaka.media.PresentationTimeline');
 goog.require('shaka.media.SegmentIndex');
@@ -134,6 +135,10 @@ shaka.dash.DashParser = class {
     if (this.contentSteeringManager_) {
       this.contentSteeringManager_.configure(this.config_);
     }
+
+    this.periodCombiner_.setAllowMultiTypeVariants(
+        this.config_.dash.multiTypeVariantsAllowed &&
+        shaka.media.Capabilities.isChangeTypeSupported());
   }
 
   /**
@@ -271,8 +276,16 @@ shaka.dash.DashParser = class {
   async requestManifest_() {
     const requestType = shaka.net.NetworkingEngine.RequestType.MANIFEST;
     const type = shaka.net.NetworkingEngine.AdvancedRequestType.MPD;
+    let manifestUris = this.manifestUris_;
+    if (this.manifestUris_.length > 1 && this.contentSteeringManager_) {
+      const locations = this.contentSteeringManager_.getLocations(
+          'Location', /* ignoreBaseUrls= */ true);
+      if (locations.length) {
+        manifestUris = locations;
+      }
+    }
     const request = shaka.net.NetworkingEngine.makeRequest(
-        this.manifestUris_, this.config_.retryParameters);
+        manifestUris, this.config_.retryParameters);
     const startTime = Date.now();
 
     const response = await this.makeNetworkRequest_(
@@ -347,7 +360,6 @@ shaka.dash.DashParser = class {
    * @private
    */
   async processManifest_(mpd, finalManifestUri) {
-    const Functional = shaka.util.Functional;
     const XmlUtils = shaka.util.XmlUtils;
 
     const manifestPreprocessor = this.config_.dash.manifestPreprocessor;
@@ -355,19 +367,47 @@ shaka.dash.DashParser = class {
       manifestPreprocessor(mpd);
     }
 
+    if (this.contentSteeringManager_) {
+      this.contentSteeringManager_.clearPreviousLocations();
+    }
+
     // Get any Location elements.  This will update the manifest location and
     // the base URI.
     /** @type {!Array.<string>} */
     let manifestBaseUris = [finalManifestUri];
     /** @type {!Array.<string>} */
-    const locations = XmlUtils.findChildren(mpd, 'Location')
-        .map(XmlUtils.getContents)
-        .filter(Functional.isNotNull);
-    if (locations.length > 0) {
-      const absoluteLocations = shaka.util.ManifestParserUtils.resolveUris(
-          manifestBaseUris, locations);
-      this.manifestUris_ = absoluteLocations;
-      manifestBaseUris = absoluteLocations;
+    const locations = [];
+    /** @type {!Map.<string, string>} */
+    const locationsMapping = new Map();
+    const locationsObjs = XmlUtils.findChildren(mpd, 'Location');
+    for (const locationsObj of locationsObjs) {
+      const serviceLocation = locationsObj.getAttribute('serviceLocation');
+      const uri = XmlUtils.getContents(locationsObj);
+      if (!uri) {
+        continue;
+      }
+      const finalUri = shaka.util.ManifestParserUtils.resolveUris(
+          manifestBaseUris, [uri])[0];
+      if (serviceLocation) {
+        if (this.contentSteeringManager_) {
+          this.contentSteeringManager_.addLocation(
+              'Location', serviceLocation, finalUri);
+        } else {
+          locationsMapping.set(serviceLocation, finalUri);
+        }
+      }
+      locations.push(finalUri);
+    }
+    if (this.contentSteeringManager_) {
+      const steeringlocations = this.contentSteeringManager_.getLocations(
+          'Location', /* ignoreBaseUrls= */ true);
+      if (steeringlocations.length > 0) {
+        this.manifestUris_ = steeringlocations;
+        manifestBaseUris = steeringlocations;
+      }
+    } else if (locations.length) {
+      this.manifestUris_ = locations;
+      manifestBaseUris = locations;
     }
 
     let contentSteeringPromise = Promise.resolve();
@@ -400,13 +440,17 @@ shaka.dash.DashParser = class {
         this.contentSteeringManager_.setBaseUris(manifestBaseUris);
         this.contentSteeringManager_.setDefaultPathwayId(defaultPathwayId);
       }
+      for (const serviceLocation of locationsMapping.keys()) {
+        const uri = locationsMapping.get(serviceLocation);
+        this.contentSteeringManager_.addLocation(
+            'Location', serviceLocation, uri);
+      }
     }
 
     const uriObjs = XmlUtils.findChildren(mpd, 'BaseURL');
     let calculatedBaseUris;
     let someLocationValid = false;
     if (this.contentSteeringManager_) {
-      this.contentSteeringManager_.clearPreviousLocations();
       for (const uriObj of uriObjs) {
         const serviceLocation = uriObj.getAttribute('serviceLocation');
         const uri = XmlUtils.getContents(uriObj);

package/lib/hls/hls_parser.js

@@ -3753,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];