shaka-player 4.7.3 → 4.7.5

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/cast/cast_proxy.js

@@ -496,6 +496,16 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
       startTime = this.sender_.get('video', 'currentTime');
     }
 
+    let activeTextTrack;
+    const textTracks = this.sender_.get('player', 'getTextTracks')();
+
+    if (textTracks && textTracks.length) {
+      activeTextTrack = textTracks.find((t) => t.active);
+    }
+
+    const isTextTrackVisible =
+        this.sender_.get('player', 'isTextTrackVisible')();
+
     // Now load the manifest, if present.
     if (assetUri) {
       // Don't autoplay the content until we finish setting up initial state.
@@ -527,6 +537,14 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
         /** @type {Object} */(this.localPlayer_)[setter](value);
       }
 
+      this.localPlayer_.setTextTrackVisibility(isTextTrackVisible);
+      if (activeTextTrack) {
+        this.localPlayer_.selectTextLanguage(
+            activeTextTrack.language,
+            activeTextTrack.roles,
+            activeTextTrack.forced);
+      }
+
       // Restore the original autoplay setting.
       this.localVideo_.autoplay = autoplay;
       if (assetUri) {

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/hls/hls_utils.js

@@ -47,12 +47,12 @@ shaka.hls.Utils = class {
    * @return {?shaka.hls.Tag}
    */
   static getFirstTagWithName(tags, name) {
-    const tagsWithName = shaka.hls.Utils.filterTagsByName(tags, name);
-    if (!tagsWithName.length) {
-      return null;
+    for (const tag of tags) {
+      if (tag.name === name) {
+        return tag;
+      }
     }
-
-    return tagsWithName[0];
+    return null;
   }
 
   /**

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;
@@ -1805,7 +1805,7 @@ shaka.media.MediaSourceEngine = class {
 
       this.destroyer_.ensureNotDestroyed();
 
-      this.eventManager_.listenOnce(this.video_, 'canplay', () => {
+      this.eventManager_.listenOnce(this.video_, 'canplaythrough', () => {
         this.destroyer_.ensureNotDestroyed();
 
         this.video_.autoplay = previousAutoPlayState;

package/lib/media/play_rate_controller.js

@@ -41,6 +41,7 @@ shaka.media.PlayRateController = class {
 
   /** @override */
   release() {
+    this.set(this.getDefaultRate());
     if (this.timer_) {
       this.timer_.stop();
       this.timer_ = null;

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

@@ -550,6 +550,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
      */
     this.loadEventManager_ = new shaka.util.EventManager();
 
+    /**
+     * For listeners scoped to the lifetime of the loaded content.
+     * @private {shaka.util.EventManager}
+     */
+    this.trickPlayEventManager_ = new shaka.util.EventManager();
+
     /** @private {shaka.net.NetworkingEngine} */
     this.networkingEngine_ = null;
 
@@ -848,6 +854,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.loadEventManager_.release();
       this.loadEventManager_ = null;
     }
+    if (this.trickPlayEventManager_) {
+      this.trickPlayEventManager_.release();
+      this.trickPlayEventManager_ = null;
+    }
 
     this.abrManagerFactory_ = null;
     this.config_ = null;
@@ -1166,6 +1176,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // element.
       if (this.video_) {
         this.loadEventManager_.removeAll();
+        this.trickPlayEventManager_.removeAll();
       }
 
       // Stop the variant checker timer
@@ -3569,6 +3580,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       shaka.log.alwaysWarn('A trick play rate of 0 is unsupported!');
       return;
     }
+    this.trickPlayEventManager_.removeAll();
 
     if (this.video_.paused) {
       // Our fast forward is implemented with playbackRate and needs the video
@@ -3582,6 +3594,22 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.abrManager_.playbackRateChanged(rate);
       this.streamingEngine_.setTrickPlay(Math.abs(rate) > 1);
     }
+    if (this.isLive()) {
+      this.trickPlayEventManager_.listen(this.video_, 'timeupdate', () => {
+        const currentTime = this.video_.currentTime;
+        const seekRange = this.seekRange();
+        const safeSeekOffset = this.config_.streaming.safeSeekOffset;
+        if (rate > 0) {
+          if (currentTime >= seekRange.end) {
+            this.cancelTrickPlay();
+          }
+        } else {
+          if (currentTime <= (seekRange.start + safeSeekOffset)) {
+            this.cancelTrickPlay();
+          }
+        }
+      });
+    }
   }
 
   /**
@@ -3601,6 +3629,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.abrManager_.playbackRateChanged(defaultPlaybackRate);
       this.streamingEngine_.setTrickPlay(false);
     }
+    this.trickPlayEventManager_.removeAll();
   }
 
   /**
@@ -4837,12 +4866,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 +4885,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 +6900,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.5' + '-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/ttml_text_parser.js

@@ -491,6 +491,11 @@ shaka.text.TtmlTextParser = class {
             region.viewportAnchorX = region.viewportAnchorX * 100 /
               globalWidth;
           }
+        } else if (!extent) {
+          region.width = 100 - region.viewportAnchorX;
+          region.widthUnits = shaka.text.CueRegion.units.PERCENTAGE;
+          region.height = 100 - region.viewportAnchorY;
+          region.heightUnits = shaka.text.CueRegion.units.PERCENTAGE;
         }
 
         region.viewportAnchorUnits = percentage || globalWidth != null ?

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/lib/util/language_utils.js

@@ -192,25 +192,24 @@ shaka.util.LanguageUtils = class {
     const LanguageUtils = shaka.util.LanguageUtils;
 
     const privateusePrefix = 'x-';
-    const components = locale.split(`-${privateusePrefix}`);
-    const languageAndRegion = components[0].split('-');
+    const [languageRegion = '', privateuseSuffix = ''] =
+     locale.split(`-${privateusePrefix}`);
+    const [languageCode = '', regionCode = ''] = languageRegion.split('-');
 
     // We are only going to use the language, the region and the "privateuse" part (as per https://datatracker.ietf.org/doc/html/rfc5646).
     // Anything else is thrown away.
-    let language = languageAndRegion[0] || '';
-    let region = languageAndRegion[1] || '';
-    const privateuse = components[1] ?
-        `${privateusePrefix}${components[1]}` : '';
+    const privateuse = privateuseSuffix ?
+        `${privateusePrefix}${privateuseSuffix}` : '';
 
     // Convert the language to lower case. It is standard for the language code
     // to be in lower case, but it will also make the map look-up easier.
-    language = language.toLowerCase();
+    let language = languageCode.toLowerCase();
     language = LanguageUtils.isoMap_.get(language) || language;
 
     // Convert the region to upper case. It is standard for the region to be in
     // upper case. If there is no upper code, then it will be an empty string
     // and this will be a no-op.
-    region = region.toUpperCase();
+    const region = regionCode.toUpperCase();
 
     return `${region ? `${language}-${region}` : language}${
         privateuse ? `-${privateuse}` : ''}`;

package/lib/util/periods.js

@@ -724,7 +724,9 @@ shaka.util.PeriodCombiner = class {
         // Add the codec of this stream to the output stream's codecs.
         const codecs = new Set(outputStream.codecs.split(','));
         for (const codec of match.codecs.split(',')) {
-          codecs.add(codec);
+          if (codec) {
+            codecs.add(codec);
+          }
         }
         const PeriodCombiner = shaka.util.PeriodCombiner;
         outputStream.codecs = PeriodCombiner.filterDuplicateCodecs_(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.7.3",
+  "version": "4.7.5",
   "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/playback_rate_selection.js

@@ -44,6 +44,10 @@ shaka.ui.PlaybackRateSelection = class extends shaka.ui.SettingsMenu {
           this.updateLocalizedStrings_();
         });
 
+    this.eventManager.listen(this.player, 'loaded', () => {
+      this.updatePlaybackRateSelection_(this.player.getPlaybackRate());
+    });
+
     this.eventManager.listen(this.player, 'ratechange', () => {
       this.updatePlaybackRateSelection_(this.player.getPlaybackRate());
     });

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;