shaka-player 4.10.13 → 4.11.0

package/lib/dash/segment_template.js

@@ -96,7 +96,8 @@ shaka.dash.SegmentTemplate = class {
         generateSegmentIndex: () => {
           return SegmentTemplate.generateSegmentIndexFromDuration_(
               shallowCopyOfContext, info, segmentLimit, initSegmentReference,
-              periodDurationMap, aesKey, lastSegmentNumber);
+              periodDurationMap, aesKey, lastSegmentNumber,
+              context.representation.segmentSequenceCadence);
         },
       };
     } else {
@@ -144,6 +145,7 @@ shaka.dash.SegmentTemplate = class {
             context.representation.id,
             context.bandwidth,
             context.representation.getBaseUris,
+            context.urlParams,
             periodStart,
             periodEnd,
             initSegmentReference,
@@ -253,6 +255,14 @@ shaka.dash.SegmentTemplate = class {
     const index = MpdUtils.inheritAttribute(
         context, SegmentTemplate.fromInheritance_, 'index');
 
+    const k = MpdUtils.inheritAttribute(
+        context, SegmentTemplate.fromInheritance_, 'k');
+
+    let numChunks = 0;
+    if (k) {
+      numChunks = parseInt(k, 10);
+    }
+
     return {
       segmentDuration: segmentInfo.segmentDuration,
       timescale: segmentInfo.timescale,
@@ -265,6 +275,8 @@ shaka.dash.SegmentTemplate = class {
       indexTemplate: index,
       mimeType: context.representation.mimeType,
       codecs: context.representation.codecs,
+      bandwidth: context.bandwidth,
+      numChunks: numChunks,
     };
   }
 
@@ -358,12 +370,13 @@ shaka.dash.SegmentTemplate = class {
    * @param {!Object.<string, number>} periodDurationMap
    * @param {shaka.extern.aesKey|undefined} aesKey
    * @param {?number} lastSegmentNumber
+   * @param {number} segmentSequenceCadence
    * @return {!Promise.<shaka.media.SegmentIndex>}
    * @private
    */
   static generateSegmentIndexFromDuration_(
       context, info, segmentLimit, initSegmentReference, periodDurationMap,
-      aesKey, lastSegmentNumber) {
+      aesKey, lastSegmentNumber, segmentSequenceCadence) {
     goog.asserts.assert(info.mediaTemplate,
         'There should be a media template with duration');
 
@@ -401,6 +414,7 @@ shaka.dash.SegmentTemplate = class {
     const bandwidth = context.bandwidth || null;
     const id = context.representation.id;
     const getBaseUris = context.representation.getBaseUris;
+    const urlParams = context.urlParams;
 
     const timestampOffset = periodStart - info.scaledPresentationTimeOffset;
 
@@ -483,16 +497,6 @@ shaka.dash.SegmentTemplate = class {
       const segmentMediaTime = segmentPeriodTime +
           info.scaledPresentationTimeOffset;
 
-      const getUris = () => {
-        let time = segmentMediaTime * timescale;
-        if ('BigInt' in window && time > Number.MAX_SAFE_INTEGER) {
-          time = BigInt(segmentMediaTime) * BigInt(timescale);
-        }
-        const mediaUri = MpdUtils.fillUriTemplate(
-            template, id, position, /* subNumber= */ null, bandwidth, time);
-        return ManifestParserUtils.resolveUris(getBaseUris(), [mediaUri]);
-      };
-
       // Relative to the presentation.
       const segmentStart = segmentPeriodTime + periodStart;
       const trueSegmentEnd = segmentStart + segmentDuration;
@@ -505,6 +509,69 @@ shaka.dash.SegmentTemplate = class {
       goog.asserts.assert(segmentStart < segmentEnd,
           'Generated a segment outside of the period!');
 
+      const partialSegmentRefs = [];
+
+      const numChunks = info.numChunks;
+      if (numChunks) {
+        const partialDuration = (segmentEnd - segmentStart) / numChunks;
+
+        for (let i = 0; i < numChunks; i++) {
+          const start = segmentStart + partialDuration * i;
+          const end = start + partialDuration;
+          const subNumber = i + 1;
+          const getPartialUris = () => {
+            let time = segmentMediaTime * timescale;
+            if ('BigInt' in window && time > Number.MAX_SAFE_INTEGER) {
+              time = BigInt(segmentMediaTime) * BigInt(timescale);
+            }
+            const mediaUri = MpdUtils.fillUriTemplate(
+                template, id, position, subNumber, bandwidth, time);
+            return ManifestParserUtils.resolveUris(
+                getBaseUris(), [mediaUri], urlParams());
+          };
+          const partial = new shaka.media.SegmentReference(
+              start,
+              end,
+              getPartialUris,
+              /* startByte= */ 0,
+              /* endByte= */ null,
+              initSegmentReference,
+              timestampOffset,
+              /* appendWindowStart= */ periodStart,
+              /* appendWindowEnd= */ getPeriodEnd(),
+              /* partialReferences= */ [],
+              /* tilesLayout= */ '',
+              /* tileDuration= */ null,
+              /* syncTime= */ null,
+              shaka.media.SegmentReference.Status.AVAILABLE,
+              aesKey);
+          partial.codecs = context.representation.codecs;
+          partial.mimeType = context.representation.mimeType;
+          if (segmentSequenceCadence == 0) {
+            if (i > 0) {
+              partial.markAsNonIndependent();
+            }
+          } else if ((i % segmentSequenceCadence) != 0) {
+            partial.markAsNonIndependent();
+          }
+          partialSegmentRefs.push(partial);
+        }
+      }
+
+      const getUris = () => {
+        if (numChunks) {
+          return [];
+        }
+        let time = segmentMediaTime * timescale;
+        if ('BigInt' in window && time > Number.MAX_SAFE_INTEGER) {
+          time = BigInt(segmentMediaTime) * BigInt(timescale);
+        }
+        const mediaUri = MpdUtils.fillUriTemplate(
+            template, id, position, /* subNumber= */ null, bandwidth, time);
+        return ManifestParserUtils.resolveUris(
+            getBaseUris(), [mediaUri], urlParams());
+      };
+
       const ref = new shaka.media.SegmentReference(
           segmentStart,
           segmentEnd,
@@ -515,14 +582,16 @@ shaka.dash.SegmentTemplate = class {
           timestampOffset,
           /* appendWindowStart= */ periodStart,
           /* appendWindowEnd= */ getPeriodEnd(),
-          /* partialReferences= */ [],
+          partialSegmentRefs,
           /* tilesLayout= */ '',
           /* tileDuration= */ null,
           /* syncTime= */ null,
           shaka.media.SegmentReference.Status.AVAILABLE,
-          aesKey);
+          aesKey,
+          partialSegmentRefs.length > 0);
       ref.codecs = context.representation.codecs;
       ref.mimeType = context.representation.mimeType;
+      ref.bandwidth = context.bandwidth;
       // This is necessary information for thumbnail streams:
       ref.trueEndTime = trueSegmentEnd;
       return ref;
@@ -612,12 +681,13 @@ shaka.dash.SegmentTemplate = class {
     const repId = context.representation.id;
     const bandwidth = context.bandwidth || null;
     const getBaseUris = context.representation.getBaseUris;
+    const urlParams = context.urlParams;
     const getUris = () => {
       goog.asserts.assert(initialization, 'Should have returned earler');
       const filledTemplate = MpdUtils.fillUriTemplate(
           initialization, repId, null, null, bandwidth, null);
       const resolvedUris = ManifestParserUtils.resolveUris(
-          getBaseUris(), [filledTemplate]);
+          getBaseUris(), [filledTemplate], urlParams());
       return resolvedUris;
     };
     const qualityInfo = shaka.dash.SegmentBase.createQualityInfo(context);
@@ -654,6 +724,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
    * @param {?string} representationId
    * @param {number} bandwidth
    * @param {function():Array.<string>} getBaseUris
+   * @param {function():string} urlParams
    * @param {number} periodStart
    * @param {number} periodEnd
    * @param {shaka.media.InitSegmentReference} initSegmentReference
@@ -662,7 +733,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
    * @param {number} segmentSequenceCadence
   */
   constructor(templateInfo, representationId, bandwidth, getBaseUris,
-      periodStart, periodEnd, initSegmentReference, shouldFit,
+      urlParams, periodStart, periodEnd, initSegmentReference, shouldFit,
       aesKey, segmentSequenceCadence) {
     super([]);
 
@@ -674,6 +745,8 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     this.bandwidth_ = bandwidth;
     /** @private {function():Array.<string>} */
     this.getBaseUris_ = getBaseUris;
+    /** @private {function():string} */
+    this.urlParams_ = urlParams;
     /** @private {number} */
     this.periodStart_ = periodStart;
     /** @private {number} */
@@ -933,6 +1006,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
       }
       const codecs = this.templateInfo_.codecs;
       const mimeType = this.templateInfo_.mimeType;
+      const bandwidth = this.templateInfo_.bandwidth;
 
       const partialSegmentRefs = [];
 
@@ -955,7 +1029,8 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
                 this.bandwidth_,
                 timeReplacement,
                 subNumber,
-                this.getBaseUris_);
+                this.getBaseUris_,
+                this.urlParams_);
           }
           return uris;
         };
@@ -977,6 +1052,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
             this.aesKey_);
         partial.codecs = codecs;
         partial.mimeType = mimeType;
+        partial.bandwidth = bandwidth;
         if (this.segmentSequenceCadence_ == 0) {
           if (i > 0) {
             partial.markAsNonIndependent();
@@ -1000,6 +1076,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
                 timeReplacement,
                 /* subNumber= */ null,
                 this.getBaseUris_,
+                this.urlParams_,
             );
       };
 
@@ -1023,6 +1100,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
       ref.codecs = codecs;
       ref.mimeType = mimeType;
       ref.trueEndTime = trueSegmentEnd;
+      ref.bandwidth = bandwidth;
       this.references[correctedPosition] = ref;
     }
 
@@ -1036,12 +1114,12 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
    * @private
    */
   static createUris_(mediaTemplate, repId, segmentReplacement,
-      bandwidth, timeReplacement, subNumber, getBaseUris) {
+      bandwidth, timeReplacement, subNumber, getBaseUris, urlParams) {
     const mediaUri = shaka.dash.MpdUtils.fillUriTemplate(
         mediaTemplate, repId,
         segmentReplacement, subNumber, bandwidth || null, timeReplacement);
     return shaka.util.ManifestParserUtils
-        .resolveUris(getBaseUris(), [mediaUri])
+        .resolveUris(getBaseUris(), [mediaUri], urlParams())
         .map((g) => {
           return g.toString();
         });
@@ -1059,7 +1137,9 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
  *   mediaTemplate: ?string,
  *   indexTemplate: ?string,
  *   mimeType: string,
- *   codecs: string
+ *   codecs: string,
+ *   bandwidth: number,
+ *   numChunks: number
  * }}
  *
  * @description
@@ -1085,5 +1165,9 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
  *   The mimeType.
  * @property {string} codecs
  *   The codecs.
+ * @property {number} bandwidth
+ *   The bandwidth.
+ * @property {number} numChunks
+ *   The number of chunks in each segment.
  */
 shaka.dash.SegmentTemplate.SegmentTemplateInfo;