shaka-player 3.3.2 → 4.0.0

package/lib/media/streaming_engine.js

@@ -234,7 +234,8 @@ shaka.media.StreamingEngine = class {
 
     const mimeType = shaka.util.MimeUtils.getFullType(
         stream.mimeType, stream.codecs);
-    this.playerInterface_.mediaSourceEngine.reinitText(mimeType);
+    this.playerInterface_.mediaSourceEngine.reinitText(
+        mimeType, this.manifest_.sequenceMode);
 
     const textDisplayer =
         this.playerInterface_.mediaSourceEngine.getTextDisplayer();
@@ -428,7 +429,8 @@ shaka.media.StreamingEngine = class {
       // init segment again.
       const fullMimeType = shaka.util.MimeUtils.getFullType(
           stream.mimeType, stream.codecs);
-      this.playerInterface_.mediaSourceEngine.reinitText(fullMimeType);
+      this.playerInterface_.mediaSourceEngine.reinitText(
+          fullMimeType, this.manifest_.sequenceMode);
     }
 
     // Releases the segmentIndex of the old stream.
@@ -604,11 +606,10 @@ shaka.media.StreamingEngine = class {
    */
   seeked() {
     const presentationTime = this.playerInterface_.getPresentationTime();
-    const smallGapLimit = this.config_.smallGapLimit;
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     const newTimeIsBuffered = (type) => {
       return this.playerInterface_.mediaSourceEngine.isBuffered(
-          type, presentationTime, smallGapLimit);
+          type, presentationTime);
     };
 
     let streamCleared = false;
@@ -645,6 +646,10 @@ shaka.media.StreamingEngine = class {
         if (type === ContentType.TEXT) {
           this.playerInterface_.mediaSourceEngine.resetCaptionParser();
         }
+
+        // Mark the media state as having seeked, so that the new buffers know
+        // that they will need to be at a new position (for sequence mode).
+        mediaState.seeked = true;
       }
     }
 
@@ -674,7 +679,7 @@ shaka.media.StreamingEngine = class {
 
     if (mediaState.waitingToClearBuffer) {
       // May not be performing an update, but an update will still happen.
-      // See: https://github.com/google/shaka-player/issues/334
+      // See: https://github.com/shaka-project/shaka-player/issues/334
       shaka.log.debug(logPrefix, 'clear: already waiting');
       return;
     }
@@ -764,7 +769,9 @@ shaka.media.StreamingEngine = class {
     const mediaSourceEngine = this.playerInterface_.mediaSourceEngine;
     const forceTransmuxTS = this.config_.forceTransmuxTS;
 
-    await mediaSourceEngine.init(streamsByType, forceTransmuxTS);
+
+    await mediaSourceEngine.init(streamsByType, forceTransmuxTS,
+        this.manifest_.sequenceMode);
     this.destroyer_.ensureNotDestroyed();
 
     this.setDuration_();
@@ -805,6 +812,9 @@ shaka.media.StreamingEngine = class {
       clearBufferSafeMargin: 0,
       waitingToFlushBuffer: false,
       clearingBuffer: false,
+      // The playhead might be seeking on startup, if a start time is set, so
+      // start "seeked" as true.
+      seeked: true,
       recovering: false,
       hasError: false,
       operation: null,
@@ -920,9 +930,9 @@ shaka.media.StreamingEngine = class {
       // buffering forever at the end.
       // We should only do this if the duration needs to shrink.
       // Growing it by less than 1ms can actually cause buffering on
-      // replay, as in https://github.com/google/shaka-player/issues/979
+      // replay, as in https://github.com/shaka-project/shaka-player/issues/979
       // On some platforms, this can spuriously be 0, so ignore this case.
-      // https://github.com/google/shaka-player/issues/1967,
+      // https://github.com/shaka-project/shaka-player/issues/1967,
       const duration = this.playerInterface_.mediaSourceEngine.getDuration();
       if (duration != 0 &&
           duration < this.manifest_.presentationTimeline.getDuration()) {
@@ -1272,6 +1282,7 @@ shaka.media.StreamingEngine = class {
           this.scheduleUpdate_(mediaState, 0);
           return;
         }
+
         await this.append_(
             mediaState, presentationTime, stream, reference, result);
       }
@@ -1508,7 +1519,7 @@ shaka.media.StreamingEngine = class {
 
           await this.playerInterface_.mediaSourceEngine.setStreamProperties(
               mediaState.type, timestampOffset, appendWindowStart,
-              appendWindowEnd);
+              appendWindowEnd, this.manifest_.sequenceMode);
         } catch (error) {
           mediaState.lastAppendWindowStart = null;
           mediaState.lastAppendWindowEnd = null;
@@ -1565,8 +1576,7 @@ shaka.media.StreamingEngine = class {
    * @return {!Promise}
    * @private
    */
-  async append_(mediaState, presentationTime, stream, reference,
-      segment) {
+  async append_(mediaState, presentationTime, stream, reference, segment) {
     const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
 
     const hasClosedCaptions = stream.closedCaptions &&
@@ -1584,14 +1594,19 @@ shaka.media.StreamingEngine = class {
 
     await this.evict_(mediaState, presentationTime);
     this.destroyer_.ensureNotDestroyed();
-    shaka.log.v1(logPrefix, 'appending media segment');
+    shaka.log.v1(logPrefix, 'appending media segment at',
+        (reference.syncTime == null ? 'unknown' : reference.syncTime));
 
+    const seeked = mediaState.seeked;
+    mediaState.seeked = false;
     await this.playerInterface_.mediaSourceEngine.appendBuffer(
         mediaState.type,
         segment,
-        reference.startTime,
+        reference.syncTime == null ? reference.startTime : reference.syncTime,
         reference.endTime,
-        hasClosedCaptions);
+        hasClosedCaptions,
+        seeked,
+        this.manifest_.sequenceMode);
     this.destroyer_.ensureNotDestroyed();
     shaka.log.v2(logPrefix, 'appended media segment');
   }
@@ -1718,7 +1733,7 @@ shaka.media.StreamingEngine = class {
     const bufferedBehind = presentationTime - startTime;
 
     const overflow = bufferedBehind - bufferBehind;
-    // See: https://github.com/google/shaka-player/issues/2982
+    // See: https://github.com/shaka-project/shaka-player/issues/2982
     if (overflow <= 0.01) {
       shaka.log.v2(logPrefix,
           'buffer behind okay:',
@@ -2017,6 +2032,7 @@ shaka.media.StreamingEngine.PlayerInterface;
  *   waitingToFlushBuffer: boolean,
  *   clearBufferSafeMargin: number,
  *   clearingBuffer: boolean,
+ *   seeked: boolean,
  *   recovering: boolean,
  *   hasError: boolean,
  *   operation: shaka.net.NetworkingEngine.PendingRequest
@@ -2061,6 +2077,8 @@ shaka.media.StreamingEngine.PlayerInterface;
  *   The amount of buffer to retain when clearing the buffer after the update.
  * @property {boolean} clearingBuffer
  *   True indicates that the buffer is being cleared.
+  * @property {boolean} seeked
+ *   True indicates that the presentation just seeked.
  * @property {boolean} recovering
  *   True indicates that the last segment was not appended because it could not
  *   fit in the buffer.
@@ -2079,7 +2097,7 @@ shaka.media.StreamingEngine.MediaState_;
  * of the Period.
  *
  * NOTE: This was increased as part of the solution to
- * https://github.com/google/shaka-player/issues/1281
+ * https://github.com/shaka-project/shaka-player/issues/1281
  *
  * @const {number}
  * @private
@@ -2093,7 +2111,7 @@ shaka.media.StreamingEngine.APPEND_WINDOW_START_FUDGE_ = 0.1;
  * the Period.  This rounding error could then create an artificial gap and a
  * stutter when the gap-jumping logic takes over.
  *
- * https://github.com/google/shaka-player/issues/1597
+ * https://github.com/shaka-project/shaka-player/issues/1597
  *
  * @const {number}
  * @private

package/lib/media/time_ranges_utils.js

@@ -6,8 +6,6 @@
 
 goog.provide('shaka.media.TimeRangesUtils');
 
-goog.require('shaka.util.Iterables');
-
 
 /**
  * @summary A set of utility functions for dealing with TimeRanges objects.
@@ -56,17 +54,13 @@ shaka.media.TimeRangesUtils = class {
 
 
   /**
-   * Determines if the given time is inside a buffered range.  This includes
-   * gaps, meaning that if the playhead is in a gap, it is considered buffered.
-   * If there is a small gap between the playhead and buffer start, consider it
-   * as buffered.
+   * Determines if the given time is inside a buffered range.
    *
    * @param {TimeRanges} b
    * @param {number} time Playhead time
-   * @param {number=} smallGapLimit Set in configuration
    * @return {boolean}
    */
-  static isBuffered(b, time, smallGapLimit = 0) {
+  static isBuffered(b, time) {
     if (!b || !b.length) {
       return false;
     }
@@ -78,9 +72,8 @@ shaka.media.TimeRangesUtils = class {
     if (time > b.end(b.length - 1)) {
       return false;
     }
-    // Push the time forward by the gap limit so that it is more likely to be in
-    // the range.
-    return (time + smallGapLimit >= b.start(0));
+
+    return time >= b.start(0);
   }
 
 
@@ -157,7 +150,7 @@ shaka.media.TimeRangesUtils = class {
       return [];
     }
     const ret = [];
-    for (const i of shaka.util.Iterables.range(b.length)) {
+    for (let i = 0; i < b.length; i++) {
       ret.push({start: b.start(i), end: b.end(i)});
     }
     return ret;

package/lib/media/video_wrapper.js

@@ -141,7 +141,7 @@ shaka.media.VideoWrapper = class {
     // TODO: Need further investigation why it happens. Before and after
     // setting the current time, video.readyState is 1, video.paused is true,
     // and video.buffered's TimeRanges length is 0.
-    // See: https://github.com/google/shaka-player/issues/1298
+    // See: https://github.com/shaka-project/shaka-player/issues/1298
     this.mover_.moveTo(
         this.video_.currentTime == 0 ?
         startTime :

package/lib/net/networking_engine.js

@@ -220,6 +220,9 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
       retryParameters: retryParams,
       licenseRequestType: null,
       sessionId: null,
+      drmInfo: null,
+      initData: null,
+      initDataType: null,
       streamDataCallback: streamDataCallback,
     };
   }
@@ -431,7 +434,7 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
     }
 
     // Schemes are meant to be case-insensitive.
-    // See https://github.com/google/shaka-player/issues/2173
+    // See https://github.com/shaka-project/shaka-player/issues/2173
     // and https://tools.ietf.org/html/rfc3986#section-3.1
     scheme = scheme.toLowerCase();
 

package/lib/offline/indexeddb/v1_storage_cell.js

@@ -99,6 +99,7 @@ shaka.offline.indexeddb.V1StorageCell = class
       sessionIds: old.sessionIds,
       drmInfo: old.drmInfo,
       appMetadata: old.appMetadata,
+      sequenceMode: false,
     };
   }
 

package/lib/offline/indexeddb/v2_storage_cell.js

@@ -60,6 +60,7 @@ shaka.offline.indexeddb.V2StorageCell = class
       sessionIds: old.sessionIds,
       size: old.size,
       streams,
+      sequenceMode: false,
     };
   }
 

package/lib/offline/manifest_converter.js

@@ -87,6 +87,7 @@ shaka.offline.ManifestConverter = class {
       variants: Array.from(variants.values()),
       textStreams: textStreams,
       imageStreams: imageStreams,
+      sequenceMode: manifestDB.sequenceMode || false,
     };
   }