shaka-player 4.8.8 → 4.9.0

package/lib/player.js

@@ -582,6 +582,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
      */
     this.trickPlayEventManager_ = new shaka.util.EventManager();
 
+    /**
+     * For listeners scoped to the lifetime of the ad manager.
+     * @private {shaka.util.EventManager}
+     */
+    this.adManagerEventManager_ = new shaka.util.EventManager();
+
     /** @private {shaka.net.NetworkingEngine} */
     this.networkingEngine_ = null;
 
@@ -708,7 +714,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
      */
     this.lastTextFactory_;
 
-    /** @private {{width: number, height: number}} */
+    /** @private {shaka.extern.Resolution} */
     this.maxHwRes_ = {width: Infinity, height: Infinity};
 
     /** @private {!shaka.media.ManifestFilterer} */
@@ -758,14 +764,78 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     this.cmsdManager_ = this.createCmsd_();
 
     this.networkingEngine_ = this.createNetworkingEngine();
+    this.networkingEngine_.setForceHTTP(this.config_.streaming.forceHTTP);
     this.networkingEngine_.setForceHTTPS(this.config_.streaming.forceHTTPS);
 
     /** @private {shaka.extern.IAdManager} */
     this.adManager_ = null;
 
+    /** @private {?shaka.media.PreloadManager} */
+    this.preloadDueAdManager_ = null;
+
+    /** @private {HTMLMediaElement} */
+    this.preloadDueAdManagerVideo_ = null;
+
+    /** @private {shaka.util.Timer} */
+    this.preloadDueAdManagerTimer_ = new shaka.util.Timer(async () => {
+      if (this.preloadDueAdManager_) {
+        goog.asserts.assert(this.preloadDueAdManagerVideo_, 'Must have video');
+        await this.attach(
+            this.preloadDueAdManagerVideo_, /* initializeMediaSource= */ true);
+        await this.load(this.preloadDueAdManager_);
+        this.preloadDueAdManagerVideo_.play();
+        this.preloadDueAdManager_ = null;
+      }
+    });
+
     if (shaka.Player.adManagerFactory_) {
       this.adManager_ = shaka.Player.adManagerFactory_();
       this.adManager_.configure(this.config_.ads);
+
+      // Note: we don't use shaka.ads.AdManager.AD_STARTED to avoid add a
+      // optional module in the player.
+      this.adManagerEventManager_.listen(
+          this.adManager_, 'ad-started', async (e) => {
+            if (this.config_.ads.supportsMultipleMediaElements) {
+              return;
+            }
+            const event = /** @type {?google.ima.AdEvent} */
+              (e['originalEvent']);
+            if (!event) {
+              return;
+            }
+            const contentPauseRequested =
+                google.ima.AdEvent.Type.CONTENT_PAUSE_REQUESTED;
+            if (event.type != contentPauseRequested) {
+              return;
+            }
+            this.preloadDueAdManagerTimer_.stop();
+            if (!this.preloadDueAdManager_) {
+              this.preloadDueAdManagerVideo_ = this.video_;
+              this.preloadDueAdManager_ =
+                await this.detachAndSavePreload(true);
+            }
+          });
+
+      // Note: we don't use shaka.ads.AdManager.AD_STOPPED to avoid add a
+      // optional module in the player.
+      this.adManagerEventManager_.listen(
+          this.adManager_, 'ad-stopped', (e) => {
+            if (this.config_.ads.supportsMultipleMediaElements) {
+              return;
+            }
+            const event = /** @type {?google.ima.AdEvent} */
+              (e['originalEvent']);
+            if (!event) {
+              return;
+            }
+            const contentResumeRequested =
+                google.ima.AdEvent.Type.CONTENT_RESUME_REQUESTED;
+            if (event.type != contentResumeRequested) {
+              return;
+            }
+            this.preloadDueAdManagerTimer_.tickAfter(0.1);
+          });
     }
 
     // If the browser comes back online after being offline, then try to play
@@ -779,6 +849,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     this.checkVariantsTimer_ =
         new shaka.util.Timer(() => this.checkVariants_());
 
+    /** @private {?shaka.media.PreloadManager} */
+    this.preloadNextUrl_ = null;
+
     // Even though |attach| will start in later interpreter cycles, it should be
     // the LAST thing we do in the constructor because conceptually it relies on
     // player having been initialized.
@@ -913,6 +986,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.trickPlayEventManager_.release();
       this.trickPlayEventManager_ = null;
     }
+    if (this.adManagerEventManager_) {
+      this.adManagerEventManager_.release();
+      this.adManagerEventManager_ = null;
+    }
 
     this.abrManagerFactory_ = null;
     this.config_ = null;
@@ -1030,10 +1107,15 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     }
     const manifest = shaka.media.ManifestParser.probeSupport();
     const media = shaka.media.MediaSourceEngine.probeSupport();
+    const hardwareResolution =
+        await shaka.util.Platform.detectMaxHardwareResolution();
+
+    /** @type {shaka.extern.SupportType} */
     const ret = {
-      manifest: manifest,
-      media: media,
-      drm: drm,
+      manifest,
+      media,
+      drm,
+      hardwareResolution,
     };
 
     const plugins = shaka.Player.supportPlugins_;
@@ -1301,6 +1383,15 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.adManager_.onAssetUnload();
       }
 
+      if (this.preloadDueAdManager_ && !keepAdManager) {
+        this.preloadDueAdManager_.destroy();
+        this.preloadDueAdManager_ = null;
+      }
+
+      if (!keepAdManager) {
+        this.preloadDueAdManagerTimer_.stop();
+      }
+
       if (this.cmsdManager_) {
         this.cmsdManager_.reset();
       }
@@ -1332,6 +1423,14 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.drmEngine_ = null;
       }
 
+      if (this.preloadNextUrl_ &&
+          this.assetUri_ != this.preloadNextUrl_.getAssetUri()) {
+        if (!this.preloadNextUrl_.isDestroyed()) {
+          this.preloadNextUrl_.destroy();
+        }
+        this.preloadNextUrl_ = null;
+      }
+
       this.assetUri_ = null;
       this.mimeType_ = null;
       this.bufferObserver_ = null;
@@ -1351,6 +1450,15 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         }
       }
 
+      // On some devices, cached MediaKeySystemAccess objects may corrupt
+      // after several playbacks, and they are not able anymore to properly
+      // create MediaKeys objects. To prevent it, clear the cache after
+      // each playback.
+      if (this.config_.streaming.clearDecodingCache) {
+        shaka.util.StreamUtils.clearDecodingConfigCache();
+        shaka.media.DrmEngine.clearMediaKeySystemAccessMap();
+      }
+
       this.manifest_ = null;
       this.stats_ = new shaka.util.Stats(); // Replace with a clean object.
       this.lastTextFactory_ = null;
@@ -1426,6 +1534,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     }
 
     if (this.assetUri_) {
+      // Note: This is used to avoid the destruction of the nextUrl
+      // preloadManager that can be the current one.
+      this.assetUri_ = assetUri;
       await this.unload(/* initializeMediaSource= */ false);
     }
 
@@ -1627,6 +1738,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         // properly destroyed or released.
         await preloadManager.destroy();
       }
+      this.preloadNextUrl_ = null;
     }
   }
 
@@ -1664,6 +1776,34 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    */
   async unloadAndSavePreload(
       initializeMediaSource = true, keepAdManager = false) {
+    const preloadManager = await this.savePreload_();
+    await this.unload(initializeMediaSource, keepAdManager);
+    return preloadManager;
+  }
+
+  /**
+   * Detach the player from the current media element, if any, and returns a
+   * PreloadManager that contains the loaded manifest of that asset, if any.
+   * Allows for the asset to be re-loaded by this player faster, in the future.
+   * When in src= mode, this detach but does not make a PreloadManager.
+   * Leaves the player in a state where it cannot play media, until it has been
+   * attached to something else.
+   *
+   * @param {boolean=} keepAdManager
+   * @return {!Promise.<?shaka.media.PreloadManager>}
+   * @export
+   */
+  async detachAndSavePreload(keepAdManager = false) {
+    const preloadManager = await this.savePreload_();
+    await this.detach(keepAdManager);
+    return preloadManager;
+  }
+
+  /**
+   * @return {!Promise.<?shaka.media.PreloadManager>}
+   * @private
+   */
+  async savePreload_() {
     let preloadManager = null;
     if (this.manifest_ && this.parser_ && this.parserFactory_ &&
         this.assetUri_) {
@@ -1698,7 +1838,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.abrManager_ = null;
       this.abrManagerFactory_ = null;
     }
-    await this.unload(initializeMediaSource, keepAdManager);
     return preloadManager;
   }
 
@@ -1968,6 +2107,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // Sadly, as the network engine creation code must be replaceable by tests,
     // it cannot be made and use the utilities defined in this function.
     const networkingEngine = this.createNetworkingEngine(getPreloadManager);
+    this.networkingEngine_.copyFiltersInto(networkingEngine);
 
     /** @return {!shaka.media.DrmEngine} */
     const createDrmEngine = () => {
@@ -2375,6 +2515,28 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.loadEventManager_.listen(
           mediaElement, 'timeupdate', onVideoProgress);
       this.onVideoProgress_();
+      if (this.manifest_.nextUrl) {
+        if (this.config_.streaming.preloadNextUrlWindow > 0) {
+          const onTimeUpdate = async () => {
+            const timeToEnd = this.video_.duration - this.video_.currentTime;
+            if (!isNaN(timeToEnd)) {
+              if (timeToEnd <= this.config_.streaming.preloadNextUrlWindow) {
+                this.loadEventManager_.unlisten(
+                    mediaElement, 'timeupdate', onTimeUpdate);
+                goog.asserts.assert(this.manifest_.nextUrl,
+                    'this.manifest_.nextUrl should be valid.');
+                this.preloadNextUrl_ =
+                    await this.preload(this.manifest_.nextUrl);
+              }
+            }
+          };
+          this.loadEventManager_.listen(
+              mediaElement, 'timeupdate', onTimeUpdate);
+        }
+        this.loadEventManager_.listen(mediaElement, 'ended', () => {
+          this.load(this.preloadNextUrl_ || this.manifest_.nextUrl);
+        });
+      }
     }
 
     if (this.adManager_) {
@@ -3412,10 +3574,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     }
 
     // If lowLatencyMode is enabled, and inaccurateManifestTolerance and
-    // rebufferingGoal and segmentPrefetchLimit and baseDelay are not
-    // specified, set inaccurateManifestTolerance to 0 and rebufferingGoal
-    // to 0.01 and segmentPrefetchLimit to 2 and updateIntervalSeconds to
-    // 0.1 and baseDelay to 100 by default for low latency streaming.
+    // rebufferingGoal and segmentPrefetchLimit and baseDelay and
+    // autoCorrectDrift and maxDisabledTime are not specified, set
+    // inaccurateManifestTolerance to 0 and rebufferingGoal to 0.01 and
+    // segmentPrefetchLimit to 2 and updateIntervalSeconds to 0.1 and and
+    // baseDelay to 100 and autoCorrectDrift to false and maxDisabledTime
+    // to 1 by default for low latency streaming.
     if (config['streaming'] && config['streaming']['lowLatencyMode']) {
       if (config['streaming']['inaccurateManifestTolerance'] == undefined) {
         config['streaming']['inaccurateManifestTolerance'] = 0;
@@ -3429,6 +3593,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       if (config['streaming']['updateIntervalSeconds'] == undefined) {
         config['streaming']['updateIntervalSeconds'] = 0.1;
       }
+      if (config['streaming']['maxDisabledTime'] == undefined) {
+        config['streaming']['maxDisabledTime'] = 1;
+      }
       if (config['streaming']['retryParameters'] == undefined) {
         config['streaming']['retryParameters'] = {};
       }
@@ -3438,6 +3605,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       if (config['manifest'] == undefined) {
         config['manifest'] = {};
       }
+      if (config['manifest']['dash'] == undefined) {
+        config['manifest']['dash'] = {};
+      }
+      if (config['manifest']['dash']['autoCorrectDrift'] == undefined) {
+        config['manifest']['dash']['autoCorrectDrift'] = false;
+      }
       if (config['manifest']['retryParameters'] == undefined) {
         config['manifest']['retryParameters'] = {};
       }
@@ -3512,6 +3685,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       }
     }
     if (this.networkingEngine_) {
+      this.networkingEngine_.setForceHTTP(this.config_.streaming.forceHTTP);
       this.networkingEngine_.setForceHTTPS(this.config_.streaming.forceHTTPS);
     }
 
@@ -3599,6 +3773,24 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     return ret;
   }
 
+  /**
+   * Return a copy of the current non default configuration.  Modifications of
+   * the returned value will not affect the Player's active configuration.
+   * You must call <code>player.configure()</code> to make changes.
+   *
+   * @return {!Object}
+   * @export
+   */
+  getNonDefaultConfiguration() {
+    goog.asserts.assert(this.config_, 'Config must not be null!');
+
+    const ret = this.defaultConfig_();
+    shaka.util.PlayerConfiguration.mergeConfigObjects(
+        ret, this.config_, this.defaultConfig_());
+    return shaka.util.ConfigUtils.getDifferenceFromConfigObjects(
+        this.config_, this.defaultConfig_());
+  }
+
   /**
    * Return a reference to the current configuration. Modifications to the
    * returned value will affect the Player's active configuration. This method
@@ -5733,6 +5925,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         error.code == shaka.util.Error.Code.HTTP_ERROR) {
       // These errors can be near-instant, so delay a bit before retrying.
       retryDelaySeconds = 1;
+      if (this.config_.streaming.lowLatencyMode) {
+        retryDelaySeconds = 0.1;
+      }
     } else if (error.code == shaka.util.Error.Code.TIMEOUT) {
       // We already waited for a timeout, so retry quickly.
       retryDelaySeconds = 0.1;
@@ -6026,8 +6221,14 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // serviceDescription must override if it is defined in the MPD and
       // liveSync configuration is not set.
       if (this.manifest_ && this.manifest_.serviceDescription) {
-        liveSyncMaxLatency = this.manifest_.serviceDescription.maxLatency ||
-          this.config_.streaming.liveSyncMaxLatency;
+        liveSyncMaxLatency = this.config_.streaming.liveSyncMaxLatency;
+        if (this.manifest_.serviceDescription.targetLatency != null) {
+          liveSyncMaxLatency =
+              this.manifest_.serviceDescription.targetLatency +
+              this.config_.streaming.liveSyncTargetLatencyTolerance;
+        } else if (this.manifest_.serviceDescription.maxLatency != null) {
+          liveSyncMaxLatency = this.manifest_.serviceDescription.maxLatency;
+        }
         liveSyncPlaybackRate =
           this.manifest_.serviceDescription.maxPlaybackRate ||
           this.config_.streaming.liveSyncPlaybackRate;
@@ -6043,8 +6244,14 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // serviceDescription must override if it is defined in the MPD and
       // liveSync configuration is not set.
       if (this.manifest_ && this.manifest_.serviceDescription) {
-        liveSyncMinLatency = this.manifest_.serviceDescription.minLatency ||
-          this.config_.streaming.liveSyncMinLatency;
+        liveSyncMinLatency = this.config_.streaming.liveSyncMinLatency;
+        if (this.manifest_.serviceDescription.targetLatency != null) {
+          liveSyncMinLatency =
+              this.manifest_.serviceDescription.targetLatency -
+              this.config_.streaming.liveSyncTargetLatencyTolerance;
+        } else if (this.manifest_.serviceDescription.minLatency != null) {
+          liveSyncMinLatency = this.manifest_.serviceDescription.minLatency;
+        }
         liveSyncMinPlaybackRate =
           this.manifest_.serviceDescription.minPlaybackRate ||
           this.config_.streaming.liveSyncMinPlaybackRate;
@@ -7239,7 +7446,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.8.8' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.0' + '-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

@@ -8,6 +8,7 @@ goog.provide('shaka.polyfill.MediaCapabilities');
 
 goog.require('shaka.log');
 goog.require('shaka.media.Capabilities');
+goog.require('shaka.media.DrmEngine');
 goog.require('shaka.polyfill');
 goog.require('shaka.util.Platform');
 
@@ -276,25 +277,22 @@ shaka.polyfill.MediaCapabilities = class {
       mediaKeySystemConfig.videoCapabilities = videoCapabilities;
     }
 
-    const cacheKey = shaka.polyfill.MediaCapabilities
-        .generateKeySystemCacheKey_(
-            videoConfig ? videoConfig.contentType : '',
-            audioConfig ? audioConfig.contentType : '',
-            mcapKeySystemConfig.keySystem);
+    const videoCodec = videoConfig ? videoConfig.contentType : '';
+    const audioCodec = audioConfig ? audioConfig.contentType : '';
+    const keySystem = mcapKeySystemConfig.keySystem;
 
     /** @type {MediaKeySystemAccess} */
     let keySystemAccess = null;
     try {
-      if (cacheKey in shaka.polyfill.MediaCapabilities
-          .memoizedMediaKeySystemAccessRequests_) {
-        keySystemAccess = shaka.polyfill.MediaCapabilities
-            .memoizedMediaKeySystemAccessRequests_[cacheKey];
+      if (shaka.media.DrmEngine.hasMediaKeySystemAccess(
+          videoCodec, audioCodec, keySystem)) {
+        keySystemAccess = shaka.media.DrmEngine.getMediaKeySystemAccess(
+            videoCodec, audioCodec, keySystem);
       } else {
         keySystemAccess = await navigator.requestMediaKeySystemAccess(
             mcapKeySystemConfig.keySystem, [mediaKeySystemConfig]);
-        shaka.polyfill.MediaCapabilities
-            .memoizedMediaKeySystemAccessRequests_[cacheKey] =
-              keySystemAccess;
+        shaka.media.DrmEngine.setMediaKeySystemAccess(
+            videoCodec, audioCodec, keySystem, keySystemAccess);
       }
     } catch (e) {
       shaka.log.info('navigator.requestMediaKeySystemAccess failed.');
@@ -346,19 +344,6 @@ shaka.polyfill.MediaCapabilities = class {
     }
     return result;
   }
-
-  /**
-   * A method for generating a key for the MediaKeySystemAccessRequests cache.
-   *
-   * @param {!string} videoCodec
-   * @param {!string} audioCodec
-   * @param {!string} keySystem
-   * @return {!string}
-   * @private
-   */
-  static generateKeySystemCacheKey_(videoCodec, audioCodec, keySystem) {
-    return `${videoCodec}#${audioCodec}#${keySystem}`;
-  }
 };
 
 /**
@@ -371,16 +356,6 @@ shaka.polyfill.MediaCapabilities = class {
  */
 shaka.polyfill.MediaCapabilities.originalMcap = null;
 
-/**
- * A cache that stores the MediaKeySystemAccess result of calling
- * `navigator.requestMediaKeySystemAccess` by a key combination of
- * video/audio codec and key system string.
- *
- * @type {(Object<(!string), (!MediaKeySystemAccess)>)}
- * @export
- */
-shaka.polyfill.MediaCapabilities.memoizedMediaKeySystemAccessRequests_ = {};
-
 /**
  * A cache that stores the canDisplayType result of calling
  * `cast.__platform__.canDisplayType`.

package/lib/util/config_utils.js

@@ -28,17 +28,28 @@ shaka.util.ConfigUtils = class {
   static mergeConfigObjects(destination, source, template, overrides, path) {
     goog.asserts.assert(destination, 'Destination config must not be null!');
 
-    /**
-     * @type {boolean}
-     * If true, don't validate the keys in the next level.
-     */
-    const ignoreKeys = path in overrides;
+    // If true, override the template.
+    const overrideTemplate = path in overrides;
+
+    // If true, treat the source as a generic object to be copied without
+    // descending more deeply.
+    let genericObject = false;
+    if (overrideTemplate) {
+      genericObject = template.constructor == Object &&
+        Object.keys(overrides).length == 0;
+    } else {
+      genericObject = template.constructor == Object &&
+        Object.keys(template).length == 0;
+    }
+
+    // If true, don't validate the keys in the next level.
+    const ignoreKeys = overrideTemplate || genericObject;
 
     let isValid = true;
 
     for (const k in source) {
       const subPath = path + '.' + k;
-      const subTemplate = ignoreKeys ? overrides[path] : template[k];
+      const subTemplate = overrideTemplate ? overrides[path] : template[k];
 
       // The order of these checks is important.
       if (!ignoreKeys && !(k in template)) {
@@ -55,6 +66,10 @@ shaka.util.ConfigUtils = class {
           // There is something in the template, so go back to that.
           destination[k] = shaka.util.ObjectUtils.cloneObject(subTemplate);
         }
+      } else if (genericObject) {
+        // Copy the fields of a generic object directly without a template and
+        // without descending any deeper.
+        destination[k] = source[k];
       } else if (subTemplate.constructor == Object &&
                  source[k] &&
                  source[k].constructor == Object) {
@@ -152,4 +167,57 @@ shaka.util.ConfigUtils = class {
   static referenceParametersAndReturn(parameters, returnValue) {
     return parameters && returnValue;
   }
+
+  /**
+   * @param {!Object} object
+   * @param {!Object} base
+   * @return {!Object}
+   * @export
+   */
+  static getDifferenceFromConfigObjects(object, base) {
+    const isObject = (obj) => {
+      return obj && typeof obj === 'object' && !Array.isArray(obj);
+    };
+
+    const isArrayEmpty = (array) => {
+      return Array.isArray(array) && array.length === 0;
+    };
+
+    const changes = (object, base) => {
+      return Object.keys(object).reduce((acc, key) => {
+        const value = object[key];
+        // eslint-disable-next-line no-prototype-builtins
+        if (!base.hasOwnProperty(key)) {
+          acc[key] = value;
+        } else if (isObject(value) && isObject(base[key])) {
+          const diff = changes(value, base[key]);
+          if (Object.keys(diff).length > 0 || !isObject(diff)) {
+            acc[key] = diff;
+          }
+        } else if (isArrayEmpty(value) && isArrayEmpty(base[key])) {
+          // Do nothing if both are empty arrays
+        } else if (value !== base[key]) {
+          acc[key] = value;
+        }
+        return acc;
+      }, {});
+    };
+
+    const diff = changes(object, base);
+
+    const removeEmpty = (obj) => {
+      for (const key of Object.keys(obj)) {
+        if (isObject(obj[key]) && Object.keys(obj[key]).length === 0) {
+          delete obj[key];
+        } else if (isArrayEmpty(obj[key])) {
+          delete obj[key];
+        } else if (isObject(obj[key])) {
+          removeEmpty(obj[key]);
+        }
+      }
+    };
+
+    removeEmpty(diff);
+    return diff;
+  }
 };

package/lib/util/error.js

@@ -212,6 +212,8 @@ shaka.util.Error.Code = {
    * <br> error.data[3] is the map of response headers.
    * <br> error.data[4] is the NetworkingEngine.RequestType of the request,
    *   if one was provided.
+   * <br> error.data[5] is the final URI. This may be different if the initial
+   *   URI (error.data[0]) issued a redirect.
    */
   'BAD_HTTP_STATUS': 1001,
 
@@ -770,6 +772,11 @@ shaka.util.Error.Code = {
    */
   'DASH_UNSUPPORTED_AES_128': 4051,
 
+  /**
+   * Patch requested during an update did not match original manifest.
+   */
+  'DASH_INVALID_PATCH': 4052,
+
 
   // RETIRED: 'INCONSISTENT_BUFFER_STATE': 5000,
   // RETIRED: 'INVALID_SEGMENT_INDEX': 5001,

package/lib/util/mp4_box_parsers.js

@@ -555,6 +555,7 @@ shaka.util.Mp4BoxParsers = class {
    * @return {!shaka.util.ParsedCOLRBox}
    */
   static parseCOLR(reader) {
+    let colorGamut = null;
     let videoRange = null;
     const data = reader.readBytes(4);
     let colorType = '';
@@ -563,7 +564,22 @@ shaka.util.Mp4BoxParsers = class {
     colorType += String.fromCharCode(data[2]);
     colorType += String.fromCharCode(data[3]);
     if (colorType === 'nclx') {
-      reader.readUint16(); // colour_primaries
+      const colorPrimaries = reader.readUint16();
+      switch (colorPrimaries) {
+        case 1:
+        case 5:
+        case 6:
+        case 7:
+          colorGamut = 'srgb';
+          break;
+        case 9:
+          colorGamut = 'rec2020';
+          break;
+        case 11:
+        case 12:
+          colorGamut = 'p3';
+          break;
+      }
       const transferCharacteristics = reader.readUint16();
       reader.readUint16(); // matrix_coefficients
       switch (transferCharacteristics) {
@@ -582,7 +598,10 @@ shaka.util.Mp4BoxParsers = class {
           break;
       }
     }
-    return {videoRange};
+    return {
+      colorGamut,
+      videoRange,
+    };
   }
 
   /**
@@ -913,9 +932,11 @@ shaka.util.ParsedHFOVBox;
 
 /**
  * @typedef {{
+ *    colorGamut: ?string,
  *    videoRange: ?string
  * }}
  *
+ * @property {?string} colorGamut
  * @property {?string} videoRange
  *
  * @exportDoc