shaka-player 4.5.0 → 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|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 '$';
@@ -126,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');
@@ -154,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;
@@ -236,6 +243,8 @@ shaka.dash.MpdUtils = class {
           start: startTime / timescale,
           end: endTime / timescale,
           unscaledStart: startTime,
+          partialSegments: partialSegments,
+          segmentPosition: timeline.length + startNumber,
         };
         timeline.push(item);
 
@@ -299,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 =
@@ -315,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;
   }
 
   /**
@@ -351,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

@@ -45,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;
@@ -249,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

@@ -59,7 +59,7 @@ shaka.dash.SegmentList = class {
 
     const references = SegmentList.createSegmentReferences_(
         context.periodInfo.start, context.periodInfo.duration,
-        info.startNumber, context.representation.baseUris, info,
+        info.startNumber, context.representation.getBaseUris, info,
         initSegmentReference, aes128Key);
 
     const isNew = !segmentIndex;
@@ -195,7 +195,7 @@ 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
@@ -203,7 +203,7 @@ shaka.dash.SegmentList = class {
    * @private
    */
   static createSegmentReferences_(
-      periodStart, periodDuration, startNumber, baseUris, info,
+      periodStart, periodDuration, startNumber, getBaseUris, info,
       initSegmentReference, aes128Key) {
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
 
@@ -246,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;
       };

package/lib/dash/segment_template.js

@@ -131,12 +131,13 @@ shaka.dash.SegmentTemplate = class {
             info,
             context.representation.id,
             context.bandwidth,
-            context.representation.baseUris,
+            context.representation.getBaseUris,
             periodStart,
             periodEnd,
             initSegmentReference,
             shouldFit,
             aes128Key,
+            context.representation.segmentSequenceCadence,
         );
       } else {
         const tsi = /** @type {!TimelineSegmentIndex} */(segmentIndex);
@@ -284,10 +285,10 @@ shaka.dash.SegmentTemplate = class {
     goog.asserts.assert(info.indexTemplate, 'must be using index template');
     const filledTemplate = MpdUtils.fillUriTemplate(
         info.indexTemplate, context.representation.id,
-        null, context.bandwidth || null, null);
+        null, null, context.bandwidth || null, null);
 
     const resolvedUris = ManifestParserUtils.resolveUris(
-        context.representation.baseUris, [filledTemplate]);
+        context.representation.getBaseUris(), [filledTemplate]);
 
     return shaka.dash.SegmentBase.generateSegmentIndexFromUris(
         context, requestSegment, init, resolvedUris, 0, null,
@@ -345,7 +346,7 @@ shaka.dash.SegmentTemplate = class {
     const template = info.mediaTemplate;
     const bandwidth = context.bandwidth || null;
     const id = context.representation.id;
-    const baseUris = context.representation.baseUris;
+    const getBaseUris = context.representation.getBaseUris;
 
     const timestampOffset = periodStart - info.scaledPresentationTimeOffset;
 
@@ -429,8 +430,8 @@ shaka.dash.SegmentTemplate = class {
           time = BigInt(segmentMediaTime) * BigInt(timescale);
         }
         const mediaUri = MpdUtils.fillUriTemplate(
-            template, id, position, bandwidth, time);
-        return ManifestParserUtils.resolveUris(baseUris, [mediaUri]);
+            template, id, position, /* subNumber= */ null, bandwidth, time);
+        return ManifestParserUtils.resolveUris(getBaseUris(), [mediaUri]);
       };
 
       // Relative to the presentation.
@@ -540,13 +541,13 @@ shaka.dash.SegmentTemplate = class {
 
     const repId = context.representation.id;
     const bandwidth = context.bandwidth || null;
-    const baseUris = context.representation.baseUris;
+    const getBaseUris = context.representation.getBaseUris;
     const getUris = () => {
       goog.asserts.assert(initialization, 'Should have returned earler');
       const filledTemplate = MpdUtils.fillUriTemplate(
-          initialization, repId, null, bandwidth, null);
+          initialization, repId, null, null, bandwidth, null);
       const resolvedUris = ManifestParserUtils.resolveUris(
-          baseUris, [filledTemplate]);
+          getBaseUris(), [filledTemplate]);
       return resolvedUris;
     };
     const qualityInfo = shaka.dash.SegmentBase.createQualityInfo(context);
@@ -579,16 +580,17 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
    * @param {!shaka.dash.SegmentTemplate.SegmentTemplateInfo} templateInfo
    * @param {?string} representationId
    * @param {number} bandwidth
-   * @param {Array.<string>} baseUris
+   * @param {function():Array.<string>} getBaseUris
    * @param {number} periodStart
    * @param {number} periodEnd
    * @param {shaka.media.InitSegmentReference} initSegmentReference
    * @param {boolean} shouldFit
    * @param {shaka.extern.aes128Key|undefined} aes128Key
+   * @param {number} segmentSequenceCadence
   */
-  constructor(templateInfo, representationId, bandwidth, baseUris,
+  constructor(templateInfo, representationId, bandwidth, getBaseUris,
       periodStart, periodEnd, initSegmentReference, shouldFit,
-      aes128Key) {
+      aes128Key, segmentSequenceCadence) {
     super([]);
 
     /** @private {?shaka.dash.SegmentTemplate.SegmentTemplateInfo} */
@@ -597,8 +599,8 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     this.representationId_ = representationId;
     /** @private {number} */
     this.bandwidth_ = bandwidth;
-    /** @private {Array.<string>} */
-    this.baseUris_ = baseUris;
+    /** @private {function():Array.<string>} */
+    this.getBaseUris_ = getBaseUris;
     /** @private {number} */
     this.periodStart_ = periodStart;
     /** @private {number} */
@@ -607,6 +609,8 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     this.initSegmentReference_ = initSegmentReference;
     /** @private {shaka.extern.aes128Key|undefined} */
     this.aes128Key_ = aes128Key;
+    /** @private {number} */
+    this.segmentSequenceCadence_ = segmentSequenceCadence;
 
 
     if (shouldFit) {
@@ -814,29 +818,81 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     let ref = this.references[correctedPosition];
 
     if (!ref) {
+      const mediaTemplate = this.templateInfo_.mediaTemplate;
       const range = this.templateInfo_.timeline[correctedPosition];
-      const segmentReplacement = position + this.templateInfo_.startNumber;
+      const segmentReplacement = range.segmentPosition;
       const timeReplacement = this.templateInfo_
           .unscaledPresentationTimeOffset + range.unscaledStart;
+      const timestampOffset = this.periodStart_ -
+        this.templateInfo_.scaledPresentationTimeOffset;
+
+      const partialSegmentRefs = [];
+
+      const partialDuration = (range.end - range.start) / range.partialSegments;
+
+      for (let i = 0; i < range.partialSegments; i++) {
+        const start = range.start + partialDuration * i;
+        const end = start + partialDuration;
+        const subNumber = i + 1;
+        let uris = null;
+        const getPartialUris = () => {
+          if (!this.templateInfo_) {
+            return [];
+          }
+          if (uris == null) {
+            uris = shaka.dash.TimelineSegmentIndex.createUris_(
+                this.templateInfo_.mediaTemplate,
+                this.representationId_,
+                segmentReplacement,
+                this.bandwidth_,
+                timeReplacement,
+                subNumber,
+                this.getBaseUris_);
+          }
+          return uris;
+        };
+        const partial = new shaka.media.SegmentReference(
+            this.periodStart_ + start,
+            this.periodStart_ + end,
+            getPartialUris,
+            /* startByte= */ 0,
+            /* endByte= */ null,
+            this.initSegmentReference_,
+            timestampOffset,
+            this.periodStart_,
+            this.periodEnd_,
+            /* partialReferences= */ [],
+            /* tilesLayout= */ '',
+            /* tileDuration= */ null,
+            /* syncTime= */ null,
+            shaka.media.SegmentReference.Status.AVAILABLE,
+            this.aes128Key_);
+        if (this.segmentSequenceCadence_ == 0) {
+          if (i > 0) {
+            partial.markAsNonIndependent();
+          }
+        } else if ((i % this.segmentSequenceCadence_) != 0) {
+          partial.markAsNonIndependent();
+        }
+        partialSegmentRefs.push(partial);
+      }
 
       const createUrisCb = () => {
-        if (!this.templateInfo_) {
+        if (range.partialSegments > 0) {
           return [];
         }
         return shaka.dash.TimelineSegmentIndex
             .createUris_(
-                this.templateInfo_.mediaTemplate,
+                mediaTemplate,
                 this.representationId_,
                 segmentReplacement,
                 this.bandwidth_,
                 timeReplacement,
-                this.baseUris_,
+                /* subNumber= */ null,
+                this.getBaseUris_,
             );
       };
 
-      const timestampOffset = this.periodStart_ -
-        this.templateInfo_.scaledPresentationTimeOffset;
-
       ref = new shaka.media.SegmentReference(
           this.periodStart_ + range.start,
           this.periodStart_ + range.end,
@@ -847,12 +903,13 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
           timestampOffset,
           this.periodStart_,
           this.periodEnd_,
-          /* partialReferences= */ [],
+          partialSegmentRefs,
           /* tilesLayout= */ '',
           /* tileDuration= */ null,
           /* syncTime= */ null,
           shaka.media.SegmentReference.Status.AVAILABLE,
-          this.aes128Key_);
+          this.aes128Key_,
+          /* allPartialSegments= */ range.partialSegments > 0);
       this.references[correctedPosition] = ref;
     }
 
@@ -866,12 +923,12 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
    * @private
    */
   static createUris_(mediaTemplate, repId, segmentReplacement,
-      bandwidth, timeReplacement, baseUris) {
+      bandwidth, timeReplacement, subNumber, getBaseUris) {
     const mediaUri = shaka.dash.MpdUtils.fillUriTemplate(
         mediaTemplate, repId,
-        segmentReplacement, bandwidth || null, timeReplacement);
+        segmentReplacement, subNumber, bandwidth || null, timeReplacement);
     return shaka.util.ManifestParserUtils
-        .resolveUris(baseUris, [mediaUri])
+        .resolveUris(getBaseUris(), [mediaUri])
         .map((g) => {
           return g.toString();
         });

package/lib/hls/hls_classes.js

@@ -11,7 +11,6 @@ goog.provide('shaka.hls.Segment');
 goog.provide('shaka.hls.Tag');
 
 goog.require('goog.asserts');
-goog.require('shaka.hls.Utils');
 goog.require('shaka.util.Error');
 
 
@@ -20,19 +19,11 @@ goog.require('shaka.util.Error');
  */
 shaka.hls.Playlist = class {
   /**
-   * @param {string} absoluteUri An absolute, final URI after redirects.
    * @param {!shaka.hls.PlaylistType} type
    * @param {!Array.<shaka.hls.Tag>} tags
    * @param {!Array.<shaka.hls.Segment>=} segments
    */
-  constructor(absoluteUri, type, tags, segments) {
-    /**
-     * An absolute, final URI after redirects.
-     *
-     * @const {string}
-     */
-    this.absoluteUri = absoluteUri;
-
+  constructor(type, tags, segments) {
     /** @const {shaka.hls.PlaylistType} */
     this.type = type;
 
@@ -87,10 +78,11 @@ shaka.hls.Tag = class {
    * As in some cases (like in tests) the tag never existed in string form, it
    * is far easier to recreate the tag from the parsed form.
    *
+   * @param {?Set.<string>=} attributesToSkip
    * @return {string}
    * @override
    */
-  toString() {
+  toString(attributesToSkip) {
     /**
      * @param {shaka.hls.Attribute} attr
      * @return {string}
@@ -107,7 +99,12 @@ shaka.hls.Tag = class {
     //  4) <NAME>:<VALUE>,<ATTRIBUTE_LIST>
 
     let tagStr = '#' + this.name;
-    const appendages = this.attributes ? this.attributes.map(attrToStr) : [];
+    const appendages = this.attributes ? this.attributes.filter((attr) => {
+      if (!attributesToSkip) {
+        return true;
+      }
+      return !attributesToSkip.has(attr.name);
+    }).map(attrToStr) : [];
 
     if (this.value) {
       appendages.unshift(this.value);
@@ -120,6 +117,22 @@ shaka.hls.Tag = class {
     return tagStr;
   }
 
+  /**
+   * Create the string key of the tag.
+   *
+   * @return {string}
+   */
+  getTagKey() {
+    const attributesToSkip = new Set()
+        .add('AUDIO')
+        .add('VIDEO')
+        .add('SUBTITLES')
+        .add('PATHWAY-ID')
+        .add('GROUP-ID')
+        .add('URI');
+    return this.toString(attributesToSkip);
+  }
+
   /**
    * Adds an attribute to an HLS Tag.
    *
@@ -203,48 +216,20 @@ shaka.hls.Segment = class {
   /**
    * Creates an HLS segment object.
    *
-   * @param {string} absoluteMediaPlaylistUri An absolute Media Playlist URI.
    * @param {string} verbatimSegmentUri verbatim segment URI.
    * @param {!Array.<shaka.hls.Tag>} tags
    * @param {!Array.<shaka.hls.Tag>=} partialSegments
    */
-  constructor(absoluteMediaPlaylistUri, verbatimSegmentUri, tags,
-      partialSegments=[]) {
+  constructor(verbatimSegmentUri, tags, partialSegments=[]) {
     /** @const {!Array.<shaka.hls.Tag>} */
     this.tags = tags;
 
-    /** @type {?string} */
-    this.absoluteUri_ = null;
-
-    /** @type {?string} */
-    this.absoluteMediaPlaylistUri_ = absoluteMediaPlaylistUri;
-
-    /** @type {?string} */
-    this.verbatimSegmentUri_ = verbatimSegmentUri;
+    /** @const {?string} */
+    this.verbatimSegmentUri = verbatimSegmentUri;
 
     /** @type {!Array.<shaka.hls.Tag>} */
     this.partialSegments = partialSegments;
   }
-
-  /**
-   * Returns an absolute URI.
-   *
-   * @return {string}
-   */
-  get absoluteUri() {
-    if (!this.absoluteUri_ &&
-        this.absoluteMediaPlaylistUri_ && this.verbatimSegmentUri_) {
-      goog.asserts.assert(this.absoluteMediaPlaylistUri_,
-          'An absolute Media Playlist URI should be defined!');
-      goog.asserts.assert(this.verbatimSegmentUri_,
-          'An verbatim segment URI should be defined!');
-      this.absoluteUri_ = shaka.hls.Utils.constructAbsoluteUri(
-          this.absoluteMediaPlaylistUri_, this.verbatimSegmentUri_);
-      this.absoluteMediaPlaylistUri_ = null;
-      this.verbatimSegmentUri_ = null;
-    }
-    return this.absoluteUri_ || '';
-  }
 };