shaka-player 4.11.13 → 4.12.1

package/lib/util/periods.js

@@ -1607,6 +1607,7 @@ shaka.util.PeriodCombiner = class {
       closedCaptions: null,
       external: false,
       fastSwitching: false,
+      isAudioMuxedInVideo: false,
     };
   }
 
@@ -1649,6 +1650,7 @@ shaka.util.PeriodCombiner = class {
       external: false,
       fastSwitching: false,
       fullMimeTypes: new Set(),
+      isAudioMuxedInVideo: false,
     };
   }
 

package/lib/util/platform.js

@@ -489,6 +489,21 @@ shaka.util.Platform = class {
     return navigator.platform.toLowerCase().includes('mac');
   }
 
+  /**
+   * Return true if the platform is a VisionOS.
+   *
+   * @return {boolean}
+   */
+  static isVisionOS() {
+    if (!shaka.util.Platform.isMac()) {
+      return false;
+    }
+    if (!('xr' in navigator)) {
+      return false;
+    }
+    return true;
+  }
+
   /**
    * Return true if the platform is a Windows, regardless of the browser.
    *

package/lib/util/player_configuration.js

@@ -118,6 +118,7 @@ shaka.util.PlayerConfiguration = class {
       disableVideo: false,
       disableText: false,
       disableThumbnails: false,
+      disableIFrames: false,
       defaultPresentationDelay: 0,
       segmentRelativeVttTiming: false,
       raiseFatalErrorOnManifestUpdateRequestFailure: false,
@@ -125,7 +126,7 @@ shaka.util.PlayerConfiguration = class {
       dash: {
         clockSyncUri: '',
         ignoreDrmInfo: false,
-        disableXlinkProcessing: false,
+        disableXlinkProcessing: true,
         xlinkFailGracefully: false,
         ignoreMinBufferTime: false,
         autoCorrectDrift: true,
@@ -144,13 +145,14 @@ shaka.util.PlayerConfiguration = class {
             'com.microsoft.playready',
           'urn:uuid:79f0049a-4098-8642-ab92-e65be0885f95':
             'com.microsoft.playready',
+          'urn:uuid:94ce86fb-07ff-4f43-adb8-93d2fa968ca2':
+            'com.apple.fps',
         },
         manifestPreprocessor:
             shaka.util.PlayerConfiguration.defaultManifestPreprocessor,
         manifestPreprocessorTXml:
             shaka.util.PlayerConfiguration.defaultManifestPreprocessorTXml,
         sequenceMode: false,
-        enableAudioGroups: false,
         multiTypeVariantsAllowed,
         useStreamOnceInPeriodFlattening: false,
         updatePeriod: -1,
@@ -170,6 +172,7 @@ shaka.util.PlayerConfiguration = class {
         ignoreManifestTimestampsInSegmentsMode: false,
         disableCodecGuessing: false,
         disableClosedCaptionsDetection: false,
+        updatePeriod: -1,
         allowLowLatencyByteRangeOptimization: true,
       },
       mss: {
@@ -214,6 +217,7 @@ shaka.util.PlayerConfiguration = class {
       // Offset by 5 seconds since Chromecast takes a few seconds to start
       // playing after a seek, even when buffered.
       safeSeekOffset: 5,
+      safeSeekEndOffset: 0,
       stallEnabled: true,
       stallThreshold: 1 /* seconds */,
       stallSkip: 0.1 /* seconds */,
@@ -231,10 +235,8 @@ shaka.util.PlayerConfiguration = class {
       minBytesForProgressEvents: minBytes,
       preferNativeHls: false,
       updateIntervalSeconds: 1,
-      dispatchAllEmsgBoxes: false,
       observeQualityChanges: false,
       maxDisabledTime: 30,
-      parsePrftBox: false,
       // When low latency streaming is enabled, segmentPrefetchLimit will
       // default to 2 if not specified.
       segmentPrefetchLimit: 0,
@@ -399,6 +401,7 @@ shaka.util.PlayerConfiguration = class {
             [cue, uri],
             undefined);
       },
+      dispatchAllEmsgBoxes: false,
     };
 
     let customPlayheadTracker = false;
@@ -414,6 +417,8 @@ shaka.util.PlayerConfiguration = class {
       customPlayheadTracker,
       skipPlayDetection,
       supportsMultipleMediaElements,
+      disableHLSInterstitial: false,
+      disableDASHInterstitial: false,
     };
 
     const textDisplayer = {
@@ -443,6 +448,7 @@ shaka.util.PlayerConfiguration = class {
       preferredVideoLabel: '',
       preferredVideoCodecs: [],
       preferredAudioCodecs: [],
+      preferredTextFormats: [],
       preferForcedSubs: false,
       preferSpatialAudio: false,
       preferredDecodingAttributes: [],
@@ -468,6 +474,7 @@ shaka.util.PlayerConfiguration = class {
       cmsd: cmsd,
       lcevc: lcevc,
       ads: ads,
+      ignoreHardwareResolution: false,
     };
 
     // Add this callback so that we can reference the preferred audio language

package/lib/util/stream_utils.js

@@ -33,12 +33,31 @@ shaka.util.StreamUtils = class {
    * @param {!Array.<string>} preferredVideoCodecs
    * @param {!Array.<string>} preferredAudioCodecs
    * @param {!Array.<string>} preferredDecodingAttributes
+   * @param {!Array.<string>} preferredTextFormats
    */
   static chooseCodecsAndFilterManifest(manifest, preferredVideoCodecs,
-      preferredAudioCodecs, preferredDecodingAttributes) {
+      preferredAudioCodecs, preferredDecodingAttributes, preferredTextFormats) {
     const StreamUtils = shaka.util.StreamUtils;
     const MimeUtils = shaka.util.MimeUtils;
 
+    if (preferredTextFormats.length) {
+      let subset = manifest.textStreams;
+      for (const textFormat of preferredTextFormats) {
+        const filtered = subset.filter((textStream) => {
+          if (textStream.codecs.startsWith(textFormat) ||
+              textStream.mimeType.startsWith(textFormat)) {
+            return true;
+          }
+          return false;
+        });
+        if (filtered.length) {
+          subset = filtered;
+          break;
+        }
+      }
+      manifest.textStreams = subset;
+    }
+
     let variants = manifest.variants;
     // To start, choose the codecs based on configured preferences if available.
     if (preferredVideoCodecs.length || preferredAudioCodecs.length) {

package/package.json

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

package/ui/ad_statistics_button.js

@@ -189,6 +189,18 @@ shaka.ui.AdStatisticsButton = class extends shaka.ui.Element {
 
   /** @private */
   loadContainer_() {
+    const closeElement = shaka.util.Dom.createHTMLElement('div');
+    closeElement.classList.add('shaka-no-propagation');
+    closeElement.classList.add('shaka-statistics-close');
+    const icon = shaka.util.Dom.createHTMLElement('i');
+    icon.classList.add('material-icons-round');
+    icon.textContent =
+      shaka.ui.Enums.MaterialDesignIcons.CLOSE;
+    closeElement.appendChild(icon);
+    this.container_.appendChild(closeElement);
+    this.eventManager.listen(icon, 'click', () => {
+      this.onClick_();
+    });
     for (const name of this.controls.getConfig().adStatisticsList) {
       if (name in this.currentStats_) {
         this.container_.appendChild(this.generateComponent_(name));

package/ui/controls.js

@@ -29,6 +29,7 @@ goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.FakeEventTarget');
 goog.require('shaka.util.IDestroyable');
+goog.require('shaka.util.Platform');
 goog.require('shaka.util.Timer');
 
 goog.requireType('shaka.Player');
@@ -203,6 +204,7 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
         shaka.ui.Localization.LOCALE_CHANGED, (e) => {
           const locale = e['locales'][0];
           this.adManager_.setLocale(locale);
+          this.videoContainer_.setAttribute('lang', locale);
         });
 
     this.adManager_.initInterstitial(
@@ -604,16 +606,38 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
 
   /**
    * @return {boolean}
-   * @export
+   * @private
    */
-  isFullScreenSupported() {
-    if (document.fullscreenEnabled) {
-      return true;
+  shouldUseDocumentFullscreen_() {
+    if (!document.fullscreenEnabled) {
+      return false;
     }
+    // When the preferVideoFullScreenInVisionOS configuration value applies,
+    // we avoid using document fullscreen, even if it is available.
     const video = /** @type {HTMLVideoElement} */(this.localVideo_);
     if (video.webkitSupportsFullscreen) {
+      if (this.config_.preferVideoFullScreenInVisionOS &&
+          shaka.util.Platform.isVisionOS()) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * @return {boolean}
+   * @export
+   */
+  isFullScreenSupported() {
+    if (this.shouldUseDocumentFullscreen_()) {
       return true;
     }
+    if (!this.ad_ || !this.ad_.isUsingAnotherMediaElement()) {
+      const video = /** @type {HTMLVideoElement} */(this.localVideo_);
+      if (video.webkitSupportsFullscreen) {
+        return true;
+      }
+    }
     return false;
   }
 
@@ -622,7 +646,7 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
    * @export
    */
   isFullScreenEnabled() {
-    if (document.fullscreenEnabled) {
+    if (this.shouldUseDocumentFullscreen_()) {
       return !!document.fullscreenElement;
     }
     const video = /** @type {HTMLVideoElement} */(this.localVideo_);
@@ -635,7 +659,7 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
   /** @private */
   async enterFullScreen_() {
     try {
-      if (document.fullscreenEnabled) {
+      if (this.shouldUseDocumentFullscreen_()) {
         if (document.pictureInPictureElement) {
           await document.exitPictureInPicture();
         }
@@ -666,7 +690,7 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
 
   /** @private */
   async exitFullScreen_() {
-    if (document.fullscreenEnabled) {
+    if (this.shouldUseDocumentFullscreen_()) {
       if (screen.orientation) {
         screen.orientation.unlock();
       }

package/ui/externs/ui.js

@@ -97,7 +97,8 @@ shaka.extern.UIVolumeBarColors;
  *   refreshTickInSeconds: number,
  *   displayInVrMode: boolean,
  *   defaultVrProjectionMode: string,
- *   setupMediaSession: boolean
+ *   setupMediaSession: boolean,
+ *   preferVideoFullScreenInVisionOS: boolean
  * }}
  *
  * @property {!Array.<string>} controlPanelElements
@@ -254,6 +255,12 @@ shaka.extern.UIVolumeBarColors;
  *   the ID3 APIC and TIT2 as image and title in Media Session, and ID3 APIC
  *   will also be used to change video poster.
  *   Defaults to true.
+ * @property {boolean} preferVideoFullScreenInVisionOS
+ *   If true, we will use the fullscreen API of the video element itself if it
+ *   is available in Vision OS. This is useful to be able to access 3D
+ *   experiences that are only allowed with the fullscreen of the video element
+ *   itself.
+ *   Defaults to false.
  * @exportDoc
  */
 shaka.extern.UIConfiguration;

package/ui/fullscreen_button.js

@@ -7,6 +7,7 @@
 
 goog.provide('shaka.ui.FullscreenButton');
 
+goog.require('shaka.ads.Utils');
 goog.require('shaka.ui.Controls');
 goog.require('shaka.ui.Element');
 goog.require('shaka.ui.Enums');
@@ -69,6 +70,14 @@ shaka.ui.FullscreenButton = class extends shaka.ui.Element {
     this.eventManager.listen(this.localVideo_, 'loadeddata', () => {
       this.checkSupport_();
     });
+
+    this.eventManager.listen(this.adManager, shaka.ads.Utils.AD_STARTED, () => {
+      this.checkSupport_();
+    });
+
+    this.eventManager.listen(this.adManager, shaka.ads.Utils.AD_STOPPED, () => {
+      this.checkSupport_();
+    });
   }
 
   /**

package/ui/locales/be.json

@@ -0,0 +1,49 @@
+{
+  "AD_DURATION": "Працягласць рэкламы",
+  "AD_PROGRESS": "Рэклама [AD_ON] з [NUM_ADS]",
+  "AD_STATISTICS": "Статыстыка аб'яўленняў",
+  "AD_TIME": "Рэклама: [AD_TIME]",
+  "AIRPLAY": "AirPlay",
+  "AUTO_QUALITY": "Аўта",
+  "BACK": "Назад",
+  "CAPTIONS": "Субцітры",
+  "CAST": "Трансляваць...",
+  "CHAPTERS": "Раздзелы",
+  "DOWNLOAD_VIDEO_FRAME": "Захаваць кадр відэа",
+  "ENTER_LOOP_MODE": "Зацыкліць цяперашняе відэа",
+  "ENTER_PICTURE_IN_PICTURE": "Перайсці ў рэжым \"Выява ў выяве\"",
+  "EXIT_FULL_SCREEN": "Звычайны рэжым",
+  "EXIT_LOOP_MODE": "Адмяніць зацыкліванне цяперашняга відэа",
+  "EXIT_PICTURE_IN_PICTURE": "Выйсці з рэжыма \"Выява ў выяве\"",
+  "FAST_FORWARD": "Перамотка наперад",
+  "FULL_SCREEN": "Поўнаэкраны рэжым",
+  "LANGUAGE": "Мова",
+  "LIVE": "Ужывую",
+  "LOOP": "Зацыкліць",
+  "MORE_SETTINGS": "Дадатковыя налады",
+  "MULTIPLE_LANGUAGES": "Несколько моваў",
+  "MUTE": "Адключыць гук",
+  "NOT_APPLICABLE": "Не ўжываецца",
+  "OFF": "Выкл.",
+  "ON": "Укл.",
+  "PAUSE": "Паўза",
+  "PICTURE_IN_PICTURE": "Выява ў выяве",
+  "PLAY": "Прайграць",
+  "PLAYBACK_RATE": "Хуткасць прайгравання",
+  "QUALITY": "Якасць",
+  "RECENTER_VR": "Цэнтраваць зноў",
+  "REPLAY": "Паўтарыць",
+  "RESOLUTION": "Раздзяляльнасць",
+  "REWIND": "Перамотка назад",
+  "SEEK": "Перамотка",
+  "SKIP_AD": "Прапусціць",
+  "SKIP_TO_LIVE": "Прапусціць і перайсці да жывога эфіра",
+  "STATISTICS": "Статыстыка",
+  "SUBTITLE_FORCED": "Субцітры прымусова",
+  "SURROUND": "Аб'ёмны гук",
+  "TOGGLE_STEREOSCOPIC": "Уключыць або адключыць стэрэаскапічны рэжым",
+  "UNDETERMINED_LANGUAGE": "Не пазначана",
+  "UNMUTE": "Уключыць гук",
+  "UNRECOGNIZED_LANGUAGE": "Не распазнана",
+  "VOLUME": "Гучнасць"
+}

package/ui/mute_button.js

@@ -8,11 +8,13 @@
 goog.provide('shaka.ui.MuteButton');
 
 goog.require('shaka.ads.Utils');
+goog.require('shaka.ui.ContextMenu');
 goog.require('shaka.ui.Controls');
 goog.require('shaka.ui.Element');
 goog.require('shaka.ui.Enums');
 goog.require('shaka.ui.Locales');
 goog.require('shaka.ui.Localization');
+goog.require('shaka.ui.OverflowMenu');
 goog.require('shaka.util.Dom');
 
 
@@ -29,23 +31,44 @@ shaka.ui.MuteButton = class extends shaka.ui.Element {
   constructor(parent, controls) {
     super(parent, controls);
 
+    const LocIds = shaka.ui.Locales.Ids;
     /** @private {!HTMLButtonElement} */
     this.button_ = shaka.util.Dom.createButton();
     this.button_.classList.add('shaka-mute-button');
-    this.button_.classList.add('material-icons-round');
     this.button_.classList.add('shaka-tooltip');
+
+    /** @private {!HTMLElement} */
+    this.icon_ = shaka.util.Dom.createHTMLElement('i');
+    this.icon_.classList.add('material-icons-round');
+    this.icon_.textContent = shaka.ui.Enums.MaterialDesignIcons.MUTE;
+    this.button_.appendChild(this.icon_);
+
+    const label = shaka.util.Dom.createHTMLElement('label');
+    label.classList.add('shaka-overflow-button-label');
+    label.classList.add('shaka-overflow-menu-only');
+    this.nameSpan_ = shaka.util.Dom.createHTMLElement('span');
+    this.nameSpan_.textContent = this.localization.resolve(LocIds.MUTE);
+    label.appendChild(this.nameSpan_);
+
+    /** @private {!HTMLElement} */
+    this.currentState_ = shaka.util.Dom.createHTMLElement('span');
+    this.currentState_.classList.add('shaka-current-selection-span');
+    label.appendChild(this.currentState_);
+
+    this.button_.appendChild(label);
+
     this.parent.appendChild(this.button_);
-    this.updateAriaLabel_();
+    this.updateLocalizedStrings_();
     this.updateIcon_();
 
     this.eventManager.listen(
         this.localization, shaka.ui.Localization.LOCALE_UPDATED, () => {
-          this.updateAriaLabel_();
+          this.updateLocalizedStrings_();
         });
 
     this.eventManager.listen(
         this.localization, shaka.ui.Localization.LOCALE_CHANGED, () => {
-          this.updateAriaLabel_();
+          this.updateLocalizedStrings_();
         });
 
     this.eventManager.listen(this.button_, 'click', () => {
@@ -57,19 +80,19 @@ shaka.ui.MuteButton = class extends shaka.ui.Element {
     });
 
     this.eventManager.listen(this.video, 'volumechange', () => {
-      this.updateAriaLabel_();
+      this.updateLocalizedStrings_();
       this.updateIcon_();
     });
 
     this.eventManager.listen(this.adManager,
         shaka.ads.Utils.AD_VOLUME_CHANGED, () => {
-          this.updateAriaLabel_();
+          this.updateLocalizedStrings_();
           this.updateIcon_();
         });
 
     this.eventManager.listen(this.adManager,
         shaka.ads.Utils.AD_MUTED, () => {
-          this.updateAriaLabel_();
+          this.updateLocalizedStrings_();
           this.updateIcon_();
         });
 
@@ -80,7 +103,7 @@ shaka.ui.MuteButton = class extends shaka.ui.Element {
           // the label and icon code depends on this.ad being correctly
           // updated at the time it runs.
           this.ad = null;
-          this.updateAriaLabel_();
+          this.updateLocalizedStrings_();
           this.updateIcon_();
         });
   }
@@ -88,7 +111,7 @@ shaka.ui.MuteButton = class extends shaka.ui.Element {
   /**
    * @private
    */
-  updateAriaLabel_() {
+  updateLocalizedStrings_() {
     const LocIds = shaka.ui.Locales.Ids;
     let label;
     if (this.ad) {
@@ -98,6 +121,7 @@ shaka.ui.MuteButton = class extends shaka.ui.Element {
     }
 
     this.button_.ariaLabel = this.localization.resolve(label);
+    this.nameSpan_.textContent = this.localization.resolve(label);
   }
 
   /**
@@ -111,7 +135,7 @@ shaka.ui.MuteButton = class extends shaka.ui.Element {
     } else {
       icon = this.video.muted ? Icons.UNMUTE : Icons.MUTE;
     }
-    this.button_.textContent = icon;
+    this.icon_.textContent = icon;
   }
 };
 
@@ -127,4 +151,11 @@ shaka.ui.MuteButton.Factory = class {
   }
 };
 
-shaka.ui.Controls.registerElement('mute', new shaka.ui.MuteButton.Factory());
+shaka.ui.OverflowMenu.registerElement(
+    'mute', new shaka.ui.MuteButton.Factory());
+
+shaka.ui.Controls.registerElement(
+    'mute', new shaka.ui.MuteButton.Factory());
+
+shaka.ui.ContextMenu.registerElement(
+    'mute', new shaka.ui.MuteButton.Factory());

package/ui/skip_ad_button.js

@@ -142,17 +142,20 @@ shaka.ui.SkipAdButton = class extends shaka.ui.Element {
   onTimerTick_() {
     goog.asserts.assert(this.ad != null,
         'this.ad should exist at this point');
-
-    const secondsLeft = Math.round(this.ad.getTimeUntilSkippable());
-    if (secondsLeft > 0) {
-      this.counter_.textContent = secondsLeft;
+    if (this.ad.isSkippable()) {
+      const secondsLeft = Math.round(this.ad.getTimeUntilSkippable());
+      if (secondsLeft > 0) {
+        this.counter_.textContent = secondsLeft;
+      } else {
+        // The ad should now be skippable. OnSkipStateChanged() is
+        // listening for a SKIP_STATE_CHANGED event and will take care
+        // of the button. Here we just stop the timer and hide the counter.
+        // NOTE: onSkipStateChanged_() also hides the counter.
+        this.timer_.stop();
+        shaka.ui.Utils.setDisplay(this.counter_, false);
+      }
     } else {
-      // The ad should now be skippable. OnSkipStateChanged() is
-      // listening for a SKIP_STATE_CHANGED event and will take care
-      // of the button. Here we just stop the timer and hide the counter.
-      // NOTE: onSkipStateChanged_() also hides the counter.
-      this.timer_.stop();
-      shaka.ui.Utils.setDisplay(this.counter_, false);
+      this.reset_();
     }
   }
 
@@ -161,7 +164,9 @@ shaka.ui.SkipAdButton = class extends shaka.ui.Element {
    */
   onSkipStateChanged_() {
     // Double-check that the ad is now skippable
-    if (this.ad.canSkipNow()) {
+    if (!this.ad.isSkippable()) {
+      this.reset_();
+    } else if (this.ad.canSkipNow()) {
       this.button_.disabled = false;
       this.timer_.stop();
       shaka.ui.Utils.setDisplay(this.counter_, false);

package/ui/statistics_button.js

@@ -239,6 +239,18 @@ shaka.ui.StatisticsButton = class extends shaka.ui.Element {
 
   /** @private */
   loadContainer_() {
+    const closeElement = shaka.util.Dom.createHTMLElement('div');
+    closeElement.classList.add('shaka-no-propagation');
+    closeElement.classList.add('shaka-statistics-close');
+    const icon = shaka.util.Dom.createHTMLElement('i');
+    icon.classList.add('material-icons-round');
+    icon.textContent =
+      shaka.ui.Enums.MaterialDesignIcons.CLOSE;
+    closeElement.appendChild(icon);
+    this.container_.appendChild(closeElement);
+    this.eventManager.listen(icon, 'click', () => {
+      this.onClick_();
+    });
     for (const name of this.controls.getConfig().statisticsList) {
       if (name in this.currentStats_ && !this.skippedStats_.includes(name)) {
         const element = this.generateComponent_(name);

package/ui/ui.js

@@ -273,6 +273,7 @@ shaka.ui.Overlay = class {
       displayInVrMode: false,
       defaultVrProjectionMode: 'equirectangular',
       setupMediaSession: true,
+      preferVideoFullScreenInVisionOS: false,
     };
 
     // eslint-disable-next-line no-restricted-syntax
@@ -487,19 +488,23 @@ shaka.ui.Overlay = class {
     //    <source src='foo.m2u8'/>
     //  </video>
     // It should not be specified on both.
+    const urls = [];
     const src = video.getAttribute('src');
     if (src) {
-      const sourceElem = document.createElement('source');
-      sourceElem.setAttribute('src', src);
-      video.appendChild(sourceElem);
+      urls.push(src);
       video.removeAttribute('src');
     }
 
+    for (const source of video.getElementsByTagName('source')) {
+      urls.push(/** @type {!HTMLSourceElement} */ (source).src);
+      video.removeChild(source);
+    }
+
     await player.attach(shaka.util.Dom.asHTMLMediaElement(video));
 
-    for (const elem of video.querySelectorAll('source')) {
+    for (const url of urls) {
       try { // eslint-disable-next-line no-await-in-loop
-        await ui.getControls().getPlayer().load(elem.getAttribute('src'));
+        await ui.getControls().getPlayer().load(url);
         break;
       } catch (e) {
         shaka.log.error('Error auto-loading asset', e);