shaka-player 4.11.20 → 4.11.21

package/externs/shaka/player.js

@@ -1374,7 +1374,8 @@ shaka.extern.MssManifestConfiguration;
  * @property {number} defaultPresentationDelay
  *   For DASH, it's a default <code>presentationDelay</code> value if
  *   <code>suggestedPresentationDelay</code> is missing in the MPEG DASH
- *   manifest. The default value is <code>1.5 * minBufferTime</code> if not
+ *   manifest. The default value is the lower of <code>1.5 *
+ *   minBufferTime</code> and <code>segmentAvailabilityDuration</code> if not
  *   configured or set as 0.
  *   For HLS, the default value is 3 segments duration if not configured or
  *   set as 0.

package/lib/cea/cea708_service.js

@@ -169,24 +169,16 @@ shaka.cea.Cea708Service = class {
       const firstByte = dtvccPacket.readByte().value;
       const secondByte = dtvccPacket.readByte().value;
 
-      const isTextBlock = (b) => {
-        return (b >= 0x20 && b <= 0x7f) || (b >= 0xa0 && b <= 0xff);
+      const toHexString = (byteArray) => {
+        return byteArray.map((byte) => {
+          return ('0' + (byte & 0xFF).toString(16)).slice(-2);
+        }).join('');
       };
-
-      if (isTextBlock(firstByte) && isTextBlock(secondByte)) {
-        const toHexString = (byteArray) => {
-          return byteArray.map((byte) => {
-            return ('0' + (byte & 0xFF).toString(16)).slice(-2);
-          }).join('');
-        };
-        const unicode = toHexString([firstByte, secondByte]);
-        // Takes a unicode hex string and creates a single character.
-        const char = String.fromCharCode(parseInt(unicode, 16));
-        this.currentWindow_.setCharacter(char);
-        return null;
-      } else {
-        dtvccPacket.rewind(2);
-      }
+      const unicode = toHexString([firstByte, secondByte]);
+      // Takes a unicode hex string and creates a single character.
+      const char = String.fromCharCode(parseInt(unicode, 16));
+      this.currentWindow_.setCharacter(char);
+      return null;
     }
 
     const window = this.currentWindow_;

package/lib/dash/dash_parser.js

@@ -709,18 +709,28 @@ shaka.dash.DashParser = class {
       // feasible choices for the value.  Nothing older than
       // timeShiftBufferDepth is still available, and anything less than
       // minBufferTime will cause buffering issues.
-      //
-      // We have decided that our default will be the configured value, or
-      // 1.5 * minBufferTime if not configured. This is fairly conservative.
-      // Content providers should provide a suggestedPresentationDelay whenever
-      // possible to optimize the live streaming experience.
-      const defaultPresentationDelay =
-          this.config_.defaultPresentationDelay || minBufferTime * 1.5;
-      const presentationDelay = suggestedPresentationDelay != null ?
-          suggestedPresentationDelay : defaultPresentationDelay;
+      let delay = 0;
+      if (suggestedPresentationDelay != null) {
+        // 1. If a suggestedPresentationDelay is provided by the manifest, that
+        // will be used preferentially.
+        // This is given a minimum bound of segmentAvailabilityDuration.
+        // Content providers should provide a suggestedPresentationDelay
+        // whenever possible to optimize the live streaming experience.
+        delay = Math.min(
+            suggestedPresentationDelay,
+            segmentAvailabilityDuration || Infinity);
+      } else if (this.config_.defaultPresentationDelay > 0) {
+        // 2. If the developer provides a value for
+        // "manifest.defaultPresentationDelay", that is used as a fallback.
+        delay = this.config_.defaultPresentationDelay;
+      } else {
+        // 3. Otherwise, we default to the lower of segmentAvailabilityDuration
+        // and 1.5 * minBufferTime. This is fairly conservative.
+        delay = Math.min(
+            minBufferTime * 1.5, segmentAvailabilityDuration || Infinity);
+      }
       presentationTimeline = new shaka.media.PresentationTimeline(
-          presentationStartTime, presentationDelay,
-          this.config_.dash.autoCorrectDrift);
+          presentationStartTime, delay, this.config_.dash.autoCorrectDrift);
     }
 
     presentationTimeline.setStatic(mpdType == 'static');

package/lib/dash/segment_template.js

@@ -131,24 +131,6 @@ shaka.dash.SegmentTemplate = class {
 
       shaka.log.debug(`New manifest ${periodStart} - ${periodEnd}`);
 
-      /* When to fit segments.  All refactors should honor/update this table:
-       *
-       * | dynamic | infinite | last   | should | notes                     |
-       * |         | period   | period | fit    |                           |
-       * | ------- | -------- | ------ | ------ | ------------------------- |
-       * |     F   |     F    |    X   |    T   | typical VOD               |
-       * |     F   |     T    |    X   |    X   | impossible: infinite VOD  |
-       * |     T   |     F    |    F   |    T   | typical live, old period  |
-       * |     T   |     F    |    T   |    F   | typical IPR               |
-       * |     T   |     T    |    F   |    X   | impossible: old, infinite |
-       * |     T   |     T    |    T   |    F   | typical live, new period  |
-       */
-
-      // We never fit the final period of dynamic content, which could be
-      // infinite live (with no limit to fit to) or IPR (which would expand the
-      // most recent segment to the end of the presentation).
-      const shouldFit = !(context.dynamic && context.periodInfo.isLastPeriod);
-
       if (!segmentIndex) {
         shaka.log.debug(`Creating TSI with end ${periodEnd}`);
         segmentIndex = new TimelineSegmentIndex(
@@ -160,14 +142,13 @@ shaka.dash.SegmentTemplate = class {
             periodStart,
             periodEnd,
             initSegmentReference,
-            shouldFit,
             aesKey,
             context.representation.segmentSequenceCadence,
         );
       } else {
         const tsi = /** @type {!TimelineSegmentIndex} */(segmentIndex);
         tsi.appendTemplateInfo(
-            info, periodStart, periodEnd, shouldFit, initSegmentReference);
+            info, periodStart, periodEnd, initSegmentReference);
 
         const availabilityStart =
           context.presentationTimeline.getSegmentAvailabilityStart();
@@ -177,7 +158,9 @@ shaka.dash.SegmentTemplate = class {
       if (info.timeline &&
           context.adaptationSet.contentType !== 'image' &&
           context.adaptationSet.contentType !== 'text') {
-        const timeline = info.timeline;
+        const tsi = /** @type {!TimelineSegmentIndex} */(segmentIndex);
+        // getTimeline is the info.timeline but fitted to the period.
+        const timeline = tsi.getTimeline();
         context.presentationTimeline.notifyTimeRange(
             timeline,
             periodStart);
@@ -195,7 +178,7 @@ shaka.dash.SegmentTemplate = class {
           if (segmentIndex instanceof shaka.dash.TimelineSegmentIndex &&
               segmentIndex.isEmpty()) {
             segmentIndex.appendTemplateInfo(info, periodStart,
-                periodEnd, shouldFit, initSegmentReference);
+                periodEnd, initSegmentReference);
           }
           return Promise.resolve(segmentIndex);
         },
@@ -744,40 +727,45 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
    * @param {number} periodStart
    * @param {number} periodEnd
    * @param {shaka.media.InitSegmentReference} initSegmentReference
-   * @param {boolean} shouldFit
    * @param {shaka.extern.aesKey|undefined} aesKey
    * @param {number} segmentSequenceCadence
   */
   constructor(templateInfo, representationId, bandwidth, getBaseUris,
-      urlParams, periodStart, periodEnd, initSegmentReference, shouldFit,
+      urlParams, periodStart, periodEnd, initSegmentReference,
       aesKey, segmentSequenceCadence) {
     super([]);
 
     /** @private {?shaka.dash.SegmentTemplate.SegmentTemplateInfo} */
     this.templateInfo_ = templateInfo;
+
     /** @private {?string} */
     this.representationId_ = representationId;
+
     /** @private {number} */
     this.bandwidth_ = bandwidth;
+
     /** @private {function():Array.<string>} */
     this.getBaseUris_ = getBaseUris;
+
     /** @private {function():string} */
     this.urlParams_ = urlParams;
+
     /** @private {number} */
     this.periodStart_ = periodStart;
+
     /** @private {number} */
     this.periodEnd_ = periodEnd;
+
     /** @private {shaka.media.InitSegmentReference} */
     this.initSegmentReference_ = initSegmentReference;
+
     /** @private {shaka.extern.aesKey|undefined} */
     this.aesKey_ = aesKey;
+
     /** @private {number} */
     this.segmentSequenceCadence_ = segmentSequenceCadence;
 
-
-    if (shouldFit) {
-      this.fitTimeline();
-    }
+    this.fitTimeline();
   }
 
   /**
@@ -845,11 +833,9 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
    * @param {shaka.dash.SegmentTemplate.SegmentTemplateInfo} info
    * @param {number} periodStart
    * @param {number} periodEnd
-   * @param {boolean} shouldFit
    * @param {shaka.media.InitSegmentReference} initSegmentReference
    */
-  appendTemplateInfo(info, periodStart, periodEnd, shouldFit,
-      initSegmentReference) {
+  appendTemplateInfo(info, periodStart, periodEnd, initSegmentReference) {
     this.updateInitSegmentReference(initSegmentReference);
     if (!this.templateInfo_) {
       this.templateInfo_ = info;
@@ -883,9 +869,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
       }
     }
 
-    if (shouldFit) {
-      this.fitTimeline();
-    }
+    this.fitTimeline();
   }
 
   /**
@@ -930,14 +914,19 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
       return;
     }
     const timeline = this.templateInfo_.timeline;
-    while (timeline.length) {
-      const lastTimePeriod = timeline[timeline.length - 1];
-      if (lastTimePeriod.start >= this.periodEnd_) {
-        timeline.pop();
+    goog.asserts.assert(timeline, 'Timeline should be non-null!');
+    const newTimeline = [];
+    for (const range of timeline) {
+      if (range.start >= this.periodEnd_) {
+        // Starts after end of period.
+      } else if (range.end <= 0) {
+        // Ends before start of period.
       } else {
-        break;
+        // Usable.
+        newTimeline.push(range);
       }
     }
+    this.templateInfo_.timeline = newTimeline;
 
     this.evict(this.periodStart_);
 
@@ -947,6 +936,19 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     // find/get() methods whenever possible.
   }
 
+  /**
+   * Get the current timeline
+   * @return {!Array<shaka.media.PresentationTimeline.TimeRange>}
+   */
+  getTimeline() {
+    if (!this.templateInfo_) {
+      return [];
+    }
+    const timeline = this.templateInfo_.timeline;
+    goog.asserts.assert(timeline, 'Timeline should be non-null!');
+    return timeline;
+  }
+
   /**
    * @override
    */

package/lib/media/gap_jumping_controller.js

@@ -53,6 +53,9 @@ shaka.media.GapJumpingController = class {
     /** @private {shaka.util.EventManager} */
     this.eventManager_ = new shaka.util.EventManager();
 
+    /** @private {boolean} */
+    this.started_ = false;
+
     /** @private {boolean} */
     this.seekingEventReceived_ = false;
 
@@ -90,7 +93,7 @@ shaka.media.GapJumpingController = class {
      */
     this.gapJumpTimer_ = new shaka.util.Timer(() => {
       this.onPollGapJump_();
-    }).tickEvery(this.config_.gapJumpTimerTime);
+    });
   }
 
 
@@ -134,16 +137,22 @@ shaka.media.GapJumpingController = class {
    * @param {number} startTime
    */
   onStarted(startTime) {
+    this.started_ = true;
     if (this.video_.seeking && !this.seekingEventReceived_) {
       this.seekingEventReceived_ = true;
       this.startTime_ = startTime;
     }
+    if (this.gapJumpTimer_) {
+      this.gapJumpTimer_.tickEvery(this.config_.gapJumpTimerTime);
+    }
+    this.onPollGapJump_();
   }
 
   /** Called when a seek has started. */
   onSeeking() {
     this.seekingEventReceived_ = true;
     this.hadSegmentAppended_ = false;
+    this.onPollGapJump_();
   }
 
 
@@ -167,6 +176,10 @@ shaka.media.GapJumpingController = class {
     if (this.video_.readyState == 0) {
       return;
     }
+    // Don't gap jump before playback started
+    if (!this.started_) {
+      return;
+    }
     // Do not gap jump if seeking has begun, but the seeking event has not
     // yet fired for this particular seek.
     if (this.video_.seeking) {

package/lib/media/media_source_engine.js

@@ -1301,20 +1301,24 @@ shaka.media.MediaSourceEngine = class {
             null));
       }
     }
-    operations.push(this.enqueueOperation_(
-        contentType,
-        () => this.setAppendWindow_(
-            contentType, appendWindowStart, appendWindowEnd),
-        null));
-    if (this.needSplitMuxedContent_) {
+    if (appendWindowStart != 0 || appendWindowEnd != Infinity) {
       operations.push(this.enqueueOperation_(
-          ContentType.AUDIO,
+          contentType,
           () => this.setAppendWindow_(
-              ContentType.AUDIO, appendWindowStart, appendWindowEnd),
+              contentType, appendWindowStart, appendWindowEnd),
           null));
+      if (this.needSplitMuxedContent_) {
+        operations.push(this.enqueueOperation_(
+            ContentType.AUDIO,
+            () => this.setAppendWindow_(
+                ContentType.AUDIO, appendWindowStart, appendWindowEnd),
+            null));
+      }
     }
 
-    await Promise.all(operations);
+    if (operations.length) {
+      await Promise.all(operations);
+    }
   }
 
   /**

package/lib/player.js

@@ -8153,7 +8153,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat, max-len
-shaka.Player.version = 'v4.11.20' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.11.21' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.11.20",
+  "version": "4.11.21",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [