shaka-player 4.9.13 → 4.10.1

package/lib/util/fake_event.js

@@ -155,6 +155,7 @@ shaka.util.FakeEvent = class {
 shaka.util.FakeEvent.EventName = {
   AbrStatusChanged: 'abrstatuschanged',
   Adaptation: 'adaptation',
+  AudioTrackChanged: 'audiotrackchanged',
   Buffering: 'buffering',
   Complete: 'complete',
   DownloadFailed: 'downloadfailed',

package/lib/util/manifest_parser_utils.js

@@ -61,10 +61,11 @@ shaka.util.ManifestParserUtils = class {
    * @param {string} keySystem
    * @param {string} encryptionScheme
    * @param {Array.<shaka.extern.InitDataOverride>} initData
+   * @param {string} [keySystemUri]
    * @return {shaka.extern.DrmInfo}
    */
-  static createDrmInfo(keySystem, encryptionScheme, initData) {
-    return {
+  static createDrmInfo(keySystem, encryptionScheme, initData, keySystemUri) {
+    const drmInfo = {
       keySystem,
       encryptionScheme,
       licenseServerUri: '',
@@ -78,6 +79,12 @@ shaka.util.ManifestParserUtils = class {
       initData: initData || [],
       keyIds: new Set(),
     };
+
+    if (keySystemUri) {
+      drmInfo.keySystemUris = new Set([keySystemUri]);
+    }
+
+    return drmInfo;
   }
 
   /**

package/lib/util/mp4_box_parsers.js

@@ -425,6 +425,27 @@ shaka.util.Mp4BoxParsers = class {
     return {codec};
   }
 
+  /**
+   * Parses a DVVC box.
+   * @param {string} codecBase
+   * @param {!shaka.util.DataViewReader} reader
+   * @param {string} boxName
+   * @return {!shaka.util.ParsedDVVCBox}
+   */
+  static parseDVVC(codecBase, reader, boxName) {
+    const Mp4BoxParsers = shaka.util.Mp4BoxParsers;
+    reader.skip(2); // Skip "dv_version_major" and "dv_version_minor"
+    const thirdByte = reader.readUint8();
+    const fourthByte = reader.readUint8();
+    const profile = (thirdByte >> 1) & 0x7f;
+    const level = ((thirdByte << 5) & 0x20) | ((fourthByte >> 3) & 0x1f);
+    const codec = codecBase + '.' +
+        Mp4BoxParsers.addLeadingZero_(profile) + '.' +
+        Mp4BoxParsers.addLeadingZero_(level);
+
+    return {codec};
+  }
+
   /**
    * Parses a VPCC box.
    * @param {string} codecBase
@@ -902,6 +923,17 @@ shaka.util.ParsedHVCCBox;
  */
 shaka.util.ParsedDVCCBox;
 
+/**
+ * @typedef {{
+ *    codec: string
+ *  }}
+ *
+ * @property {string} codec
+ *
+ * @exportDoc
+ */
+shaka.util.ParsedDVVCBox;
+
 /**
  * @typedef {{
  *    codec: string

package/lib/util/player_configuration.js

@@ -118,6 +118,7 @@ shaka.util.PlayerConfiguration = class {
       defaultPresentationDelay: 0,
       segmentRelativeVttTiming: false,
       raiseFatalErrorOnManifestUpdateRequestFailure: false,
+      continueLoadingWhenPaused: true,
       dash: {
         clockSyncUri: '',
         ignoreDrmInfo: false,
@@ -213,7 +214,6 @@ shaka.util.PlayerConfiguration = class {
       stallEnabled: true,
       stallThreshold: 1 /* seconds */,
       stallSkip: 0.1 /* seconds */,
-      useNativeHlsOnSafari: true,
       useNativeHlsForFairPlay: true,
       // If we are within 2 seconds of the start of a live segment, fetch the
       // previous one.  This allows for segment drift, but won't download an
@@ -238,14 +238,23 @@ shaka.util.PlayerConfiguration = class {
       disableAudioPrefetch: false,
       disableTextPrefetch: false,
       disableVideoPrefetch: false,
-      liveSync: false,
-      liveSyncTargetLatencyTolerance: 0.5,
-      liveSyncMaxLatency: 1,
-      liveSyncPlaybackRate: 1.1,
-      liveSyncMinLatency: 0,
-      liveSyncMinPlaybackRate: 0.95,
-      liveSyncPanicMode: false,
-      liveSyncPanicThreshold: 60,
+      liveSync: {
+        enabled: false,
+        targetLatency: 0.5,
+        targetLatencyTolerance: 0.5,
+        maxPlaybackRate: 1.1,
+        minPlaybackRate: 0.95,
+        panicMode: false,
+        panicThreshold: 60,
+        dynamicTargetLatency: {
+          enabled: false,
+          stabilityThreshold: 60,
+          rebufferIncrement: 0.5,
+          maxAttempts: 10,
+          maxLatency: 4,
+          minLatency: 1,
+        },
+      },
       allowMediaSourceRecoveries: true,
       minTimeBetweenRecoveries: 5,
       vodDynamicPlaybackRate: false,
@@ -256,6 +265,9 @@ shaka.util.PlayerConfiguration = class {
       loadTimeout: 30,
       clearDecodingCache: shaka.util.Platform.isPS4() ||
         shaka.util.Platform.isPS5(),
+      dontChooseCodecs: false,
+      shouldFixTimestampOffset: shaka.util.Platform.isWebOS() ||
+        shaka.util.Platform.isTizen(),
     };
 
     // WebOS, Tizen, Chromecast and Hisense have long hardware pipelines

package/lib/util/stats.js

@@ -62,9 +62,18 @@ shaka.util.Stats = class {
     /** @private {number} */
     this.bandwidthEstimate_ = NaN;
 
+    /** @private {number} */
+    this.manifestSizeBytes_ = NaN;
     /** @private {number} */
     this.bytesDownloaded_ = NaN;
 
+    /** @private {number} */
+    this.nonFatalErrorCount_ = 0;
+    /** @private {number} */
+    this.manifestPeriodCount_ = NaN;
+    /** @private {number} */
+    this.manifestGapCount_ = NaN;
+
     /** @private {!shaka.util.StateHistory} */
     this.stateHistory_ = new shaka.util.StateHistory();
 
@@ -206,6 +215,13 @@ shaka.util.Stats = class {
     this.bandwidthEstimate_ = bandwidth;
   }
 
+  /**
+   * @param {number} size
+   */
+  setManifestSize(size) {
+    this.manifestSizeBytes_ = size;
+  }
+
   /**
    * @param {number} bytesDownloaded
    */
@@ -217,6 +233,25 @@ shaka.util.Stats = class {
     }
   }
 
+  /** */
+  addNonFatalError() {
+    this.nonFatalErrorCount_++;
+  }
+
+  /**
+   * @param {number} count
+   */
+  setManifestPeriodCount(count) {
+    this.manifestPeriodCount_ = count;
+  }
+
+  /**
+   * @param {number} count
+   */
+  setManifestGapCount(count) {
+    this.manifestGapCount_ = count;
+  }
+
   /**
    * @return {!shaka.util.StateHistory}
    */
@@ -258,7 +293,11 @@ shaka.util.Stats = class {
       licenseTime: this.licenseTimeSeconds_,
       liveLatency: this.liveLatencySeconds_,
       maxSegmentDuration: this.maxSegmentDurationSeconds_,
+      manifestSizeBytes: this.manifestSizeBytes_,
       bytesDownloaded: this.bytesDownloaded_,
+      nonFatalErrorCount: this.nonFatalErrorCount_,
+      manifestPeriodCount: this.manifestPeriodCount_,
+      manifestGapCount: this.manifestGapCount_,
       stateHistory: this.stateHistory_.getCopy(),
       switchHistory: this.switchHistory_.getCopy(),
     };
@@ -291,7 +330,11 @@ shaka.util.Stats = class {
       licenseTime: NaN,
       liveLatency: NaN,
       maxSegmentDuration: NaN,
+      manifestSizeBytes: NaN,
       bytesDownloaded: NaN,
+      nonFatalErrorCount: NaN,
+      manifestPeriodCount: NaN,
+      manifestGapCount: NaN,
       switchHistory: [],
       stateHistory: [],
     };

package/package.json

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

package/shaka-player.uncompiled.js

@@ -86,6 +86,7 @@ goog.require('shaka.ui.OverflowMenu');
 goog.require('shaka.ui.AudioLanguageSelection');
 goog.require('shaka.ui.AdCounter');
 goog.require('shaka.ui.AdPosition');
+goog.require('shaka.ui.AdStatisticsButton');
 goog.require('shaka.ui.AirPlayButton');
 goog.require('shaka.ui.BigPlayButton');
 goog.require('shaka.ui.CastButton');
@@ -106,6 +107,7 @@ goog.require('shaka.ui.RecenterVRButton');
 goog.require('shaka.ui.RemoteButton');
 goog.require('shaka.ui.ResolutionSelection');
 goog.require('shaka.ui.RewindButton');
+goog.require('shaka.ui.SaveVideoFrameButton');
 goog.require('shaka.ui.SkipAdButton');
 goog.require('shaka.ui.SmallPlayButton');
 goog.require('shaka.ui.Spacer');

package/ui/ad_counter.js

@@ -8,7 +8,7 @@
 goog.provide('shaka.ui.AdCounter');
 
 goog.require('goog.asserts');
-goog.require('shaka.ads.AdManager');
+goog.require('shaka.ads.Utils');
 goog.require('shaka.ui.Element');
 goog.require('shaka.ui.Locales');
 goog.require('shaka.ui.Localization');
@@ -63,12 +63,12 @@ shaka.ui.AdCounter = class extends shaka.ui.Element {
         });
 
     this.eventManager.listen(
-        this.adManager, shaka.ads.AdManager.AD_STARTED, () => {
+        this.adManager, shaka.ads.Utils.AD_STARTED, () => {
           this.onAdStarted_();
         });
 
     this.eventManager.listen(
-        this.adManager, shaka.ads.AdManager.AD_STOPPED, () => {
+        this.adManager, shaka.ads.Utils.AD_STOPPED, () => {
           this.reset_();
         });
 

package/ui/ad_position.js

@@ -7,7 +7,7 @@
 
 goog.provide('shaka.ui.AdPosition');
 
-goog.require('shaka.ads.AdManager');
+goog.require('shaka.ads.Utils');
 goog.require('shaka.ui.Element');
 goog.require('shaka.ui.Locales');
 goog.require('shaka.ui.Localization');
@@ -63,12 +63,12 @@ shaka.ui.AdPosition = class extends shaka.ui.Element {
         });
 
     this.eventManager.listen(
-        this.adManager, shaka.ads.AdManager.AD_STARTED, () => {
+        this.adManager, shaka.ads.Utils.AD_STARTED, () => {
           this.setPosition_();
         });
 
     this.eventManager.listen(
-        this.adManager, shaka.ads.AdManager.AD_STOPPED, () => {
+        this.adManager, shaka.ads.Utils.AD_STOPPED, () => {
           this.span_.textContent = '';
           shaka.ui.Utils.setDisplay(this.container_, false);
         });

package/ui/ad_statistics_button.js

@@ -0,0 +1,237 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+
+goog.provide('shaka.ui.AdStatisticsButton');
+
+goog.require('shaka.log');
+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.ui.Utils');
+goog.require('shaka.util.Dom');
+goog.require('shaka.util.Timer');
+goog.requireType('shaka.ui.Controls');
+
+
+/**
+ * @extends {shaka.ui.Element}
+ * @final
+ * @export
+ */
+shaka.ui.AdStatisticsButton = class extends shaka.ui.Element {
+  /**
+   * @param {!HTMLElement} parent
+   * @param {!shaka.ui.Controls} controls
+   */
+  constructor(parent, controls) {
+    super(parent, controls);
+
+    /** @private {!HTMLButtonElement} */
+    this.button_ = shaka.util.Dom.createButton();
+    this.button_.classList.add('shaka-ad-statistics-button');
+
+    /** @private {!HTMLElement} */
+    this.icon_ = shaka.util.Dom.createHTMLElement('i');
+    this.icon_.classList.add('material-icons-round');
+    this.icon_.textContent =
+      shaka.ui.Enums.MaterialDesignIcons.STATISTICS_ON;
+    this.button_.appendChild(this.icon_);
+
+    const label = shaka.util.Dom.createHTMLElement('label');
+    label.classList.add('shaka-overflow-button-label');
+
+    /** @private {!HTMLElement} */
+    this.nameSpan_ = shaka.util.Dom.createHTMLElement('span');
+    label.appendChild(this.nameSpan_);
+
+    /** @private {!HTMLElement} */
+    this.stateSpan_ = shaka.util.Dom.createHTMLElement('span');
+    this.stateSpan_.classList.add('shaka-current-selection-span');
+    label.appendChild(this.stateSpan_);
+
+    this.button_.appendChild(label);
+
+    this.parent.appendChild(this.button_);
+
+    /** @private {!HTMLElement} */
+    this.container_ = shaka.util.Dom.createHTMLElement('div');
+    this.container_.classList.add('shaka-no-propagation');
+    this.container_.classList.add('shaka-show-controls-on-mouse-over');
+    this.container_.classList.add('shaka-ad-statistics-container');
+    this.container_.classList.add('shaka-hidden');
+
+    const controlsContainer = this.controls.getControlsContainer();
+    controlsContainer.appendChild(this.container_);
+
+    /** @private {!Array} */
+    this.statisticsList_ = [];
+
+    /** @private {!Object.<string, (number|!Array.<number>)>} */
+    this.currentStats_ = this.adManager.getStats();
+
+    /** @private {!Object.<string, HTMLElement>} */
+    this.displayedElements_ = {};
+
+    const parseLoadTimes = (name) => {
+      let totalTime = 0;
+      const loadTimes =
+        /** @type {!Array.<number>} */ (this.currentStats_[name]);
+      for (const loadTime of loadTimes) {
+        totalTime += parseFloat(loadTime);
+      }
+      return totalTime;
+    };
+
+    const showNumber = (name) => {
+      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 {shaka.util.Timer} */
+    this.timer_ = new shaka.util.Timer(() => {
+      this.onTimerTick_();
+    });
+
+    this.updateLocalizedStrings_();
+
+    this.loadContainer_();
+
+    this.eventManager.listen(
+        this.localization, shaka.ui.Localization.LOCALE_UPDATED, () => {
+          this.updateLocalizedStrings_();
+        });
+
+    this.eventManager.listen(
+        this.localization, shaka.ui.Localization.LOCALE_CHANGED, () => {
+          this.updateLocalizedStrings_();
+        });
+
+    this.eventManager.listen(this.button_, 'click', () => {
+      this.onClick_();
+      this.updateLocalizedStrings_();
+    });
+
+    this.eventManager.listen(this.player, 'loading', () => {
+      shaka.ui.Utils.setDisplay(this.button_, false);
+    });
+
+    this.eventManager.listen(
+        this.adManager, shaka.ads.Utils.AD_STARTED, () => {
+          shaka.ui.Utils.setDisplay(this.button_, true);
+        });
+  }
+
+  /** @private */
+  onClick_() {
+    shaka.ui.Utils.setDisplay(this.parent, false);
+
+    if (this.container_.classList.contains('shaka-hidden')) {
+      this.icon_.textContent =
+          shaka.ui.Enums.MaterialDesignIcons.STATISTICS_OFF;
+      this.timer_.tickEvery(0.1);
+      shaka.ui.Utils.setDisplay(this.container_, true);
+    } else {
+      this.icon_.textContent =
+          shaka.ui.Enums.MaterialDesignIcons.STATISTICS_ON;
+      this.timer_.stop();
+      shaka.ui.Utils.setDisplay(this.container_, false);
+    }
+  }
+
+  /** @private */
+  updateLocalizedStrings_() {
+    const LocIds = shaka.ui.Locales.Ids;
+
+    this.nameSpan_.textContent =
+        this.localization.resolve(LocIds.AD_STATISTICS);
+
+    this.button_.ariaLabel = this.localization.resolve(LocIds.AD_STATISTICS);
+
+    const labelText = this.container_.classList.contains('shaka-hidden') ?
+        LocIds.OFF : LocIds.ON;
+    this.stateSpan_.textContent = this.localization.resolve(labelText);
+  }
+
+  /** @private */
+  generateComponent_(name) {
+    const section = shaka.util.Dom.createHTMLElement('div');
+
+    const label = shaka.util.Dom.createHTMLElement('label');
+    label.textContent = name + ':';
+    section.appendChild(label);
+
+    const value = shaka.util.Dom.createHTMLElement('span');
+    value.textContent = this.parseFrom_[name](name);
+    section.appendChild(value);
+
+    this.displayedElements_[name] = value;
+
+    return section;
+  }
+
+  /** @private */
+  loadContainer_() {
+    for (const name of this.controls.getConfig().adStatisticsList) {
+      if (name in this.currentStats_) {
+        this.container_.appendChild(this.generateComponent_(name));
+        this.statisticsList_.push(name);
+      } else {
+        shaka.log.alwaysWarn('Unrecognized ad statistic element:', name);
+      }
+    }
+  }
+
+  /** @private */
+  onTimerTick_() {
+    this.currentStats_ = this.adManager.getStats();
+
+    for (const name of this.statisticsList_) {
+      this.displayedElements_[name].textContent =
+          this.parseFrom_[name](name);
+    }
+  }
+
+  /** @override */
+  release() {
+    this.timer_.stop();
+    this.timer_ = null;
+    super.release();
+  }
+};
+
+
+/**
+ * @implements {shaka.extern.IUIElement.Factory}
+ * @final
+ */
+shaka.ui.AdStatisticsButton.Factory = class {
+  /** @override */
+  create(rootElement, controls) {
+    return new shaka.ui.AdStatisticsButton(rootElement, controls);
+  }
+};
+
+
+shaka.ui.OverflowMenu.registerElement(
+    'ad_statistics', new shaka.ui.AdStatisticsButton.Factory());
+
+shaka.ui.ContextMenu.registerElement(
+    'ad_statistics', new shaka.ui.AdStatisticsButton.Factory());

package/ui/audio_language_selection.js

@@ -97,13 +97,17 @@ shaka.ui.AudioLanguageSelection = class extends shaka.ui.SettingsMenu {
    * @private
    */
   onAudioTrackSelected_(track) {
+    let channelsCount = undefined;
     if (track.channelsCount &&
         this.controls.getConfig().showAudioChannelCountVariants) {
-      this.player.selectAudioLanguage(
-          track.language, track.roles[0], track.channelsCount);
-    } else {
-      this.player.selectAudioLanguage(track.language, track.roles[0]);
+      channelsCount = track.channelsCount;
     }
+    let codec = undefined;
+    if (track.audioCodec) {
+      codec = track.audioCodec;
+    }
+    this.player.selectAudioLanguage(track.language, track.roles[0],
+        channelsCount, /* safeMargin= */ 0, codec);
   }
 
 

package/ui/controls.js

@@ -9,7 +9,7 @@ goog.provide('shaka.ui.Controls');
 goog.provide('shaka.ui.ControlsPanel');
 
 goog.require('goog.asserts');
-goog.require('shaka.ads.AdManager');
+goog.require('shaka.ads.Utils');
 goog.require('shaka.cast.CastProxy');
 goog.require('shaka.log');
 goog.require('shaka.ui.AdCounter');
@@ -203,6 +203,9 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
           const locale = e['locales'][0];
           this.adManager_.setLocale(locale);
         });
+
+    this.adManager_.initInterstitial(
+        this.getClientSideAdContainer(), this.localPlayer_, this.localVideo_);
   }
 
   /**
@@ -1213,13 +1216,13 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
     });
 
     this.eventManager_.listen(
-        this.adManager_, shaka.ads.AdManager.AD_STARTED, (e) => {
+        this.adManager_, shaka.ads.Utils.AD_STARTED, (e) => {
           this.ad_ = (/** @type {!Object} */ (e))['ad'];
           this.showAdUI();
         });
 
     this.eventManager_.listen(
-        this.adManager_, shaka.ads.AdManager.AD_STOPPED, () => {
+        this.adManager_, shaka.ads.Utils.AD_STOPPED, () => {
           this.ad_ = null;
           this.hideAdUI();
         });

package/ui/element.js

@@ -7,7 +7,7 @@
 
 goog.provide('shaka.ui.Element');
 
-goog.require('shaka.ads.AdManager');
+goog.require('shaka.ads.Utils');
 goog.require('shaka.util.EventManager');
 goog.requireType('shaka.Player');
 goog.requireType('shaka.ui.Controls');
@@ -73,12 +73,12 @@ shaka.ui.Element = class {
      */
     this.ad = controls.getAd();
 
-    const AD_STARTED = shaka.ads.AdManager.AD_STARTED;
+    const AD_STARTED = shaka.ads.Utils.AD_STARTED;
     this.eventManager.listen(this.adManager, AD_STARTED, (e) => {
       this.ad = (/** @type {!Object} */ (e))['ad'];
     });
 
-    const AD_STOPPED = shaka.ads.AdManager.AD_STOPPED;
+    const AD_STOPPED = shaka.ads.Utils.AD_STOPPED;
     this.eventManager.listen(this.adManager, AD_STOPPED, () => {
       this.ad = null;
     });

package/ui/enums.js

@@ -46,4 +46,5 @@ shaka.ui.Enums.MaterialDesignIcons = {
   'STATISTICS_OFF': 'insert_chart',
   'RECENTER_VR': 'control_camera',
   'TOGGLE_STEREOSCOPIC': '3d_rotation',
+  'DOWNLOAD': 'download',
 };

package/ui/externs/ui.js

@@ -65,6 +65,7 @@ shaka.extern.UIVolumeBarColors;
  *   overflowMenuButtons: !Array.<string>,
  *   contextMenuElements: !Array.<string>,
  *   statisticsList: !Array.<string>,
+ *   adStatisticsList: !Array.<string>,
  *   playbackRates: !Array.<number>,
  *   fastForwardRates: !Array.<number>,
  *   rewindRates: !Array.<number>,
@@ -106,6 +107,8 @@ shaka.extern.UIVolumeBarColors;
  *   The ordered list of buttons in the context menu.
  * @property {!Array.<string>} statisticsList
  *   The ordered list of statistics present in the statistics container.
+ * @property {!Array.<string>} adStatisticsList
+ *   The ordered list of ad statistics present in the ad statistics container.
  * @property {!Array.<number>} playbackRates
  *   The ordered list of rates for playback selection.
   * @property {!Array.<number>} fastForwardRates