shaka-player 4.10.20 → 4.10.21

package/lib/media/preload_manager.js

@@ -384,8 +384,6 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
         await this.parseManifestInner_();
         this.throwIfDestroyed_();
 
-        this.manifestPromise_.resolve();
-
         await this.initializeDrmInner_();
         this.throwIfDestroyed_();
 
@@ -495,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.

package/lib/media/streaming_engine.js

@@ -1902,8 +1902,12 @@ 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;
       }
@@ -2824,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);
 
@@ -2860,6 +2872,7 @@ shaka.media.StreamingEngine = class {
 
   /**
    * @param {!shaka.util.Error} error
+   * @return {number}
    * @private
    */
   getDisabledTime_(error) {

package/lib/player.js

@@ -1660,14 +1660,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         // 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');
 
-        // 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();
-
         if (!this.mediaSourceEngine_) {
           await mutexWrapOperation(async () => {
             await this.initializeMediaSourceEngineInner_();
@@ -7860,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.20' + '-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/package.json

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