shaka-player 4.13.0 → 4.13.2

package/lib/util/mp4_parser.js

@@ -17,11 +17,11 @@ goog.require('shaka.util.DataViewReader');
 shaka.util.Mp4Parser = class {
   /** */
   constructor() {
-    /** @private {!Object<number, shaka.util.Mp4Parser.BoxType_>} */
-    this.headers_ = [];
+    /** @private {!Map<number, shaka.util.Mp4Parser.BoxType_>} */
+    this.headers_ = new Map();
 
-    /** @private {!Object<number, !shaka.util.Mp4Parser.CallbackType>} */
-    this.boxDefinitions_ = [];
+    /** @private {!Map<number, !shaka.util.Mp4Parser.CallbackType>} */
+    this.boxDefinitions_ = new Map();
 
     /** @private {boolean} */
     this.done_ = false;
@@ -38,8 +38,8 @@ shaka.util.Mp4Parser = class {
    */
   box(type, definition) {
     const typeCode = shaka.util.Mp4Parser.typeFromString_(type);
-    this.headers_[typeCode] = shaka.util.Mp4Parser.BoxType_.BASIC_BOX;
-    this.boxDefinitions_[typeCode] = definition;
+    this.headers_.set(typeCode, shaka.util.Mp4Parser.BoxType_.BASIC_BOX);
+    this.boxDefinitions_.set(typeCode, definition);
     return this;
   }
 
@@ -54,8 +54,8 @@ shaka.util.Mp4Parser = class {
    */
   fullBox(type, definition) {
     const typeCode = shaka.util.Mp4Parser.typeFromString_(type);
-    this.headers_[typeCode] = shaka.util.Mp4Parser.BoxType_.FULL_BOX;
-    this.boxDefinitions_[typeCode] = definition;
+    this.headers_.set(typeCode, shaka.util.Mp4Parser.BoxType_.FULL_BOX);
+    this.boxDefinitions_.set(typeCode, definition);
     return this;
   }
 
@@ -135,13 +135,13 @@ shaka.util.Mp4Parser = class {
         break;
     }
 
-    const boxDefinition = this.boxDefinitions_[type];
+    const boxDefinition = this.boxDefinitions_.get(type);
 
     if (boxDefinition) {
       let version = null;
       let flags = null;
 
-      if (this.headers_[type] == shaka.util.Mp4Parser.BoxType_.FULL_BOX) {
+      if (this.headers_.get(type) == shaka.util.Mp4Parser.BoxType_.FULL_BOX) {
         if (stopOnPartial && reader.getPosition() + 4 > reader.getLength()) {
           this.done_ = true;
           return;

package/lib/util/multi_map.js

@@ -14,8 +14,8 @@ goog.provide('shaka.util.MultiMap');
 shaka.util.MultiMap = class {
   /** */
   constructor() {
-    /** @private {!Object<string, !Array<T>>} */
-    this.map_ = {};
+    /** @private {!Map<string, !Array<T>>} */
+    this.map_ = new Map();
   }
 
 
@@ -25,11 +25,10 @@ shaka.util.MultiMap = class {
    * @param {T} value
    */
   push(key, value) {
-    // eslint-disable-next-line no-prototype-builtins
-    if (this.map_.hasOwnProperty(key)) {
-      this.map_[key].push(value);
+    if (this.map_.has(key)) {
+      this.map_.get(key).push(value);
     } else {
-      this.map_[key] = [value];
+      this.map_.set(key, [value]);
     }
   }
 
@@ -40,10 +39,12 @@ shaka.util.MultiMap = class {
    * @return {Array<T>} or null if no such key exists.
    */
   get(key) {
-    const list = this.map_[key];
+    if (!this.map_.has(key)) {
+      return null;
+    }
     // slice() clones the list so that it and the map can each be modified
     // without affecting the other.
-    return list ? list.slice() : null;
+    return this.map_.get(key).slice();
   }
 
 
@@ -53,8 +54,8 @@ shaka.util.MultiMap = class {
    */
   getAll() {
     const list = [];
-    for (const key in this.map_) {
-      list.push(...this.map_[key]);
+    for (const value of this.map_.values()) {
+      list.push(...value);
     }
     return list;
   }
@@ -66,14 +67,15 @@ shaka.util.MultiMap = class {
    * @param {T} value
    */
   remove(key, value) {
-    if (!(key in this.map_)) {
+    if (!this.map_.has(key)) {
       return;
     }
-    this.map_[key] = this.map_[key].filter((i) => i != value);
-    if (this.map_[key].length == 0) {
+    const newValue = this.map_.get(key).filter((i) => i != value);
+    this.map_.set(key, newValue);
+    if (!newValue.length) {
       // Delete the array if it's empty, so that |get| will reliably return null
       // "if no such key exists", instead of sometimes returning an empty array.
-      delete this.map_[key];
+      this.map_.delete(key);
     }
   }
 
@@ -82,7 +84,7 @@ shaka.util.MultiMap = class {
    * Clear all keys and values from the multimap.
    */
   clear() {
-    this.map_ = {};
+    this.map_.clear();
   }
 
 
@@ -90,9 +92,9 @@ shaka.util.MultiMap = class {
    * @param {function(string, !Array<T>)} callback
    */
   forEach(callback) {
-    for (const key in this.map_) {
-      callback(key, this.map_[key]);
-    }
+    this.map_.forEach((value, key) => {
+      callback(key, value);
+    });
   }
 
   /**
@@ -100,7 +102,7 @@ shaka.util.MultiMap = class {
    * @return {number}
    */
   size() {
-    return Object.keys(this.map_).length;
+    return this.map_.size;
   }
 
   /**
@@ -108,6 +110,6 @@ shaka.util.MultiMap = class {
    * @return {!Array<string>}
    */
   keys() {
-    return Object.keys(this.map_);
+    return Array.from(this.map_.keys());
   }
 };

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();
   }
 
   /**
@@ -396,6 +398,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.
    *
@@ -461,6 +473,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).
    *
@@ -568,7 +588,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;
@@ -641,6 +662,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".
    *
@@ -649,7 +683,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;
@@ -705,16 +739,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;
   }
 
 

package/lib/util/player_configuration.js

@@ -75,7 +75,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 =

package/lib/util/stream_utils.js

@@ -461,15 +461,15 @@ shaka.util.StreamUtils = class {
    * @param {!Array<!shaka.extern.Variant>} variants
    */
   static overrideDolbyVisionCodecs(variants) {
-    /** @type {!Object<string, string>} */
-    const codecMap = {
-      'dvav': 'avc3',
-      'dva1': 'avc1',
-      'dvhe': 'hev1',
-      'dvh1': 'hvc1',
-      'dvc1': 'vvc1',
-      'dvi1': 'vvi1',
-    };
+    /** @type {!Map<string, string>} */
+    const codecMap = new Map()
+        .set('dvav', 'avc3')
+        .set('dva1', 'avc1')
+        .set('dvhe', 'hev1')
+        .set('dvh1', 'hvc1')
+        .set('dvc1', 'vvc1')
+        .set('dvi1', 'vvi1');
+
     /** @type {!Set<!shaka.extern.Stream>} */
     const streams = new Set();
     for (const variant of variants) {
@@ -478,9 +478,9 @@ shaka.util.StreamUtils = class {
       }
     }
     for (const video of streams) {
-      for (const dvCodec of Object.keys(codecMap)) {
+      for (const [dvCodec, replacement] of codecMap) {
         if (video.codecs.includes(dvCodec)) {
-          video.codecs = video.codecs.replace(dvCodec, codecMap[dvCodec]);
+          video.codecs = video.codecs.replace(dvCodec, replacement);
           break;
         }
       }
@@ -586,10 +586,10 @@ shaka.util.StreamUtils = class {
           shaka.util.ObjectUtils.alphabeticalKeyOrderStringify(decodingConfig);
 
       const cache = StreamUtils.decodingConfigCache_;
-      if (cache[cacheKey]) {
+      if (cache.has(cacheKey)) {
         shaka.log.v2('Using cached results of mediaCapabilities.decodingInfo',
             'for key', cacheKey);
-        finalResult = merge(finalResult, cache[cacheKey]);
+        finalResult = merge(finalResult, cache.get(cacheKey));
       } else {
         // Do a final pass-over of the decoding config: if a given stream has
         // multiple codecs, that suggests that it switches between those codecs
@@ -606,7 +606,7 @@ shaka.util.StreamUtils = class {
                 acc = merge(acc, result);
               }
               if (acc) {
-                cache[cacheKey] = acc;
+                cache.set(cacheKey, acc);
                 finalResult = merge(finalResult, acc);
               }
             }));
@@ -1067,6 +1067,11 @@ shaka.util.StreamUtils = class {
       }
     }
 
+    if (codecs.toLowerCase() == 'ac-3' &&
+        shaka.util.Platform.requiresEC3InitSegments()) {
+      return 'ec-3';
+    }
+
     return codecs;
   }
 
@@ -1262,6 +1267,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} */
@@ -1380,6 +1388,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.
+        }
       }
     }
 
@@ -1936,7 +1954,7 @@ shaka.util.StreamUtils = class {
    * Clears underlying decoding config cache.
    */
   static clearDecodingConfigCache() {
-    shaka.util.StreamUtils.decodingConfigCache_ = {};
+    shaka.util.StreamUtils.decodingConfigCache_.clear();
   }
 };
 
@@ -1945,10 +1963,10 @@ shaka.util.StreamUtils = class {
  * A cache of results from mediaCapabilities.decodingInfo, indexed by the
  * (stringified) decodingConfig.
  *
- * @type {Object<(!string), (!MediaCapabilitiesDecodingInfo)>}
+ * @type {Map<string, !MediaCapabilitiesDecodingInfo>}
  * @private
  */
-shaka.util.StreamUtils.decodingConfigCache_ = {};
+shaka.util.StreamUtils.decodingConfigCache_ = new Map();
 
 
 /** @private {number} */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.13.0",
+  "version": "4.13.2",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -109,7 +109,7 @@
     "prepublishOnly": "python build/checkversion.py && python build/all.py --force"
   },
   "dependencies": {
-    "eme-encryption-scheme-polyfill": "^2.2.0"
+    "eme-encryption-scheme-polyfill": "^2.2.1"
   },
   "clean-package": {
     "remove": [

package/project-words.txt

@@ -160,6 +160,7 @@ linksource
 longname
 
 # 3rd party
+APPSTB
 Bitcodin
 Brightcove
 Broadpeak

package/third_party/closure-uri/uri.js

@@ -733,7 +733,7 @@ goog.Uri.QueryData = function(query, uri) {
  */
 goog.Uri.QueryData.prototype.ensureKeyMapInitialized_ = function() {
   if (!this.keyMap_) {
-    this.keyMap_ = {};
+    this.keyMap_ = new Map();
     this.count_ = 0;
 
     if (this.encodedQuery_) {
@@ -764,7 +764,7 @@ goog.Uri.QueryData.prototype.ensureKeyMapInitialized_ = function() {
  * We need to use a Map because we cannot guarantee that the key names will
  * not be problematic for IE.
  *
- * @type {Object<string, !Array<string>>}
+ * @type {Map<string, !Array<string>>}
  * @private
  */
 goog.Uri.QueryData.prototype.keyMap_ = null;
@@ -798,9 +798,9 @@ goog.Uri.QueryData.prototype.add = function(key, value) {
   // Invalidate the cache.
   this.encodedQuery_ = null;
 
-  var values = this.keyMap_.hasOwnProperty(key) ? this.keyMap_[key] : null;
+  var values = this.keyMap_.has(key) ? this.keyMap_.get(key) : null;
   if (!values) {
-    this.keyMap_[key] = (values = []);
+    this.keyMap_.set(key, (values = []));
   }
   values.push(value);
   goog.asserts.assert(this.count_ != null, 'Should not be null.');
@@ -820,10 +820,10 @@ goog.Uri.QueryData.prototype.add = function(key, value) {
   // Invalidate the cache.
   this.encodedQuery_ = null;
 
-  if (!this.keyMap_.hasOwnProperty(key)) {
+  if (!this.keyMap_.has(key)) {
     this.add(key, value);
   } else {
-    this.keyMap_[key] = [value];
+    this.keyMap_.set(key, [value]);
   }
 
   return this;
@@ -838,7 +838,7 @@ goog.Uri.QueryData.prototype.add = function(key, value) {
  */
  goog.Uri.QueryData.prototype.get = function(key) {
   this.ensureKeyMapInitialized_();
-  return this.keyMap_[key] || [];
+  return this.keyMap_.get(key) || [];
 };
 
 
@@ -851,15 +851,15 @@ goog.Uri.QueryData.prototype.toString = function() {
     return this.encodedQuery_;
   }
 
-  if (!this.keyMap_) {
+  if (!this.keyMap_ || !this.keyMap_.size) {
     return '';
   }
 
   var sb = [];
 
-  for (var key in this.keyMap_) {
+  for (const key of this.keyMap_.keys()) {
     var encodedKey = encodeURIComponent(key);
-    var val = this.keyMap_[key];
+    var val = this.keyMap_.get(key);
     for (var j = 0; j < val.length; j++) {
       var param = encodedKey;
       // Ensure that null and undefined are encoded into the url as
@@ -891,9 +891,9 @@ goog.Uri.QueryData.prototype.clone = function() {
   var rv = new goog.Uri.QueryData();
   rv.encodedQuery_ = this.encodedQuery_;
   if (this.keyMap_) {
-    var cloneMap = {};
-    for (var key in this.keyMap_) {
-      cloneMap[key] = this.keyMap_[key].concat();
+    var cloneMap = new Map();
+    for (const [key, val] of this.keyMap_) {
+      cloneMap.set(key, val.concat());
     }
     rv.keyMap_ = cloneMap;
     rv.count_ = this.count_;

package/ui/ad_statistics_button.js

@@ -75,11 +75,13 @@ shaka.ui.AdStatisticsButton = class extends shaka.ui.Element {
     /** @private {!Array} */
     this.statisticsList_ = [];
 
-    /** @private {!Object<string, (number | !Array<number>)>} */
+    /** @private {!shaka.extern.AdsStats} */
     this.currentStats_ = this.adManager.getStats();
 
-    /** @private {!Object<string, HTMLElement>} */
-    this.displayedElements_ = {};
+    shaka.ui.Utils.setDisplay(this.button_, this.currentStats_.started > 0);
+
+    /** @private {!Map<string, HTMLElement>} */
+    this.displayedElements_ = new Map();
 
     const parseLoadTimes = (name) => {
       let totalTime = 0;
@@ -95,15 +97,14 @@ shaka.ui.AdStatisticsButton = class extends shaka.ui.Element {
       return this.currentStats_[name];
     };
 
-    /** @private {!Object<string, function(string): string>} */
-    this.parseFrom_ = {
-      'loadTimes': parseLoadTimes,
-      'averageLoadTime': showNumber,
-      'started': showNumber,
-      'playedCompletely': showNumber,
-      'skipped': showNumber,
-      'errors': showNumber,
-    };
+    /** @private {!Map<string, function(string): string>} */
+    this.parseFrom_ = new Map()
+        .set('loadTimes', parseLoadTimes)
+        .set('averageLoadTime', showNumber)
+        .set('started', showNumber)
+        .set('playedCompletely', showNumber)
+        .set('skipped', showNumber)
+        .set('errors', showNumber);
 
     /** @private {shaka.util.Timer} */
     this.timer_ = new shaka.util.Timer(() => {
@@ -183,10 +184,10 @@ shaka.ui.AdStatisticsButton = class extends shaka.ui.Element {
     section.appendChild(label);
 
     const value = shaka.util.Dom.createHTMLElement('span');
-    value.textContent = this.parseFrom_[name](name);
+    value.textContent = this.parseFrom_.get(name)(name);
     section.appendChild(value);
 
-    this.displayedElements_[name] = value;
+    this.displayedElements_.set(name, value);
 
     return section;
   }
@@ -220,8 +221,8 @@ shaka.ui.AdStatisticsButton = class extends shaka.ui.Element {
     this.currentStats_ = this.adManager.getStats();
 
     for (const name of this.statisticsList_) {
-      this.displayedElements_[name].textContent =
-          this.parseFrom_[name](name);
+      this.displayedElements_.get(name).textContent =
+          this.parseFrom_.get(name)(name);
     }
   }
 

package/ui/audio_language_selection.js

@@ -107,8 +107,13 @@ shaka.ui.AudioLanguageSelection = class extends shaka.ui.SettingsMenu {
     if (track.audioCodec) {
       codec = track.audioCodec;
     }
+    let label = '';
+    if (track.label) {
+      label = track.label;
+    }
     this.player.selectAudioLanguage(track.language, track.roles[0],
-        channelsCount, /* safeMargin= */ 0, codec, track.spatialAudio);
+        channelsCount, /* safeMargin= */ 0, codec, track.spatialAudio,
+        label);
   }