shaka-player 4.8.10 → 4.9.1

package/lib/transmuxer/ec3_transmuxer.js

@@ -144,7 +144,8 @@ shaka.transmuxer.Ec3Transmuxer = class {
         return Promise.reject(new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED));
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null));
       }
       stream.audioSamplingRate = frame.sampleRate;
       stream.channelsCount = frame.channelCount;

package/lib/transmuxer/mp3_transmuxer.js

@@ -128,7 +128,8 @@ shaka.transmuxer.Mp3Transmuxer = class {
         return Promise.reject(new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED));
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null));
       }
       if (!firstHeader) {
         firstHeader = header;
@@ -155,7 +156,8 @@ shaka.transmuxer.Mp3Transmuxer = class {
       return Promise.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED));
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null));
     }
     /** @type {number} */
     const sampleRate = firstHeader.sampleRate;

package/lib/transmuxer/mpeg_ts_transmuxer.js

@@ -147,7 +147,8 @@ shaka.transmuxer.MpegTsTransmuxer = class {
       return Promise.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED));
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null));
     }
 
     let transmuxData = new Uint8Array([]);

package/lib/transmuxer/mss_transmuxer.js

@@ -226,7 +226,8 @@ shaka.transmuxer.MssTransmuxer = class {
       return Promise.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.MSS_MISSING_DATA_FOR_TRANSMUXING));
+          shaka.util.Error.Code.MSS_MISSING_DATA_FOR_TRANSMUXING,
+          reference ? reference.getUris()[0] : null));
     }
     try {
       const transmuxedData = this.processMediaSegment_(
@@ -239,7 +240,8 @@ shaka.transmuxer.MssTransmuxer = class {
       return Promise.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.MSS_TRANSMUXING_FAILED));
+          shaka.util.Error.Code.MSS_TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null));
     }
   }
 

package/lib/transmuxer/ts_transmuxer.js

@@ -192,7 +192,8 @@ shaka.transmuxer.TsTransmuxer = class {
           return Promise.reject(new shaka.util.Error(
               shaka.util.Error.Severity.CRITICAL,
               shaka.util.Error.Category.MEDIA,
-              shaka.util.Error.Code.TRANSMUXING_FAILED));
+              shaka.util.Error.Code.TRANSMUXING_FAILED,
+              reference ? reference.getUris()[0] : null));
         }
       }
       offset = id3Data.length;
@@ -209,7 +210,8 @@ shaka.transmuxer.TsTransmuxer = class {
       return Promise.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED));
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null));
     }
 
     if (!this.tsParser_) {
@@ -247,19 +249,19 @@ shaka.transmuxer.TsTransmuxer = class {
             break;
           case 'ac3':
             streamInfo =
-              this.getAc3StreamInfo_(tsParser, stream, duration);
+              this.getAc3StreamInfo_(tsParser, stream, duration, reference);
             break;
           case 'ec3':
             streamInfo =
-              this.getEc3StreamInfo_(tsParser, stream, duration);
+              this.getEc3StreamInfo_(tsParser, stream, duration, reference);
             break;
           case 'mp3':
             streamInfo =
-              this.getMp3StreamInfo_(tsParser, stream, duration);
+              this.getMp3StreamInfo_(tsParser, stream, duration, reference);
             break;
           case 'opus':
             streamInfo =
-              this.getOpusStreamInfo_(tsParser, stream, duration);
+              this.getOpusStreamInfo_(tsParser, stream, duration, reference);
             break;
         }
         if (streamInfo) {
@@ -278,7 +280,8 @@ shaka.transmuxer.TsTransmuxer = class {
       return Promise.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED));
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null));
     }
 
     const mp4Generator = new shaka.util.Mp4Generator(streamInfos);
@@ -327,7 +330,8 @@ shaka.transmuxer.TsTransmuxer = class {
         throw new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED);
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null);
       }
       stream.audioSamplingRate = info.sampleRate;
       stream.channelsCount = info.channelCount;
@@ -370,7 +374,8 @@ shaka.transmuxer.TsTransmuxer = class {
         throw new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED);
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null);
       }
 
       firstPts = reference.startTime * timescale;
@@ -382,7 +387,8 @@ shaka.transmuxer.TsTransmuxer = class {
         throw new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED);
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null);
       }
       info = {
         sampleRate: stream.audioSamplingRate,
@@ -395,7 +401,8 @@ shaka.transmuxer.TsTransmuxer = class {
         throw new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED);
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null);
       }
       const segmentDuration =
           (reference.endTime - reference.startTime) * timescale;
@@ -451,10 +458,11 @@ shaka.transmuxer.TsTransmuxer = class {
    * @param {shaka.util.TsParser} tsParser
    * @param {shaka.extern.Stream} stream
    * @param {number} duration
+   * @param {?shaka.media.SegmentReference} reference
    * @return {shaka.util.Mp4Generator.StreamInfo}
    * @private
    */
-  getAc3StreamInfo_(tsParser, stream, duration) {
+  getAc3StreamInfo_(tsParser, stream, duration, reference) {
     const Ac3 = shaka.transmuxer.Ac3;
     const timescale = shaka.util.TsParser.Timescale;
 
@@ -511,7 +519,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
 
 
@@ -544,10 +553,11 @@ shaka.transmuxer.TsTransmuxer = class {
    * @param {shaka.util.TsParser} tsParser
    * @param {shaka.extern.Stream} stream
    * @param {number} duration
+   * @param {?shaka.media.SegmentReference} reference
    * @return {shaka.util.Mp4Generator.StreamInfo}
    * @private
    */
-  getEc3StreamInfo_(tsParser, stream, duration) {
+  getEc3StreamInfo_(tsParser, stream, duration, reference) {
     const Ec3 = shaka.transmuxer.Ec3;
     const timescale = shaka.util.TsParser.Timescale;
 
@@ -604,7 +614,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
 
 
@@ -637,10 +648,11 @@ shaka.transmuxer.TsTransmuxer = class {
    * @param {shaka.util.TsParser} tsParser
    * @param {shaka.extern.Stream} stream
    * @param {number} duration
+   * @param {?shaka.media.SegmentReference} reference
    * @return {shaka.util.Mp4Generator.StreamInfo}
    * @private
    */
-  getMp3StreamInfo_(tsParser, stream, duration) {
+  getMp3StreamInfo_(tsParser, stream, duration, reference) {
     const MpegAudio = shaka.transmuxer.MpegAudio;
     const timescale = shaka.util.TsParser.Timescale;
 
@@ -692,7 +704,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
     /** @type {number} */
     const sampleRate = firstHeader.sampleRate;
@@ -725,10 +738,11 @@ shaka.transmuxer.TsTransmuxer = class {
    * @param {shaka.util.TsParser} tsParser
    * @param {shaka.extern.Stream} stream
    * @param {number} duration
+   * @param {?shaka.media.SegmentReference} reference
    * @return {shaka.util.Mp4Generator.StreamInfo}
    * @private
    */
-  getOpusStreamInfo_(tsParser, stream, duration) {
+  getOpusStreamInfo_(tsParser, stream, duration, reference) {
     const Opus = shaka.transmuxer.Opus;
     const timescale = shaka.util.TsParser.Timescale;
 
@@ -744,7 +758,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
 
     /** @type {!Uint8Array} */
@@ -798,7 +813,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
 
     stream.audioSamplingRate = opusMetadata.sampleRate;
@@ -854,7 +870,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA);
+          shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA,
+          reference ? reference.getUris()[0] : null);
     }
     for (let i = 0; i < videoData.length; i++) {
       const pes = videoData[i];
@@ -897,7 +914,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
     stream.height = info.height;
     stream.width = info.width;
@@ -948,7 +966,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA);
+          shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA,
+          reference ? reference.getUris()[0] : null);
     }
     for (let i = 0; i < videoData.length; i++) {
       const pes = videoData[i];
@@ -991,7 +1010,8 @@ shaka.transmuxer.TsTransmuxer = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED);
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null);
     }
     stream.height = info.height;
     stream.width = info.width;

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,
 
@@ -454,6 +456,7 @@ shaka.util.Error.Code = {
   /**
    * A MediaSource operation failed.
    * <br> error.data[0] is a MediaError code from the video element.
+   * <br> error.data[1] is the segment URI that triggered the error, if any.
    */
   'MEDIA_SOURCE_OPERATION_FAILED': 3014,
 
@@ -461,6 +464,7 @@ shaka.util.Error.Code = {
    * A MediaSource operation threw an exception.
    * <br> error.data[0] is the exception that was thrown.
    * <br> error.data[1] is the error object from the video element.
+   * <br> error.data[2] is the segment URI that triggered the error, if any.
    */
   'MEDIA_SOURCE_OPERATION_THREW': 3015,
 
@@ -483,37 +487,37 @@ shaka.util.Error.Code = {
   'QUOTA_EXCEEDED_ERROR': 3017,
 
   /**
-   * Mux.js did not invoke the callback signifying successful transmuxing.
+   * Transmuxing with our internal transmuxer failed.
+   * <br> error.data[0] is the segment URI that triggered the error, if any.
    */
   'TRANSMUXING_FAILED': 3018,
 
   /**
    * Content transformations required by the platform could not be performed for
    * some reason (unsupported container, etc.)
-   *
-   * @see https://github.com/shaka-project/shaka-player/issues/2759
+   * <br> @see https://github.com/shaka-project/shaka-player/issues/2759
+   * <br> error.data[0] is the segment URI that triggered the error, if any.
    */
   'CONTENT_TRANSFORMATION_FAILED': 3019,
 
   /**
    * Important data is missing to be able to do the transmuxing of MSS.
+   * <br> error.data[0] is the segment URI that triggered the error, if any.
    */
   'MSS_MISSING_DATA_FOR_TRANSMUXING': 3020,
 
-  /**
-   * MSS transmuing failed for unknown codec.
-   * <br> error.data[0] is a unknown codec.
-   */
-  'MSS_TRANSMUXING_CODEC_UNKNOWN': 3021,
+  // RETIRED: 'MSS_TRANSMUXING_CODEC_UNKNOWN': 3021,
 
   /**
    * MSS transmuing failed for unknown reason.
+   * <br> error.data[0] is the segment URI that triggered the error, if any.
    */
   'MSS_TRANSMUXING_FAILED': 3022,
 
   /**
    * An internal error which indicates that transmuxing operation has no video
    * data. This should not be seen by applications.
+   * <br> error.data[0] is the segment URI that triggered the error, if any.
    */
   'TRANSMUXING_NO_VIDEO_DATA': 3023,
 
@@ -770,6 +774,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