shaka-player 4.7.2 → 4.7.4

package/lib/ads/client_side_ad.js

@@ -155,6 +155,7 @@ shaka.ads.ClientSideAd = class {
    * @export
    */
   setVolume(volume) {
+    this.video_.volume = volume;
     return this.manager_.setVolume(volume);
   }
 
@@ -197,16 +198,26 @@ shaka.ads.ClientSideAd = class {
    * @export
    */
   setMuted(muted) {
+    this.video_.muted = muted;
     // Emulate the "mute" functionality, where current, pre-mute
     // volume is saved and can be restored on unmute.
     if (muted) {
       this.volume_ = this.getVolume();
-      this.setVolume(0);
+      this.manager_.setVolume(0);
     } else {
-      this.setVolume(this.volume_);
+      this.manager_.setVolume(this.volume_);
     }
   }
 
+  /**
+   * 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

@@ -234,10 +234,12 @@ shaka.ads.ClientSideAdManager = class {
         videoPlayHead.currentTime = this.video_.currentTime;
       });
       this.eventManager_.listen(this.video_, 'volumechange', () => {
+        if (!this.ad_) {
+          return;
+        }
+        this.ad_.setVolume(this.video_.volume);
         if (this.video_.muted) {
-          this.imaAdsManager_.setVolume(0);
-        } else {
-          this.imaAdsManager_.setVolume(this.video_.volume);
+          this.ad_.setMuted(true);
         }
       });
     }
@@ -532,9 +534,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/cea/cea608_memory.js

@@ -79,7 +79,7 @@ shaka.cea.Cea608Memory = class {
    * @return {?shaka.extern.ICaptionDecoder.ClosedCaption}
    */
   forceEmit(startTime, endTime) {
-    const stream = `CC${(this.fieldNum_<< 1) | this.channelNum_ +1}`;
+    const stream = `CC${((this.fieldNum_<< 1) | this.channelNum_) + 1}`;
     const topLevelCue = new shaka.text.Cue(
         startTime, endTime, /* payload= */ '');
     topLevelCue.lineInterpretation =

package/lib/cea/cea_decoder.js

@@ -283,7 +283,7 @@ shaka.cea.CeaDecoder = class {
     // Get the correct stream for this caption packet (CC1, ..., CC4)
     const selectedChannel = fieldNum ?
         this.currentField2Channel_ : this.currentField1Channel_;
-    const selectedMode = `CC${(fieldNum << 1) | selectedChannel + 1}`;
+    const selectedMode = `CC${((fieldNum << 1) | selectedChannel) + 1}`;
     const selectedStream = this.cea608ModeToStream_.get(selectedMode);
 
     // Check for bad frames (bad pairs). This can be two 0xff, two 0x00, or any

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

@@ -979,6 +979,22 @@ shaka.hls.HlsParser = class {
         this.presentationTimeline_.setSegmentAvailabilityDuration(
             segmentAvailabilityDuration);
       }
+
+      if (!this.presentationTimeline_.isStartTimeLocked()) {
+        const streamInfos = Array.from(this.uriToStreamInfosMap_.values());
+        const activeStreamInfos =
+            streamInfos.filter((s) => s.stream.segmentIndex);
+        for (const streamInfo of activeStreamInfos) {
+          if (streamInfo.type != 'audio' && streamInfo.type != 'video') {
+            continue;
+          }
+          const firstReference = streamInfo.stream.segmentIndex.get(0);
+          if (firstReference && firstReference.syncTime) {
+            const syncTime = firstReference.syncTime;
+            this.presentationTimeline_.setPresentationStartTime(syncTime);
+          }
+        }
+      }
     } else {
       // Use the minimum duration as the presentation duration.
       this.presentationTimeline_.setDuration(this.getMinDuration_());
@@ -2237,7 +2253,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 +3468,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 +3789,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

@@ -168,9 +168,6 @@ shaka.media.MediaSourceEngine = class {
 
       const mediaSource = new ManagedMediaSource();
 
-      this.eventManager_.listenOnce(
-          mediaSource, 'sourceopen', () => this.onSourceOpen_(p));
-
       this.eventManager_.listen(
           mediaSource, 'startstreaming', () => {
             this.streamingAllowed_ = true;
@@ -181,6 +178,9 @@ shaka.media.MediaSourceEngine = class {
             this.streamingAllowed_ = false;
           });
 
+      this.eventManager_.listenOnce(
+          mediaSource, 'sourceopen', () => this.onSourceOpen_(p));
+
       // Correctly set when playback has begun.
       this.eventManager_.listenOnce(this.video_, 'playing', () => {
         this.playbackHasBegun_ = true;
@@ -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/media/presentation_timeline.js

@@ -328,6 +328,17 @@ shaka.media.PresentationTimeline = class {
   }
 
 
+  /**
+   * Returns if the presentation timeline's start time is locked.
+   *
+   * @return {boolean}
+   * @export
+   */
+  isStartTimeLocked() {
+    return this.startTimeLocked_;
+  }
+
+
   /**
    * Gives PresentationTimeline a Stream's minimum segment start time.
    *

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/offline/session_deleter.js

@@ -71,14 +71,6 @@ shaka.offline.SessionDeleter = class {
       return [];
     }
 
-    try {
-      await drmEngine.setServerCertificate();
-    } catch (e) {
-      shaka.log.warning('Error setting server certificate', e);
-      await drmEngine.destroy();
-      return [];
-    }
-
     /** @type {!Array.<string>} */
     const sessionIds = [];
     await Promise.all(bucket.sessionIds.map(async (sessionId) => {

package/lib/player.js

@@ -4837,12 +4837,18 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     const references = [];
     for (const cue of cues) {
-      const imageUri = shaka.util.ManifestParserUtils.resolveUris(
-          [uri], [cue.payload])[0];
+      let uris = null;
+      const getUris = () => {
+        if (uris == null) {
+          uris = shaka.util.ManifestParserUtils.resolveUris(
+              [uri], [cue.payload]);
+        }
+        return uris || [];
+      };
       const reference = new shaka.media.SegmentReference(
           cue.startTime,
           cue.endTime,
-          () => [imageUri],
+          getUris,
           /* startByte= */ 0,
           /* endByte= */ null,
           /* initSegmentReference= */ null,
@@ -4850,8 +4856,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           /* appendWindowStart= */ 0,
           /* appendWindowEnd= */ Infinity,
       );
-      if (imageUri.includes('#xywh')) {
-        const spriteInfo = imageUri.split('#xywh=')[1].split(',');
+      if (cue.payload.includes('#xywh')) {
+        const spriteInfo = cue.payload.split('#xywh=')[1].split(',');
         if (spriteInfo.length === 4) {
           reference.setThumbnailSprite({
             height: parseInt(spriteInfo[3], 10),
@@ -6865,7 +6871,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.4' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/vtt_text_parser.js

@@ -451,6 +451,11 @@ shaka.text.VttTextParser = class {
    */
   static parseCueStyles(payload, rootCue, styles) {
     const VttTextParser = shaka.text.VttTextParser;
+    // Optimization for unstyled payloads.
+    if (!payload.includes('<')) {
+      rootCue.payload = VttTextParser.htmlUnescape_(payload);
+      return;
+    }
     if (styles.size === 0) {
       VttTextParser.addDefaultTextColor_(styles);
     }