shaka-player 4.7.13 → 4.8.0

package/lib/dash/segment_template.js

@@ -17,6 +17,7 @@ goog.require('shaka.util.Error');
 goog.require('shaka.util.IReleasable');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.ObjectUtils');
+goog.require('shaka.util.StringUtils');
 goog.requireType('shaka.dash.DashParser');
 goog.requireType('shaka.media.PresentationTimeline');
 
@@ -36,19 +37,20 @@ shaka.dash.SegmentTemplate = class {
    * @param {number} segmentLimit The maximum number of segments to generate for
    *   a SegmentTemplate with fixed duration.
    * @param {!Object.<string, number>} periodDurationMap
-   * @param {shaka.extern.aes128Key|undefined} aes128Key
+   * @param {shaka.extern.aesKey|undefined} aesKey
+   * @param {?number} lastSegmentNumber
    * @return {shaka.dash.DashParser.StreamInfo}
    */
   static createStreamInfo(
       context, requestSegment, streamMap, isUpdate, segmentLimit,
-      periodDurationMap, aes128Key) {
+      periodDurationMap, aesKey, lastSegmentNumber) {
     goog.asserts.assert(context.representation.segmentTemplate,
         'Should only be called with SegmentTemplate');
     const SegmentTemplate = shaka.dash.SegmentTemplate;
     const TimelineSegmentIndex = shaka.dash.TimelineSegmentIndex;
 
     const initSegmentReference =
-        SegmentTemplate.createInitSegment_(context, aes128Key);
+        SegmentTemplate.createInitSegment_(context, aesKey);
 
     /** @type {shaka.dash.SegmentTemplate.SegmentTemplateInfo} */
     const info = SegmentTemplate.parseSegmentTemplateInfo_(context);
@@ -84,7 +86,7 @@ shaka.dash.SegmentTemplate = class {
         generateSegmentIndex: () => {
           return SegmentTemplate.generateSegmentIndexFromDuration_(
               shallowCopyOfContext, info, segmentLimit, initSegmentReference,
-              periodDurationMap, aes128Key);
+              periodDurationMap, aesKey, lastSegmentNumber);
         },
       };
     } else {
@@ -136,7 +138,7 @@ shaka.dash.SegmentTemplate = class {
             periodEnd,
             initSegmentReference,
             shouldFit,
-            aes128Key,
+            aesKey,
             context.representation.segmentSequenceCadence,
         );
       } else {
@@ -178,7 +180,7 @@ shaka.dash.SegmentTemplate = class {
 
   /**
    * @param {?shaka.dash.DashParser.InheritanceFrame} frame
-   * @return {Element}
+   * @return {?shaka.extern.xml.Node}
    * @private
    */
   static fromInheritance_(frame) {
@@ -195,6 +197,7 @@ shaka.dash.SegmentTemplate = class {
   static parseSegmentTemplateInfo_(context) {
     const SegmentTemplate = shaka.dash.SegmentTemplate;
     const MpdUtils = shaka.dash.MpdUtils;
+    const StringUtils = shaka.util.StringUtils;
     const segmentInfo =
         MpdUtils.parseSegmentInfo(context, SegmentTemplate.fromInheritance_);
 
@@ -211,7 +214,7 @@ shaka.dash.SegmentTemplate = class {
       unscaledPresentationTimeOffset:
           segmentInfo.unscaledPresentationTimeOffset,
       timeline: segmentInfo.timeline,
-      mediaTemplate: media,
+      mediaTemplate: media && StringUtils.htmlUnescape(media),
       indexTemplate: index,
       mimeType: context.representation.mimeType,
       codecs: context.representation.codecs,
@@ -306,13 +309,14 @@ shaka.dash.SegmentTemplate = class {
    * @param {number} segmentLimit The maximum number of segments to generate.
    * @param {shaka.media.InitSegmentReference} initSegmentReference
    * @param {!Object.<string, number>} periodDurationMap
-   * @param {shaka.extern.aes128Key|undefined} aes128Key
+   * @param {shaka.extern.aesKey|undefined} aesKey
+   * @param {?number} lastSegmentNumber
    * @return {!Promise.<shaka.media.SegmentIndex>}
    * @private
    */
   static generateSegmentIndexFromDuration_(
       context, info, segmentLimit, initSegmentReference, periodDurationMap,
-      aes128Key) {
+      aesKey, lastSegmentNumber) {
     goog.asserts.assert(info.mediaTemplate,
         'There should be a media template with duration');
 
@@ -408,7 +412,7 @@ shaka.dash.SegmentTemplate = class {
     const minPosition = context.dynamic ?
         Math.max(range[0], range[1] - segmentLimit + 1) :
         range[0];
-    const maxPosition = range[1];
+    const maxPosition = lastSegmentNumber || range[1];
 
     const references = [];
     const createReference = (position) => {
@@ -464,7 +468,7 @@ shaka.dash.SegmentTemplate = class {
           /* tileDuration= */ null,
           /* syncTime= */ null,
           shaka.media.SegmentReference.Status.AVAILABLE,
-          aes128Key);
+          aesKey);
       ref.codecs = context.representation.codecs;
       ref.mimeType = context.representation.mimeType;
       // This is necessary information for thumbnail streams:
@@ -529,20 +533,21 @@ shaka.dash.SegmentTemplate = class {
    * Creates an init segment reference from a context object.
    *
    * @param {shaka.dash.DashParser.Context} context
-   * @param {shaka.extern.aes128Key|undefined} aes128Key
+   * @param {shaka.extern.aesKey|undefined} aesKey
    * @return {shaka.media.InitSegmentReference}
    * @private
    */
-  static createInitSegment_(context, aes128Key) {
+  static createInitSegment_(context, aesKey) {
     const MpdUtils = shaka.dash.MpdUtils;
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
     const SegmentTemplate = shaka.dash.SegmentTemplate;
 
-    const initialization = MpdUtils.inheritAttribute(
+    let initialization = MpdUtils.inheritAttribute(
         context, SegmentTemplate.fromInheritance_, 'initialization');
     if (!initialization) {
       return null;
     }
+    initialization = shaka.util.StringUtils.htmlUnescape(initialization);
 
     const repId = context.representation.id;
     const bandwidth = context.bandwidth || null;
@@ -563,7 +568,7 @@ shaka.dash.SegmentTemplate = class {
         qualityInfo,
         /* timescale= */ null,
         /* segmentData= */ null,
-        aes128Key);
+        aesKey);
     ref.codecs = context.representation.codecs;
     ref.mimeType = context.representation.mimeType;
     return ref;
@@ -593,12 +598,12 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
    * @param {number} periodEnd
    * @param {shaka.media.InitSegmentReference} initSegmentReference
    * @param {boolean} shouldFit
-   * @param {shaka.extern.aes128Key|undefined} aes128Key
+   * @param {shaka.extern.aesKey|undefined} aesKey
    * @param {number} segmentSequenceCadence
   */
   constructor(templateInfo, representationId, bandwidth, getBaseUris,
       periodStart, periodEnd, initSegmentReference, shouldFit,
-      aes128Key, segmentSequenceCadence) {
+      aesKey, segmentSequenceCadence) {
     super([]);
 
     /** @private {?shaka.dash.SegmentTemplate.SegmentTemplateInfo} */
@@ -615,8 +620,8 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     this.periodEnd_ = periodEnd;
     /** @private {shaka.media.InitSegmentReference} */
     this.initSegmentReference_ = initSegmentReference;
-    /** @private {shaka.extern.aes128Key|undefined} */
-    this.aes128Key_ = aes128Key;
+    /** @private {shaka.extern.aesKey|undefined} */
+    this.aesKey_ = aesKey;
     /** @private {number} */
     this.segmentSequenceCadence_ = segmentSequenceCadence;
 
@@ -885,7 +890,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
             /* tileDuration= */ null,
             /* syncTime= */ null,
             shaka.media.SegmentReference.Status.AVAILABLE,
-            this.aes128Key_);
+            this.aesKey_);
         partial.codecs = codecs;
         partial.mimeType = mimeType;
         if (this.segmentSequenceCadence_ == 0) {
@@ -929,7 +934,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
           /* tileDuration= */ null,
           /* syncTime= */ null,
           shaka.media.SegmentReference.Status.AVAILABLE,
-          this.aes128Key_,
+          this.aesKey_,
           /* allPartialSegments= */ range.partialSegments > 0);
       ref.codecs = codecs;
       ref.mimeType = mimeType;