shaka-player 4.7.3 → 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,13 +198,14 @@ 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_);
     }
   }
 

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);
         }
       });
     }

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/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_());

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;

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/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.3' + '-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/polyfill/patchedmediakeys_apple.js

@@ -791,9 +791,3 @@ 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);
-}

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);
     }

package/package.json

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

package/ui/play_button.js

@@ -72,6 +72,11 @@ shaka.ui.PlayButton = class extends shaka.ui.Element {
       this.updateIcon();
     });
 
+    this.eventManager.listen(this.adManager, AdManager.AD_STOPPED, () => {
+      this.updateAriaLabel();
+      this.updateIcon();
+    });
+
     this.eventManager.listen(this.button, 'click', () => {
       if (this.ad && this.ad.isLinear()) {
         this.controls.playPauseAd();
@@ -99,6 +104,18 @@ shaka.ui.PlayButton = class extends shaka.ui.Element {
     return this.controls.presentationIsPaused();
   }
 
+  /**
+   * @return {boolean}
+   * @protected
+   */
+  isEnded() {
+    if (this.ad && this.ad.isLinear()) {
+      return false;
+    }
+
+    return this.video.ended;
+  }
+
   /**
    * Called when the button's aria label needs to change.
    * To be overridden by subclasses.

package/ui/small_play_button.js

@@ -38,7 +38,7 @@ shaka.ui.SmallPlayButton = class extends shaka.ui.PlayButton {
   /** @override */
   updateIcon() {
     const Icons = shaka.ui.Enums.MaterialDesignIcons;
-    if (this.video.ended) {
+    if (this.isEnded()) {
       this.button.textContent = Icons.REPLAY;
     } else {
       this.button.textContent = this.isPaused() ? Icons.PLAY : Icons.PAUSE;
@@ -48,7 +48,7 @@ shaka.ui.SmallPlayButton = class extends shaka.ui.PlayButton {
   /** @override */
   updateAriaLabel() {
     const LocIds = shaka.ui.Locales.Ids;
-    if (this.video.ended) {
+    if (this.isEnded()) {
       this.button.ariaLabel = this.localization.resolve(LocIds.REPLAY);
     } else {
       const label = this.isPaused() ? LocIds.PLAY : LocIds.PAUSE;