shaka-player 4.10.19 → 4.10.21

package/lib/ads/interstitial_ad_manager.js

@@ -199,6 +199,10 @@ shaka.ads.InterstitialAdManager = class {
     if (this.adContainer_) {
       shaka.util.Dom.removeAllChildren(this.adContainer_);
     }
+    if (this.pollTimer_) {
+      this.pollTimer_.stop();
+      this.pollTimer_ = null;
+    }
     this.player_.destroy();
   }
 

package/lib/media/preload_manager.js

@@ -127,6 +127,9 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     /** @private {!shaka.util.Stats} */
     this.stats_ = new shaka.util.Stats();
 
+    /** @private {!shaka.util.PublicPromise} */
+    this.manifestPromise_ = new shaka.util.PublicPromise();
+
     /** @private {!shaka.util.PublicPromise} */
     this.successPromise_ = new shaka.util.PublicPromise();
 
@@ -490,10 +493,15 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
           this.assetUri_, this.manifestPlayerInterface_);
     }
 
+    this.manifestPromise_.resolve();
+
     // This event is fired after the manifest is parsed, but before any
     // filtering takes place.
     const event =
           this.makeEvent_(shaka.util.FakeEvent.EventName.ManifestParsed);
+    // Delay event to ensure manifest has been properly propagated
+    // to the player.
+    await Promise.resolve();
     this.dispatchEvent(event);
 
     // We require all manifests to have at least one variant.
@@ -700,6 +708,18 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     return this.successPromise_;
   }
 
+  /**
+   * Waits for the manifest to be loaded (or to fail with an error).
+   * @return {!Promise}
+   */
+  waitForManifest() {
+    const promises = [
+      this.manifestPromise_,
+      this.successPromise_,
+    ];
+    return Promise.race(promises);
+  }
+
   /**
    * Releases or stops all non-entrusted resources.
    *

package/lib/media/streaming_engine.js

@@ -82,7 +82,7 @@ shaka.media.StreamingEngine = class {
     this.deferredCloseSegmentIndex_ = new Map();
 
     /** @private {number} */
-    this.bufferingGoalScale_ = 1;
+    this.bufferingScale_ = 1;
 
     /** @private {?shaka.extern.Variant} */
     this.currentVariant_ = null;
@@ -148,6 +148,9 @@ shaka.media.StreamingEngine = class {
 
     /** @private {number} */
     this.playRangeEnd_ = Infinity;
+
+    /** @private {?shaka.media.StreamingEngine.MediaState_} */
+    this.lastTextMediaStateBeforeUnload_ = null;
   }
 
   /** @override */
@@ -380,6 +383,8 @@ shaka.media.StreamingEngine = class {
     if (state) {
       this.cancelUpdate_(state);
       this.abortOperations_(state).catch(() => {});
+      this.lastTextMediaStateBeforeUnload_ =
+          this.mediaStates_.get(ContentType.TEXT);
       this.mediaStates_.delete(ContentType.TEXT);
     }
     this.currentTextStream_ = null;
@@ -476,6 +481,7 @@ shaka.media.StreamingEngine = class {
    * @param {shaka.extern.Stream} textStream
    */
   async switchTextStream(textStream) {
+    this.lastTextMediaStateBeforeUnload_ = null;
     this.currentTextStream_ = textStream;
 
     if (!this.startupComplete_) {
@@ -1357,7 +1363,7 @@ shaka.media.StreamingEngine = class {
         this.config_.bufferingGoal);
 
     const scaledBufferingGoal = Math.max(1,
-        unscaledBufferingGoal * this.bufferingGoalScale_);
+        unscaledBufferingGoal * this.bufferingScale_);
 
     // Check if we've buffered to the end of the presentation.
     const timeUntilEnd =
@@ -1800,7 +1806,7 @@ shaka.media.StreamingEngine = class {
         }
         this.mediaStates_.delete(ContentType.TEXT);
       } else if (error.code == shaka.util.Error.Code.QUOTA_EXCEEDED_ERROR) {
-        this.handleQuotaExceeded_(mediaState, error);
+        await this.handleQuotaExceeded_(mediaState, error);
       } else {
         shaka.log.error(logPrefix, 'failed fetch and append: code=' +
             error.code);
@@ -1871,9 +1877,10 @@ shaka.media.StreamingEngine = class {
    *
    * @param {shaka.media.StreamingEngine.MediaState_} mediaState
    * @param {!shaka.util.Error} error
+   * @return {!Promise}
    * @private
    */
-  handleQuotaExceeded_(mediaState, error) {
+  async handleQuotaExceeded_(mediaState, error) {
     const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
 
     // The segment cannot fit into the SourceBuffer. Ideally, MediaSource would
@@ -1895,18 +1902,22 @@ shaka.media.StreamingEngine = class {
     });
 
     if (!waitingForAnotherStreamToRecover) {
+      const maxDisabledTime = this.getDisabledTime_(error);
+      if (maxDisabledTime) {
+        shaka.log.debug(logPrefix, 'Disabling stream due to quota', error);
+      }
       const handled = this.playerInterface_.disableStream(
-          mediaState.stream, this.config_.maxDisabledTime);
+          mediaState.stream, maxDisabledTime);
       if (handled) {
         return;
       }
       // Reduction schedule: 80%, 60%, 40%, 20%, 16%, 12%, 8%, 4%, fail.
       // Note: percentages are used for comparisons to avoid rounding errors.
-      const percentBefore = Math.round(100 * this.bufferingGoalScale_);
+      const percentBefore = Math.round(100 * this.bufferingScale_);
       if (percentBefore > 20) {
-        this.bufferingGoalScale_ -= 0.2;
+        this.bufferingScale_ -= 0.2;
       } else if (percentBefore > 4) {
-        this.bufferingGoalScale_ -= 0.04;
+        this.bufferingScale_ -= 0.04;
       } else {
         shaka.log.error(
             logPrefix, 'MediaSource threw QuotaExceededError too many times');
@@ -1915,12 +1926,14 @@ shaka.media.StreamingEngine = class {
         this.playerInterface_.onError(error);
         return;
       }
-      const percentAfter = Math.round(100 * this.bufferingGoalScale_);
+      const percentAfter = Math.round(100 * this.bufferingScale_);
       shaka.log.warning(
           logPrefix,
           'MediaSource threw QuotaExceededError:',
           'reducing buffering goals by ' + (100 - percentAfter) + '%');
       mediaState.recovering = true;
+      const presentationTime = this.playerInterface_.getPresentationTime();
+      await this.evict_(mediaState, presentationTime);
     } else {
       shaka.log.debug(
           logPrefix,
@@ -2521,12 +2534,16 @@ shaka.media.StreamingEngine = class {
     // Use the max segment duration, if it is longer than the bufferBehind, to
     // avoid accidentally clearing too much data when dealing with a manifest
     // with a long keyframe interval.
-    const bufferBehind = Math.max(this.config_.bufferBehind,
+    const bufferBehind = Math.max(
+        this.config_.bufferBehind * this.bufferingScale_,
         this.manifest_.presentationTimeline.getMaxSegmentDuration());
 
     const startTime =
         this.playerInterface_.mediaSourceEngine.bufferStart(mediaState.type);
     if (startTime == null) {
+      if (this.lastTextMediaStateBeforeUnload_ == mediaState) {
+        this.lastTextMediaStateBeforeUnload_ = null;
+      }
       shaka.log.v2(logPrefix,
           'buffer behind okay because nothing buffered:',
           'presentationTime=' + presentationTime,
@@ -2561,6 +2578,11 @@ shaka.media.StreamingEngine = class {
 
     this.destroyer_.ensureNotDestroyed();
     shaka.log.v1(logPrefix, 'evicted ' + overflow + ' seconds');
+
+    if (this.lastTextMediaStateBeforeUnload_) {
+      await this.evict_(this.lastTextMediaStateBeforeUnload_, presentationTime);
+      this.destroyer_.ensureNotDestroyed();
+    }
   }
 
 
@@ -2806,18 +2828,26 @@ shaka.media.StreamingEngine = class {
    * @private
    */
   async handleStreamingError_(mediaState, error) {
+    const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
+
     // If we invoke the callback right away, the application could trigger a
     // rapid retry cycle that could be very unkind to the server.  Instead,
     // use the backoff system to delay and backoff the error handling.
     await this.failureCallbackBackoff_.attempt();
     this.destroyer_.ensureNotDestroyed();
-    // Try to recover from network errors
-    if (error.category === shaka.util.Error.Category.NETWORK) {
+
+    // Try to recover from network errors, but not timeouts.
+    // See https://github.com/shaka-project/shaka-player/issues/7368
+    if (error.category === shaka.util.Error.Category.NETWORK &&
+        error.code != shaka.util.Error.Code.TIMEOUT) {
       if (mediaState.restoreStreamAfterTrickPlay) {
         this.setTrickPlay(/* on= */ false);
         return;
       }
       const maxDisabledTime = this.getDisabledTime_(error);
+      if (maxDisabledTime) {
+        shaka.log.debug(logPrefix, 'Disabling stream due to error', error);
+      }
       error.handled = this.playerInterface_.disableStream(
           mediaState.stream, maxDisabledTime);
 
@@ -2842,6 +2872,7 @@ shaka.media.StreamingEngine = class {
 
   /**
    * @param {!shaka.util.Error} error
+   * @return {number}
    * @private
    */
   getDisabledTime_(error) {

package/lib/player.js

@@ -1421,13 +1421,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       //
       // DrmEngine requires this to be done before we destroy DrmEngine itself.
       if (this.video_ && this.video_.src) {
-        // TODO: Investigate this more.  Only reproduces on Firefox 69.
-        // Introduce a delay before detaching the video source.  We are seeing
-        // spurious Promise rejections involving an AbortError in our tests
-        // otherwise.
-        await new Promise(
-            (resolve) => new shaka.util.Timer(resolve).tickAfter(0.1));
-
         this.video_.removeAttribute('src');
         this.video_.load();
       }
@@ -1664,6 +1657,16 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           await this.srcEqualsInner_(startTimeOfLoad, mimeType);
         }, 'srcEqualsInner_');
       } else {
+        // Wait for the manifest to be parsed.
+        await mutexWrapOperation(async () => {
+          await preloadManager.waitForManifest();
+          // Retrieve the manifest. This is specifically put before the media
+          // source engine is initialized, for the benefit of event handlers.
+          this.parserFactory_ = preloadManager.getParserFactory();
+          this.parser_ = preloadManager.receiveParser();
+          this.manifest_ = preloadManager.getManifest();
+        }, 'waitForFinish');
+
         if (!this.mediaSourceEngine_) {
           await mutexWrapOperation(async () => {
             await this.initializeMediaSourceEngineInner_();
@@ -1678,14 +1681,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         // Get manifest and associated values from preloader.
         this.config_ = preloadManager.getConfiguration();
         this.manifestFilterer_ = preloadManager.getManifestFilterer();
-        this.parserFactory_ = preloadManager.getParserFactory();
-        this.parser_ = preloadManager.receiveParser();
         if (this.parser_ && this.parser_.setMediaElement && this.video_) {
           this.parser_.setMediaElement(this.video_);
         }
         this.regionTimeline_ = preloadManager.receiveRegionTimeline();
         this.qualityObserver_ = preloadManager.getQualityObserver();
-        this.manifest_ = preloadManager.getManifest();
         const currentAdaptationSetCriteria =
             preloadManager.getCurrentAdaptationSetCriteria();
         if (currentAdaptationSetCriteria) {
@@ -7859,7 +7859,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat, max-len
-shaka.Player.version = 'v4.10.19' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.10.21' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/media_capabilities.js

@@ -10,6 +10,7 @@ goog.require('shaka.log');
 goog.require('shaka.media.Capabilities');
 goog.require('shaka.polyfill');
 goog.require('shaka.util.DrmUtils');
+goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Platform');
 
 
@@ -222,6 +223,7 @@ shaka.polyfill.MediaCapabilities = class {
    * @private
    */
   static async checkDrmSupport_(videoConfig, audioConfig, mcapKeySystemConfig) {
+    const MimeUtils = shaka.util.MimeUtils;
     const audioCapabilities = [];
     const videoCapabilities = [];
 
@@ -277,8 +279,12 @@ shaka.polyfill.MediaCapabilities = class {
       mediaKeySystemConfig.videoCapabilities = videoCapabilities;
     }
 
-    const videoCodec = videoConfig ? videoConfig.contentType : '';
-    const audioCodec = audioConfig ? audioConfig.contentType : '';
+    const videoMimeType = videoConfig ? videoConfig.contentType : '';
+    const audioMimeType = audioConfig ? audioConfig.contentType : '';
+    const videoCodec = MimeUtils.getBasicType(videoMimeType) + ';' +
+        MimeUtils.getCodecBase(videoMimeType);
+    const audioCodec = MimeUtils.getBasicType(audioMimeType) + ';' +
+        MimeUtils.getCodecBase(audioMimeType);
     const keySystem = mcapKeySystemConfig.keySystem;
 
     /** @type {MediaKeySystemAccess} */

package/lib/util/periods.js

@@ -75,6 +75,9 @@ shaka.util.PeriodCombiner = class {
     this.textStreams_ = [];
     this.imageStreams_ = [];
     this.variants_ = [];
+    this.multiTypeVariantsAllowed_ = false;
+    this.useStreamOnce_ = false;
+    this.usedPeriodIds_.clear();
   }
 
   /**

package/package.json

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

package/ui/locales/zh-HK.json

@@ -1,30 +1,49 @@
 {
+  "AD_DURATION": "廣告長度",
+  "AD_PROGRESS": "廣告 [AD_ON]/[NUM_ADS]",
+  "AD_STATISTICS": "廣告統計資料",
+  "AD_TIME": "廣告：[AD_TIME]",
+  "AIRPLAY": "AirPlay",
   "AUTO_QUALITY": "自動",
   "BACK": "返回",
   "CAPTIONS": "字幕",
   "CAST": "投放…",
-  "ENTER_PICTURE_IN_PICTURE": "進入畫中畫",
-  "EXIT_FULL_SCREEN": "結束全螢幕",
+  "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": "直播",
-  "MORE_SETTINGS": "更多設定",
+  "LOOP": "循環播放",
+  "MORE_SETTINGS": "顯示更多設定",
   "MULTIPLE_LANGUAGES": "多種語言",
-  "MUTE": "靜音",
+  "MUTE": "静音",
   "NOT_APPLICABLE": "不適用",
-  "OFF": "未選取",
-  "ON": "",
+  "OFF": "關閉",
+  "ON": "開啟",
   "PAUSE": "暫停",
   "PICTURE_IN_PICTURE": "畫中畫",
   "PLAY": "播放",
-  "RESOLUTION": "",
+  "PLAYBACK_RATE": "播放速度",
+  "QUALITY": "音質",
+  "RECENTER_VR": "重新置中",
+  "REPLAY": "重播",
+  "RESOLUTION": "解析度",
   "REWIND": "倒帶",
-  "SEEK": "搜尋滑桿",
-  "SKIP_TO_LIVE": "直播",
+  "SEEK": "進度",
+  "SKIP_AD": "略過廣告",
+  "SKIP_TO_LIVE": "跳至当前直播",
+  "STATISTICS": "統計資料",
+  "SUBTITLE_FORCED": "強制",
+  "SURROUND": "環迴音效",
+  "TOGGLE_STEREOSCOPIC": "切換立體視覺",
   "UNDETERMINED_LANGUAGE": "不明",
-  "UNMUTE": "解除靜音",
-  "UNRECOGNIZED_LANGUAGE": "不明",
+  "UNMUTE": "取消靜音",
+  "UNRECOGNIZED_LANGUAGE": "無法辨識",
   "VOLUME": "音量"
 }