shaka-player 4.7.2 → 4.7.3

package/lib/ads/client_side_ad.js

@@ -207,6 +207,15 @@ shaka.ads.ClientSideAd = class {
     }
   }
 
+  /**
+   * It's required for a muted ad to start when autoplaying.
+   *
+   * @param {number} videoVolume
+   */
+  setInitialMuted(videoVolume) {
+    this.volume_ = videoVolume;
+    this.manager_.setVolume(0);
+  }
 
   /**
    * @override

package/lib/ads/client_side_ad_manager.js

@@ -532,9 +532,10 @@ shaka.ads.ClientSideAdManager = class {
     if (this.ad_.isLinear()) {
       this.adContainer_.setAttribute('ad-active', 'true');
       this.video_.pause();
-      this.ad_.setVolume(this.video_.volume);
       if (this.video_.muted) {
-        this.ad_.setMuted(true);
+        this.ad_.setInitialMuted(this.video_.volume);
+      } else {
+        this.ad_.setVolume(this.video_.volume);
       }
     }
   }

package/lib/dash/dash_parser.js

@@ -1609,7 +1609,6 @@ shaka.dash.DashParser = class {
         hdr,
         videoLayout: undefined,
         tilesLayout,
-        matchedStreams: [],
         accessibilityPurpose,
         external: false,
         fastSwitching: false,

package/lib/hls/hls_parser.js

@@ -2237,7 +2237,7 @@ shaka.hls.HlsParser = class {
       stream.keyIds = realStream.keyIds;
       stream.mimeType = realStream.mimeType;
       stream.bandwidth = realStream.bandwidth;
-      stream.codecs = realStream.codecs || stream.codecs;
+      stream.codecs = stream.codecs || realStream.codecs;
 
       // Since we lazy-loaded this content, the player may need to create new
       // sessions for the DRM info in this stream.
@@ -3452,6 +3452,13 @@ shaka.hls.HlsParser = class {
     if (this.isLive_() && mediaSequenceToStartTime.has(position)) {
       firstStartTime = mediaSequenceToStartTime.get(position);
     }
+    // This is for recovering from disconnects.
+    if (firstStartTime === 0 &&
+        this.presentationType_ == shaka.hls.HlsParser.PresentationType_.LIVE &&
+        mediaSequenceToStartTime.size > 0 &&
+        !mediaSequenceToStartTime.has(position)) {
+      firstStartTime = this.presentationTimeline_.getSegmentAvailabilityStart();
+    }
 
     /** @type {!Array.<!shaka.media.SegmentReference>} */
     const references = [];
@@ -3766,7 +3773,9 @@ shaka.hls.HlsParser = class {
 
       contentMimeType = response.headers['content-type'];
     } catch (error) {
-      if (error && error.code == shaka.util.Error.Code.HTTP_ERROR) {
+      if (error &&
+        (error.code == shaka.util.Error.Code.HTTP_ERROR ||
+         error.code == shaka.util.Error.Code.BAD_HTTP_STATUS)) {
         headRequest.method = 'GET';
         const response = await this.makeNetworkRequest_(
             headRequest, requestType, {type});

package/lib/media/media_source_engine.js

@@ -460,9 +460,10 @@ shaka.media.MediaSourceEngine = class {
    * @param {shaka.util.ManifestParserUtils.ContentType} contentType
    * @param {shaka.extern.Stream} stream
    * @param {string} codecs
+   * @param {boolean=} forceTransmux
    * @private
    */
-  initSourceBuffer_(contentType, stream, codecs) {
+  initSourceBuffer_(contentType, stream, codecs, forceTransmux = false) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
     goog.asserts.assert(
@@ -474,7 +475,7 @@ shaka.media.MediaSourceEngine = class {
     if (contentType == ContentType.TEXT) {
       this.reinitText(mimeType, this.sequenceMode_, stream.external);
     } else {
-      let needTransmux = this.config_.forceTransmux;
+      let needTransmux = this.config_.forceTransmux || forceTransmux;
       if (!shaka.media.Capabilities.isTypeSupported(mimeType) ||
           (!this.sequenceMode_ &&
           shaka.util.MimeUtils.RAW_FORMATS.includes(mimeType))) {
@@ -491,8 +492,10 @@ shaka.media.MediaSourceEngine = class {
             ContentType.VIDEO, (codecs || '').split(','));
         if (audioCodec && videoCodec) {
           this.needSplitMuxedContent_ = true;
-          this.initSourceBuffer_(ContentType.AUDIO, stream, audioCodec);
-          this.initSourceBuffer_(ContentType.VIDEO, stream, videoCodec);
+          this.initSourceBuffer_(
+              ContentType.AUDIO, stream, audioCodec, /* forceTransmux= */ true);
+          this.initSourceBuffer_(
+              ContentType.VIDEO, stream, videoCodec, /* forceTransmux= */ true);
           return;
         }
         const transmuxerPlugin =
@@ -1854,7 +1857,8 @@ shaka.media.MediaSourceEngine = class {
     let needTransmux = this.config_.forceTransmux;
     if (!shaka.media.Capabilities.isTypeSupported(newMimeType) ||
         (!this.sequenceMode_ &&
-        shaka.util.MimeUtils.RAW_FORMATS.includes(newMimeType))) {
+        shaka.util.MimeUtils.RAW_FORMATS.includes(newMimeType)) ||
+        codecs.includes(',')) {
       needTransmux = true;
     }
     const TransmuxerEngine = shaka.transmuxer.TransmuxerEngine;
@@ -1935,7 +1939,8 @@ shaka.media.MediaSourceEngine = class {
     let needTransmux = this.config_.forceTransmux;
     if (!shaka.media.Capabilities.isTypeSupported(newMimeType) ||
         (!this.sequenceMode_ &&
-        shaka.util.MimeUtils.RAW_FORMATS.includes(newMimeType))) {
+        shaka.util.MimeUtils.RAW_FORMATS.includes(newMimeType)) ||
+        stream.codecs.includes(',')) {
       needTransmux = true;
     }
     const newMimeTypeWithAllCodecs =

package/lib/net/networking_utils.js

@@ -37,7 +37,9 @@ shaka.net.NetworkingUtils = class {
       const response = await netEngine.request(type, request).promise;
       mimeType = response.headers['content-type'];
     } catch (error) {
-      if (error && error.code == shaka.util.Error.Code.HTTP_ERROR) {
+      if (error &&
+        (error.code == shaka.util.Error.Code.HTTP_ERROR ||
+          error.code == shaka.util.Error.Code.BAD_HTTP_STATUS)) {
         request.method = 'GET';
         const response = await netEngine.request(type, request).promise;
         mimeType = response.headers['content-type'];

package/lib/player.js

@@ -6865,7 +6865,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.7.2' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.7.3' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/patchedmediakeys_apple.js

@@ -791,3 +791,9 @@ shaka.polyfill.PatchedMediaKeysApple.MediaKeyStatusMap = class {
     goog.asserts.assert(false, 'Not used!  Provided only for the compiler.');
   }
 };
+
+if (!navigator.requestMediaKeySystemAccess ||
+    // eslint-disable-next-line no-restricted-syntax
+    !MediaKeySystemAccess.prototype.getConfiguration) {
+  shaka.polyfill.register(shaka.polyfill.PatchedMediaKeysApple.install);
+}