shaka-player 4.4.3 → 4.6.0

package/lib/dash/mpd_utils.js

@@ -29,22 +29,24 @@ shaka.dash.MpdUtils = class {
    * @param {string} uriTemplate
    * @param {?string} representationId
    * @param {?number} number
+   * @param {?number} subNumber
    * @param {?number} bandwidth
-   * @param {?number} time
+   * @param {?(number|bigint)} time
    * @return {string} A URI string.
    * @see ISO/IEC 23009-1:2014 section 5.3.9.4.4
    */
   static fillUriTemplate(
-      uriTemplate, representationId, number, bandwidth, time) {
+      uriTemplate, representationId, number, subNumber, bandwidth, time) {
     /** @type {!Object.<string, ?number|?string>} */
     const valueTable = {
       'RepresentationID': representationId,
       'Number': number,
+      'SubNumber': subNumber,
       'Bandwidth': bandwidth,
       'Time': time,
     };
 
-    const re = /\$(RepresentationID|Number|Bandwidth|Time)?(?:%0([0-9]+)([diouxX]))?\$/g;  // eslint-disable-line max-len
+    const re = /\$(RepresentationID|Number|SubNumber|Bandwidth|Time)?(?:%0([0-9]+)([diouxX]))?\$/g;  // eslint-disable-line max-len
     const uri = uriTemplate.replace(re, (match, name, widthStr, format) => {
       if (match == '$$') {
         return '$';
@@ -71,11 +73,15 @@ shaka.dash.MpdUtils = class {
       }
 
       if (name == 'Time') {
-        goog.asserts.assert(typeof value == 'number',
-            'Time value should be a number!');
-        goog.asserts.assert(Math.abs(value - Math.round(value)) < 0.2,
-            'Calculated $Time$ values must be close to integers');
-        value = Math.round(value);
+        if (typeof value != 'bigint') {
+          goog.asserts.assert(typeof value == 'number',
+              'Time value should be a number or bigint!');
+          if (Math.abs(value - Math.round(value)) >= 0.2) {
+            shaka.log.alwaysWarn(
+                'Calculated $Time$ values must be close to integers');
+          }
+          value = Math.round(value);
+        }
       }
 
       /** @type {string} */
@@ -122,11 +128,12 @@ shaka.dash.MpdUtils = class {
    * @param {number} unscaledPresentationTimeOffset
    * @param {number} periodDuration The Period's duration in seconds.
    *   Infinity indicates that the Period continues indefinitely.
+   * @param {number} startNumber
    * @return {!Array.<shaka.media.PresentationTimeline.TimeRange>}
    */
   static createTimeline(
       segmentTimeline, timescale, unscaledPresentationTimeOffset,
-      periodDuration) {
+      periodDuration, startNumber) {
     goog.asserts.assert(
         timescale > 0 && timescale < Infinity,
         'timescale must be a positive, finite integer');
@@ -150,6 +157,10 @@ shaka.dash.MpdUtils = class {
           XmlUtils.parseAttr(timePoint, 'd', XmlUtils.parseNonNegativeInt);
       const r = XmlUtils.parseAttr(timePoint, 'r', XmlUtils.parseInt);
 
+      const k = XmlUtils.parseAttr(timePoint, 'k', XmlUtils.parseInt);
+
+      const partialSegments = k || 0;
+
       // Adjust the start time to account for the presentation time offset.
       if (t != null) {
         t -= unscaledPresentationTimeOffset;
@@ -232,6 +243,8 @@ shaka.dash.MpdUtils = class {
           start: startTime / timescale,
           end: endTime / timescale,
           unscaledStart: startTime,
+          partialSegments: partialSegments,
+          segmentPosition: timeline.length + startNumber,
         };
         timeline.push(item);
 
@@ -295,7 +308,7 @@ shaka.dash.MpdUtils = class {
     if (timelineNode) {
       timeline = MpdUtils.createTimeline(
           timelineNode, timescale, unscaledPresentationTimeOffset,
-          context.periodInfo.duration || Infinity);
+          context.periodInfo.duration || Infinity, startNumber);
     }
 
     const scaledPresentationTimeOffset =
@@ -311,30 +324,46 @@ shaka.dash.MpdUtils = class {
   }
 
   /**
-   * Searches the inheritance for a Segment* with the given attribute.
-   *
+   * Parses common attributes for Representation, AdaptationSet, and Period.
    * @param {shaka.dash.DashParser.Context} context
    * @param {function(?shaka.dash.DashParser.InheritanceFrame):Element} callback
-   *   Gets the Element that contains the attribute to inherit.
-   * @param {string} attribute
-   * @return {?string}
-   */
-  static inheritAttribute(context, callback, attribute) {
+   * @return {!Array.<!Element>}
+    */
+  static getNodes(context, callback) {
     const Functional = shaka.util.Functional;
     goog.asserts.assert(
         callback(context.representation),
-        'There must be at least one element of the given type');
+        'There must be at least one element of the given type',
+    );
 
-    /** @type {!Array.<!Element>} */
-    const nodes = [
+    return [
       callback(context.representation),
       callback(context.adaptationSet),
       callback(context.period),
     ].filter(Functional.isNotNull);
+  }
 
-    return nodes
-        .map((s) => { return s.getAttribute(attribute); })
-        .reduce((all, part) => { return all || part; });
+  /**
+   * Searches the inheritance for a Segment* with the given attribute.
+   *
+   * @param {shaka.dash.DashParser.Context} context
+   * @param {function(?shaka.dash.DashParser.InheritanceFrame):Element} callback
+   *   Gets the Element that contains the attribute to inherit.
+   * @param {string} attribute
+   * @return {?string}
+   */
+  static inheritAttribute(context, callback, attribute) {
+    const MpdUtils = shaka.dash.MpdUtils;
+    const nodes = MpdUtils.getNodes(context, callback);
+
+    let result = null;
+    for (const node of nodes) {
+      result = node.getAttribute(attribute);
+      if (result) {
+        break;
+      }
+    }
+    return result;
   }
 
   /**
@@ -347,22 +376,18 @@ shaka.dash.MpdUtils = class {
    * @return {Element}
    */
   static inheritChild(context, callback, child) {
-    const Functional = shaka.util.Functional;
-    goog.asserts.assert(
-        callback(context.representation),
-        'There must be at least one element of the given type');
-
-    /** @type {!Array.<!Element>} */
-    const nodes = [
-      callback(context.representation),
-      callback(context.adaptationSet),
-      callback(context.period),
-    ].filter(Functional.isNotNull);
+    const MpdUtils = shaka.dash.MpdUtils;
+    const nodes = MpdUtils.getNodes(context, callback);
 
     const XmlUtils = shaka.util.XmlUtils;
-    return nodes
-        .map((s) => { return XmlUtils.findChild(s, child); })
-        .reduce((all, part) => { return all || part; });
+    let result = null;
+    for (const node of nodes) {
+      result = XmlUtils.findChild(node, child);
+      if (result) {
+        break;
+      }
+    }
+    return result;
   }
 
   /**

package/lib/dash/segment_base.js

@@ -31,9 +31,10 @@ shaka.dash.SegmentBase = class {
    *
    * @param {shaka.dash.DashParser.Context} context
    * @param {function(?shaka.dash.DashParser.InheritanceFrame):Element} callback
+   * @param {shaka.extern.aes128Key|undefined} aes128Key
    * @return {shaka.media.InitSegmentReference}
    */
-  static createInitSegment(context, callback) {
+  static createInitSegment(context, callback, aes128Key) {
     const MpdUtils = shaka.dash.MpdUtils;
     const XmlUtils = shaka.util.XmlUtils;
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
@@ -44,11 +45,10 @@ shaka.dash.SegmentBase = class {
       return null;
     }
 
-    let resolvedUris = context.representation.baseUris;
+    let resolvedUris = context.representation.getBaseUris();
     const uri = initialization.getAttribute('sourceURL');
     if (uri) {
-      resolvedUris = ManifestParserUtils.resolveUris(
-          context.representation.baseUris, [uri]);
+      resolvedUris = ManifestParserUtils.resolveUris(resolvedUris, [uri]);
     }
 
     let startByte = 0;
@@ -63,7 +63,13 @@ shaka.dash.SegmentBase = class {
     const getUris = () => resolvedUris;
     const qualityInfo = shaka.dash.SegmentBase.createQualityInfo(context);
     return new shaka.media.InitSegmentReference(
-        getUris, startByte, endByte, qualityInfo);
+        getUris,
+        startByte,
+        endByte,
+        qualityInfo,
+        /* timescale= */ null,
+        /* segmentData= */ null,
+        aes128Key);
   }
 
   /**
@@ -71,9 +77,10 @@ shaka.dash.SegmentBase = class {
    *
    * @param {shaka.dash.DashParser.Context} context
    * @param {shaka.dash.DashParser.RequestSegmentCallback} requestSegment
+   * @param {shaka.extern.aes128Key|undefined} aes128Key
    * @return {shaka.dash.DashParser.StreamInfo}
    */
-  static createStreamInfo(context, requestSegment) {
+  static createStreamInfo(context, requestSegment, aes128Key) {
     goog.asserts.assert(context.representation.segmentBase,
         'Should only be called with SegmentBase');
     // Since SegmentBase does not need updates, simply treat any call as
@@ -95,8 +102,8 @@ shaka.dash.SegmentBase = class {
     const scaledPresentationTimeOffset =
         (unscaledPresentationTimeOffset / timescale) || 0;
 
-    const initSegmentReference =
-        SegmentBase.createInitSegment(context, SegmentBase.fromInheritance_);
+    const initSegmentReference = SegmentBase.createInitSegment(
+        context, SegmentBase.fromInheritance_, aes128Key);
 
     // Throws an immediate error if the format is unsupported.
     SegmentBase.checkSegmentIndexRangeSupport_(context, initSegmentReference);
@@ -241,12 +248,12 @@ shaka.dash.SegmentBase = class {
     const representationIndex = MpdUtils.inheritChild(
         context, SegmentBase.fromInheritance_, 'RepresentationIndex');
 
-    let indexUris = context.representation.baseUris;
+    let indexUris = context.representation.getBaseUris();
     if (representationIndex) {
       const representationUri = representationIndex.getAttribute('sourceURL');
       if (representationUri) {
         indexUris = ManifestParserUtils.resolveUris(
-            context.representation.baseUris, [representationUri]);
+            indexUris, [representationUri]);
       }
     }
 

package/lib/dash/segment_list.js

@@ -31,15 +31,16 @@ shaka.dash.SegmentList = class {
    *
    * @param {shaka.dash.DashParser.Context} context
    * @param {!Object.<string, !shaka.extern.Stream>} streamMap
+   * @param {shaka.extern.aes128Key|undefined} aes128Key
    * @return {shaka.dash.DashParser.StreamInfo}
    */
-  static createStreamInfo(context, streamMap) {
+  static createStreamInfo(context, streamMap, aes128Key) {
     goog.asserts.assert(context.representation.segmentList,
         'Should only be called with SegmentList');
     const SegmentList = shaka.dash.SegmentList;
 
     const initSegmentReference = shaka.dash.SegmentBase.createInitSegment(
-        context, SegmentList.fromInheritance_);
+        context, SegmentList.fromInheritance_, aes128Key);
     const info = SegmentList.parseSegmentListInfo_(context);
 
     SegmentList.checkSegmentListInfo_(context, info);
@@ -58,8 +59,8 @@ shaka.dash.SegmentList = class {
 
     const references = SegmentList.createSegmentReferences_(
         context.periodInfo.start, context.periodInfo.duration,
-        info.startNumber, context.representation.baseUris, info,
-        initSegmentReference);
+        info.startNumber, context.representation.getBaseUris, info,
+        initSegmentReference, aes128Key);
 
     const isNew = !segmentIndex;
     if (segmentIndex) {
@@ -194,15 +195,16 @@ shaka.dash.SegmentList = class {
    * @param {number} periodStart in seconds.
    * @param {?number} periodDuration in seconds.
    * @param {number} startNumber
-   * @param {!Array.<string>} baseUris
+   * @param {function():!Array.<string>} getBaseUris
    * @param {shaka.dash.SegmentList.SegmentListInfo} info
    * @param {shaka.media.InitSegmentReference} initSegmentReference
+   * @param {shaka.extern.aes128Key|undefined} aes128Key
    * @return {!Array.<!shaka.media.SegmentReference>}
    * @private
    */
   static createSegmentReferences_(
-      periodStart, periodDuration, startNumber, baseUris, info,
-      initSegmentReference) {
+      periodStart, periodDuration, startNumber, getBaseUris, info,
+      initSegmentReference, aes128Key) {
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
 
     let max = info.mediaSegments.length;
@@ -244,7 +246,8 @@ shaka.dash.SegmentList = class {
       let uris = null;
       const getUris = () => {
         if (uris == null) {
-          uris = ManifestParserUtils.resolveUris(baseUris, [segment.mediaUri]);
+          uris = ManifestParserUtils.resolveUris(
+              getBaseUris(), [segment.mediaUri]);
         }
         return uris;
       };
@@ -257,7 +260,13 @@ shaka.dash.SegmentList = class {
               segment.end,
               initSegmentReference,
               timestampOffset,
-              appendWindowStart, appendWindowEnd));
+              appendWindowStart, appendWindowEnd,
+              /* partialReferences= */ [],
+              /* tilesLayout= */ '',
+              /* tileDuration= */ null,
+              /* syncTime= */ null,
+              shaka.media.SegmentReference.Status.AVAILABLE,
+              aes128Key));
       prevEndTime = endTime;
     }