shaka-player 4.9.34 → 4.9.36

package/lib/util/mp4_generator.js

@@ -8,6 +8,7 @@ goog.provide('shaka.util.Mp4Generator');
 
 goog.require('goog.asserts');
 goog.require('shaka.util.ManifestParserUtils');
+goog.require('shaka.util.Platform');
 goog.require('shaka.util.Uint8ArrayUtils');
 
 
@@ -298,6 +299,20 @@ shaka.util.Mp4Generator = class {
   stsd_(streamInfo) {
     const Mp4Generator = shaka.util.Mp4Generator;
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
+    let audioCodec = 'aac';
+    if (streamInfo.codecs.includes('mp3')) {
+      audioCodec = 'mp3';
+    } else if (streamInfo.codecs.includes('ac-3')) {
+      if (shaka.util.Platform.requiresEC3InitSegments()) {
+        audioCodec = 'ec-3';
+      } else {
+        audioCodec = 'ac-3';
+      }
+    } else if (streamInfo.codecs.includes('ec-3')) {
+      audioCodec = 'ec-3';
+    } else if (streamInfo.codecs.includes('opus')) {
+      audioCodec = 'opus';
+    }
     let bytes = new Uint8Array([]);
     switch (streamInfo.type) {
       case ContentType.VIDEO:
@@ -308,13 +323,13 @@ shaka.util.Mp4Generator = class {
         }
         break;
       case ContentType.AUDIO:
-        if (streamInfo.codecs.includes('mp3')) {
+        if (audioCodec == 'mp3') {
           bytes = this.mp3_(streamInfo);
-        } else if (streamInfo.codecs.includes('ac-3')) {
+        } else if (audioCodec == 'ac-3') {
           bytes = this.ac3_(streamInfo);
-        } else if (streamInfo.codecs.includes('ec-3')) {
+        } else if (audioCodec == 'ec-3') {
           bytes = this.ec3_(streamInfo);
-        } else if (streamInfo.codecs.includes('opus')) {
+        } else if (audioCodec == 'opus') {
           bytes = this.opus_(streamInfo);
         } else {
           bytes = this.mp4a_(streamInfo);

package/lib/util/periods.js

@@ -836,7 +836,7 @@ shaka.util.PeriodCombiner = class {
     clone.roles = clone.roles.slice();
     clone.segmentIndex = null;
     clone.emsgSchemeIdUris = [];
-    clone.keyIds = new Set();
+    clone.keyIds = new Set(stream.keyIds);
     clone.closedCaptions = stream.closedCaptions ?
       new Map(stream.closedCaptions) : null;
     clone.trickModeVideo = null;
@@ -860,7 +860,7 @@ shaka.util.PeriodCombiner = class {
     clone.roles = clone.roles.slice();
     // These are wiped out now and rebuilt later from the various per-period
     // streams that match this output.
-    clone.keyIds = new Set();
+    clone.keyIds = new Set(streamDb.keyIds);
     clone.segments = [];
     clone.variantIds = [];
     clone.closedCaptions = streamDb.closedCaptions ?
@@ -1772,6 +1772,7 @@ shaka.util.PeriodCombiner = class {
       v.roles,
       v.closedCaptions ? Array.from(v.closedCaptions.entries()) : null,
       v.bandwidth,
+      Array.from(v.keyIds),
     ]);
   }
 
@@ -1794,6 +1795,7 @@ shaka.util.PeriodCombiner = class {
       a.roles,
       a.audioSamplingRate,
       a.primary,
+      Array.from(a.keyIds),
     ]);
   }
 

package/lib/util/platform.js

@@ -307,13 +307,15 @@ shaka.util.Platform = class {
         !shaka.util.Platform.isTizen() &&
         !shaka.util.Platform.isEOS() &&
         !shaka.util.Platform.isAPL() &&
+        !shaka.util.Platform.isAPP() &&
         !shaka.util.Platform.isVirginMedia() &&
         !shaka.util.Platform.isOrange() &&
         !shaka.util.Platform.isPS4() &&
         !shaka.util.Platform.isAmazonFireTV() &&
         !shaka.util.Platform.isComcastX1() &&
         !shaka.util.Platform.isZenterio() &&
-        !shaka.util.Platform.isSkyQ();
+        !shaka.util.Platform.isSkyQ() &&
+        !shaka.util.Platform.isMultiChoice();
   }
 
   /**
@@ -391,6 +393,16 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('DT_STB_BCM');
   }
 
+  /**
+   * Check if the current platform is a MultiChoice STB.
+   * @return {boolean}
+   */
+  static isMultiChoice() {
+    // cspell: ignore MDMP
+    return shaka.util.Platform.userAgentContains_('MDMP1001S') ||
+      shaka.util.Platform.userAgentContains_('PS5525IMC');
+  }
+
   /**
    * Returns a major version number for Safari, or Safari-based iOS browsers.
    *
@@ -456,6 +468,14 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('PC=APL');
   }
 
+  /**
+   * Check if the current platform is an APPSTB set-top box.
+   * @return {boolean}
+   */
+  static isAPP() {
+    return shaka.util.Platform.userAgentContains_('PC=APPSTB');
+  }
+
   /**
    * Guesses if the platform is a mobile one (iOS or Android).
    *
@@ -523,6 +543,9 @@ shaka.util.Platform = class {
    * @return {boolean}
    */
   static isAndroid() {
+    if (navigator.userAgentData && navigator.userAgentData.platform) {
+      return navigator.userAgentData.platform.toLowerCase() == 'android';
+    }
     return shaka.util.Platform.userAgentContains_('Android');
   }
 
@@ -532,6 +555,9 @@ shaka.util.Platform = class {
    * @return {boolean}
    */
   static isFuchsia() {
+    if (navigator.userAgentData && navigator.userAgentData.platform) {
+      return navigator.userAgentData.platform.toLowerCase() == 'fuchsia';
+    }
     return shaka.util.Platform.userAgentContains_('Fuchsia');
   }
 
@@ -548,7 +574,8 @@ shaka.util.Platform = class {
         Platform.isEOS() || Platform.isAPL() ||
         Platform.isVirginMedia() || Platform.isOrange() ||
         Platform.isComcastX1() || Platform.isChromecast() ||
-        Platform.isHisense() || Platform.isZenterio()) {
+        Platform.isHisense() || Platform.isZenterio() ||
+        Platform.isAPP() || Platform.isMultiChoice()) {
       return true;
     }
     return false;
@@ -621,6 +648,19 @@ shaka.util.Platform = class {
       (Platform.isEdge() && Platform.isWindows() && isPlayReady);
   }
 
+  /**
+   * Returns true if the platform requires AC-3 signalling in init
+   * segments to be replaced with EC-3 signalling.
+   * For such platforms, MediaSourceEngine will attempt to work
+   * around it by inserting fake EC-3 signalling into
+   * initialization segments.
+   *
+   * @return {boolean}
+   */
+  static requiresEC3InitSegments() {
+    return shaka.util.Platform.isTizen3();
+  }
+
   /**
    * Returns true if the platform supports SourceBuffer "sequence mode".
    *
@@ -629,7 +669,7 @@ shaka.util.Platform = class {
   static supportsSequenceMode() {
     const Platform = shaka.util.Platform;
     if (Platform.isTizen3() || Platform.isTizen2() ||
-        Platform.isWebOS3() || Platform.isPS4()) {
+        Platform.isWebOS3() || Platform.isPS4() || Platform.isPS5()) {
       return false;
     }
     return true;
@@ -685,16 +725,13 @@ shaka.util.Platform = class {
   }
 
   /**
-   * Returns true if MediaKeys is polyfilled
+   * Returns true if MediaKeys is polyfilled by the specified polyfill.
    *
-   * @param {string=} polyfillType
+   * @param {string} polyfillType
    * @return {boolean}
    */
   static isMediaKeysPolyfilled(polyfillType) {
-    if (polyfillType) {
-      return polyfillType === window.shakaMediaKeysPolyfill;
-    }
-    return !!window.shakaMediaKeysPolyfill;
+    return polyfillType === window.shakaMediaKeysPolyfill;
   }
 
 
@@ -780,10 +817,21 @@ shaka.util.Platform = class {
         maxResolution.height = 1080;
       }
     } else if (Platform.isHisense()) {
-      // eslint-disable-next-line new-cap
-      if (window.Hisense_Get4KSupportState &&
+      let supports4k = null;
+      if (window.Hisense_Get4KSupportState) {
+        try {
           // eslint-disable-next-line new-cap
-          window.Hisense_Get4KSupportState()) {
+          supports4k = window.Hisense_Get4KSupportState();
+        } catch (e) {
+          shaka.log.debug('Hisense: Failed to get 4K support state', e);
+        }
+      }
+      if (supports4k == null) {
+        // If API is not there or not working for whatever reason, fallback to
+        // user agent check, as it contains UHD or FHD info.
+        supports4k = Platform.userAgentContains_('UHD');
+      }
+      if (supports4k) {
         maxResolution.width = 3840;
         maxResolution.height = 2160;
       } else {

package/lib/util/player_configuration.js

@@ -73,7 +73,7 @@ shaka.util.PlayerConfiguration = class {
       persistentSessionOnlinePlayback: false,
       persistentSessionsMetadata: [],
       initDataTransform: (initData, initDataType, drmInfo) => {
-        if (shaka.util.Platform.isMediaKeysPolyfilled() &&
+        if (shaka.util.Platform.isMediaKeysPolyfilled('apple') &&
             initDataType == 'skd') {
           const cert = drmInfo.serverCertificate;
           const contentId =
@@ -261,6 +261,11 @@ shaka.util.PlayerConfiguration = class {
         shaka.util.Platform.isPS5(),
     };
 
+    const safariVersion = shaka.util.Platform.safariVersion();
+    if (safariVersion && safariVersion >= 17) {
+      streaming.infiniteLiveStreamDuration = true;
+    }
+
     // WebOS, Tizen, Chromecast and Hisense have long hardware pipelines
     // that respond slowly to seeking.
     // Therefore we should not seek when we detect a stall
@@ -517,7 +522,13 @@ shaka.util.PlayerConfiguration = class {
     if (hdrLevel == 'AUTO') {
       // Auto detect the ideal HDR level.
       if (window.matchMedia('(color-gamut: p3)').matches) {
-        hdrLevel = 'PQ';
+        const someHLG = tracks.some((track) => {
+          if (track.hdr && track.hdr == 'HLG') {
+            return true;
+          }
+          return false;
+        });
+        hdrLevel = someHLG ? 'HLG' : 'PQ';
       } else {
         hdrLevel = 'SDR';
       }

package/lib/util/stream_utils.js

@@ -996,6 +996,11 @@ shaka.util.StreamUtils = class {
       }
     }
 
+    if (codecs.toLowerCase() == 'ac-3' &&
+        shaka.util.Platform.requiresEC3InitSegments()) {
+      return 'ec-3';
+    }
+
     return codecs;
   }
 
@@ -1191,6 +1196,9 @@ shaka.util.StreamUtils = class {
    * @return {shaka.extern.Track}
    */
   static variantToTrack(variant) {
+    const ManifestParserUtils = shaka.util.ManifestParserUtils;
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
+
     /** @type {?shaka.extern.Stream} */
     const audio = variant.audio;
     /** @type {?shaka.extern.Stream} */
@@ -1309,6 +1317,16 @@ shaka.util.StreamUtils = class {
         track.audioSamplingRate = video.audioSamplingRate;
         track.spatialAudio = video.spatialAudio;
         track.originalLanguage = video.originalLanguage;
+        track.audioMimeType = videoMimeType;
+        const allCodecs = videoCodec.split(',');
+        try {
+          track.videoCodec = ManifestParserUtils.guessCodecs(
+              ContentType.VIDEO, allCodecs);
+          track.audioCodec = ManifestParserUtils.guessCodecs(
+              ContentType.AUDIO, allCodecs);
+        } catch (e) {
+          // Ignore this error.
+        }
       }
     }
 

package/lib/util/tXml.js

@@ -555,8 +555,9 @@ shaka.util.TXml = class {
     const schemaNS = shaka.util.TXml.getKnownNameSpace(ns);
     const found = [];
     if (elem.children) {
+      const tagName = schemaNS ? `${schemaNS}:${name}` : name;
       for (const child of elem.children) {
-        if (child && child.tagName === `${schemaNS}:${name}`) {
+        if (child && child.tagName === tagName) {
           found.push(child);
         }
       }
@@ -625,7 +626,7 @@ shaka.util.TXml = class {
 
     const re = '^P(?:([0-9]*)Y)?(?:([0-9]*)M)?(?:([0-9]*)D)?' +
         '(?:T(?:([0-9]*)H)?(?:([0-9]*)M)?(?:([0-9.]*)S)?)?$';
-    const matches = new RegExp(re).exec(durationString);
+    const matches = new RegExp(re, 'i').exec(durationString);
 
     if (!matches) {
       shaka.log.warning('Invalid duration string:', durationString);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.9.34",
+  "version": "4.9.36",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -43,7 +43,7 @@
     "karma-coverage": "^2.2.0",
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-ajax": "^0.1.13",
-    "karma-local-wd-launcher": "^1.6.7",
+    "karma-local-wd-launcher": "^1.6.9",
     "karma-opera-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-spec-reporter": "^0.0.34",
@@ -105,7 +105,7 @@
     "prepublishOnly": "python build/checkversion.py && python build/all.py --force"
   },
   "dependencies": {
-    "eme-encryption-scheme-polyfill": "^2.1.6"
+    "eme-encryption-scheme-polyfill": "^2.2.1"
   },
   "clean-package": {
     "remove": [

package/ui/controls.js

@@ -1613,12 +1613,8 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
     goog.asserts.assert(
         this.seekBar_, 'Caller of seek_ must check for seekBar_ first!');
 
-    this.seekBar_.changeTo(currentTime);
-
-    if (this.isOpaque()) {
-      // Only update the time and seek range if it's visible.
-      this.updateTimeAndSeekRange_();
-    }
+    this.video_.currentTime = currentTime;
+    this.updateTimeAndSeekRange_();
   }
 
   /**

package/ui/less/thumbnails.less

@@ -8,6 +8,7 @@
   visibility: hidden;
   width: 15%;
   z-index: 1;
+  pointer-events: none;
 
   #shaka-player-ui-thumbnail-image {
     position: absolute;

package/ui/statistics_button.js

@@ -119,7 +119,9 @@ shaka.ui.StatisticsButton = class extends shaka.ui.Element {
 
     const parseBytesDownloaded = (name) => {
       const bytes = parseInt(this.currentStats_[name], 10);
-      if (bytes > 1e6) {
+      if (bytes > 2 * 1e9) {
+        return (bytes / 1e9).toFixed(2) + 'GB';
+      } else if (bytes > 1e6) {
         return (bytes / 1e6).toFixed(2) + 'MB';
       } else if (bytes > 1e3) {
         return (bytes / 1e3).toFixed(2) + 'KB';

package/ui/ui.js

@@ -41,6 +41,35 @@ shaka.ui.Overlay = class {
     /** @private {!shaka.extern.UIConfiguration} */
     this.config_ = this.defaultConfig_();
 
+    // Get and configure cast app id.
+    let castAppId = '';
+
+    // Get and configure cast Android Receiver Compatibility
+    let castAndroidReceiverCompatible = false;
+
+    // Cast receiver id can be specified on either container or video.
+    // It should not be provided on both. If it was, we will use the last
+    // one we saw.
+    if (videoContainer['dataset'] &&
+        videoContainer['dataset']['shakaPlayerCastReceiverId']) {
+      const dataSet = videoContainer['dataset'];
+      castAppId = dataSet['shakaPlayerCastReceiverId'];
+      castAndroidReceiverCompatible =
+          dataSet['shakaPlayerCastAndroidReceiverCompatible'] === 'true';
+    } else if (video['dataset'] &&
+               video['dataset']['shakaPlayerCastReceiverId']) {
+      const dataSet = video['dataset'];
+      castAppId = dataSet['shakaPlayerCastReceiverId'];
+      castAndroidReceiverCompatible =
+          dataSet['shakaPlayerCastAndroidReceiverCompatible'] === 'true';
+    }
+
+    if (castAppId.length) {
+      this.config_.castReceiverAppId = castAppId;
+      this.config_.castAndroidReceiverCompatible =
+          castAndroidReceiverCompatible;
+    }
+
     // Make sure this container is discoverable and that the UI can be reached
     // through it.
     videoContainer['dataset']['shakaPlayerContainer'] = '';
@@ -55,10 +84,6 @@ shaka.ui.Overlay = class {
     this.controls_ = new shaka.ui.Controls(
         player, videoContainer, video, vrCanvas, this.config_);
 
-    // Run the initial setup so that no configure() call is required for default
-    // settings.
-    this.configure({});
-
     // If the browser's native controls are disabled, use UI TextDisplayer.
     if (!video.controls) {
       player.setVideoContainer(videoContainer);
@@ -130,18 +155,29 @@ shaka.ui.Overlay = class {
 
     goog.asserts.assert(typeof(config) == 'object', 'Should be an object!');
 
+    const newConfig = /** @type {!shaka.extern.UIConfiguration} */(
+      Object.assign({}, this.config_));
     shaka.util.ConfigUtils.mergeConfigObjects(
-        this.config_, config, this.defaultConfig_(),
+        newConfig, config, this.defaultConfig_(),
         /* overrides= */ {}, /* path= */ '');
 
     // If a cast receiver app id has been given, add a cast button to the UI
-    if (this.config_.castReceiverAppId &&
-        !this.config_.overflowMenuButtons.includes('cast')) {
-      this.config_.overflowMenuButtons.push('cast');
+    if (newConfig.castReceiverAppId &&
+        !newConfig.overflowMenuButtons.includes('cast')) {
+      newConfig.overflowMenuButtons.push('cast');
     }
 
     goog.asserts.assert(this.player_ != null, 'Should have a player!');
 
+    const diff = shaka.util.ConfigUtils.getDifferenceFromConfigObjects(
+        newConfig, this.config_);
+    if (!Object.keys(diff).length) {
+      // No changes
+      return;
+    }
+
+    this.config_ = newConfig;
+
     this.controls_.configure(this.config_);
 
     this.controls_.dispatchEvent(new shaka.util.FakeEvent('uiupdated'));
@@ -432,33 +468,6 @@ shaka.ui.Overlay = class {
     // Attach Canvas used for LCEVC Decoding
     player.attachCanvas(/** @type {HTMLCanvasElement} */(lcevcCanvas));
 
-    // Get and configure cast app id.
-    let castAppId = '';
-
-    // Get and configure cast Android Receiver Compatibility
-    let castAndroidReceiverCompatible = false;
-
-    // Cast receiver id can be specified on either container or video.
-    // It should not be provided on both. If it was, we will use the last
-    // one we saw.
-    if (container['dataset'] &&
-        container['dataset']['shakaPlayerCastReceiverId']) {
-      castAppId = container['dataset']['shakaPlayerCastReceiverId'];
-      castAndroidReceiverCompatible =
-          container['dataset']['shakaPlayerCastAndroidReceiverCompatible'] ===
-          'true';
-    } else if (video['dataset'] &&
-               video['dataset']['shakaPlayerCastReceiverId']) {
-      castAppId = video['dataset']['shakaPlayerCastReceiverId'];
-      castAndroidReceiverCompatible =
-        video['dataset']['shakaPlayerCastAndroidReceiverCompatible'] === 'true';
-    }
-
-    if (castAppId.length) {
-      ui.configure({castReceiverAppId: castAppId,
-        castAndroidReceiverCompatible: castAndroidReceiverCompatible});
-    }
-
     if (shaka.util.Dom.asHTMLMediaElement(video).controls) {
       ui.getControls().setEnabledNativeControls(true);
     }