shaka-player 4.10.13 → 4.11.0

package/lib/media/drm_engine.js

@@ -142,6 +142,9 @@ shaka.media.DrmEngine = class {
 
     /** @private {?shaka.extern.InitDataOverride} */
     this.manifestInitData_ = null;
+
+    /** @private {function():boolean} */
+    this.isPreload_ = () => false;
   }
 
   /** @override */
@@ -213,9 +216,13 @@ shaka.media.DrmEngine = class {
    * Must be called at least once before init().
    *
    * @param {shaka.extern.DrmConfiguration} config
+   * @param {(function():boolean)=} isPreload
    */
-  configure(config) {
+  configure(config, isPreload) {
     this.config_ = config;
+    if (isPreload) {
+      this.isPreload_ = isPreload;
+    }
     if (this.expirationTimer_) {
       this.expirationTimer_.tickEvery(
           /* seconds= */ this.config_.updateExpirationTime);
@@ -584,7 +591,7 @@ shaka.media.DrmEngine = class {
       try {
         const operation = this.playerInterface_.netEngine.request(
             shaka.net.NetworkingEngine.RequestType.SERVER_CERTIFICATE,
-            request);
+            request, {isPreload: this.isPreload_()});
         const response = await operation.promise;
 
         this.currentDrmInfo_.serverCertificate =
@@ -1489,7 +1496,8 @@ shaka.media.DrmEngine = class {
 
     let response;
     try {
-      const req = this.playerInterface_.netEngine.request(requestType, request);
+      const req = this.playerInterface_.netEngine.request(
+          requestType, request, {isPreload: this.isPreload_()});
       response = await req.promise;
     } catch (error) {
       if (this.destroyer_.destroyed()) {

package/lib/media/media_source_engine.js

@@ -407,9 +407,6 @@ shaka.media.MediaSourceEngine = class {
     if (this.textEngine_) {
       cleanup.push(this.textEngine_.destroy());
     }
-    if (this.textDisplayer_) {
-      cleanup.push(this.textDisplayer_.destroy());
-    }
 
     for (const contentType in this.transmuxers_) {
       cleanup.push(this.transmuxers_[contentType].destroy());
@@ -1748,12 +1745,7 @@ shaka.media.MediaSourceEngine = class {
    * @param {!shaka.extern.TextDisplayer} textDisplayer
    */
   setTextDisplayer(textDisplayer) {
-    const oldTextDisplayer = this.textDisplayer_;
     this.textDisplayer_ = textDisplayer;
-    if (oldTextDisplayer) {
-      textDisplayer.setTextVisibility(oldTextDisplayer.isTextVisible());
-      oldTextDisplayer.destroy();
-    }
     if (this.textEngine_) {
       this.textEngine_.setDisplayer(textDisplayer);
     }

package/lib/media/preload_manager.js

@@ -153,6 +153,17 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
 
     /** @private {?Array.<function()>} */
     this.latePhaseQueuedOperations_ = [];
+
+    /** @private {boolean} */
+    this.isPreload_ = true;
+  }
+
+  /**
+   * Makes it so that net requests launched from this load will no longer be
+   * marked as "isPreload"
+   */
+  markIsLoad() {
+    this.isPreload_ = false;
   }
 
   /**
@@ -478,7 +489,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
       goog.asserts.assert(this.parserFactory_, 'Must have manifest parser');
       this.parser_ = this.parserFactory_();
 
-      this.parser_.configure(this.config_.manifest);
+      this.parser_.configure(this.config_.manifest, () => this.isPreload_);
     }
 
     const startTime = Date.now() / 1000;
@@ -530,7 +541,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     this.drmEngine_ = this.createDrmEngine_();
     this.manifestFilterer_.setDrmEngine(this.drmEngine_);
 
-    this.drmEngine_.configure(this.config_.drm);
+    this.drmEngine_.configure(this.config_.drm, () => this.isPreload_);
 
     const tracksChangedInitial = this.manifestFilterer_.applyRestrictions(
         this.manifest_);
@@ -660,7 +671,8 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
         prefetchLimit, stream, (reference, stream, streamDataCallback) => {
           return shaka.media.StreamingEngine.dispatchFetch(
               reference, stream, streamDataCallback || null,
-              this.config_.streaming.retryParameters, this.networkingEngine_);
+              this.config_.streaming.retryParameters, this.networkingEngine_,
+              this.isPreload_);
         }, /* reverse= */ false);
     this.segmentPrefetchById_.set(stream.id, prefetch);
 
@@ -674,7 +686,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     if (!prefetchSegment) {
       // If we can't get a segment at the desired spot, at least get a segment,
       // so we can get the init segment.
-      prefetchSegment = stream.segmentIndex.get(0);
+      prefetchSegment = stream.segmentIndex.earliestReference();
     }
     if (prefetchSegment) {
       if (isLive) {

package/lib/media/segment_reference.js

@@ -321,6 +321,9 @@ shaka.media.SegmentReference = class {
     /** @type {?string} */
     this.mimeType = null;
 
+    /** @type {?number} */
+    this.bandwidth = null;
+
     /** @type {BufferSource|null} */
     this.segmentData = null;
   }

package/lib/media/segment_utils.js

@@ -42,6 +42,7 @@ shaka.media.SegmentUtils = class {
       closedCaptions: new Map(),
       videoRange: null,
       colorGamut: null,
+      frameRate: null,
     };
   }
 
@@ -127,6 +128,7 @@ shaka.media.SegmentUtils = class {
       closedCaptions: closedCaptions,
       videoRange: null,
       colorGamut: null,
+      frameRate: videoInfo.frameRate,
     };
   }
 
@@ -204,6 +206,8 @@ shaka.media.SegmentUtils = class {
     let realVideoRange = null;
     /** @type {?string} */
     let realColorGamut = null;
+    /** @type {?string} */
+    const realFrameRate = null;
 
     /** @type {?string} */
     let baseBox;
@@ -432,6 +436,7 @@ shaka.media.SegmentUtils = class {
       closedCaptions: closedCaptions,
       videoRange: realVideoRange,
       colorGamut: realColorGamut,
+      frameRate: realFrameRate,
     };
   }
 
@@ -594,7 +599,8 @@ shaka.media.SegmentUtils = class {
  *   sampleRate: ?number,
  *   closedCaptions: Map.<string, string>,
  *   videoRange: ?string,
- *   colorGamut: ?string
+ *   colorGamut: ?string,
+ *   frameRate: ?string
  * }}
  *
  * @property {string} type
@@ -608,5 +614,6 @@ shaka.media.SegmentUtils = class {
  * @property {Map.<string, string>} closedCaptions
  * @property {?string} videoRange
  * @property {?string} colorGamut
+ * @property {?string} frameRate
  */
 shaka.media.SegmentUtils.BasicInfo;

package/lib/media/streaming_engine.js

@@ -1965,8 +1965,8 @@ shaka.media.StreamingEngine = class {
         reference.startTime <= appendWindowEnd,
         logPrefix + ' segment should start before append window end');
 
-    const codecs = MimeUtils.getCodecBase(
-        reference.codecs || mediaState.stream.codecs);
+    const fullCodecs = (reference.codecs || mediaState.stream.codecs);
+    const codecs = MimeUtils.getCodecBase(fullCodecs);
     const mimeType = MimeUtils.getBasicType(
         reference.mimeType || mediaState.stream.mimeType);
     const timestampOffset = reference.timestampOffset;
@@ -1984,7 +1984,7 @@ shaka.media.StreamingEngine = class {
       const isResetMediaSourceNecessary =
           mediaState.lastCodecs && mediaState.lastMimeType &&
           this.playerInterface_.mediaSourceEngine.isResetMediaSourceNecessary(
-              mediaState.type, mediaState.stream, mimeType, codecs);
+              mediaState.type, mediaState.stream, mimeType, fullCodecs);
       if (isResetMediaSourceNecessary) {
         let otherState = null;
         if (mediaState.type === ContentType.VIDEO) {
@@ -2616,11 +2616,12 @@ shaka.media.StreamingEngine = class {
    * @param {(!shaka.media.InitSegmentReference|!shaka.media.SegmentReference)}
    *   reference
    * @param {?function(BufferSource):!Promise=} streamDataCallback
+   * @param {boolean=} isPreload
    *
    * @return {!shaka.net.NetworkingEngine.PendingRequest}
    * @private
    */
-  dispatchFetch_(reference, stream, streamDataCallback) {
+  dispatchFetch_(reference, stream, streamDataCallback, isPreload = false) {
     goog.asserts.assert(
         this.playerInterface_.netEngine, 'Must have net engine');
     return shaka.media.StreamingEngine.dispatchFetch(
@@ -2637,11 +2638,13 @@ shaka.media.StreamingEngine = class {
    * @param {?function(BufferSource):!Promise} streamDataCallback
    * @param {shaka.extern.RetryParameters} retryParameters
    * @param {!shaka.net.NetworkingEngine} netEngine
+   * @param {boolean=} isPreload
    *
    * @return {!shaka.net.NetworkingEngine.PendingRequest}
    */
   static dispatchFetch(
-      reference, stream, streamDataCallback, retryParameters, netEngine) {
+      reference, stream, streamDataCallback, retryParameters, netEngine,
+      isPreload = false) {
     const requestType = shaka.net.NetworkingEngine.RequestType.SEGMENT;
     const segment = reference instanceof shaka.media.SegmentReference ?
         reference : undefined;
@@ -2658,7 +2661,8 @@ shaka.media.StreamingEngine = class {
 
     shaka.log.v2('fetching: reference=', reference);
 
-    return netEngine.request(requestType, request, {type, stream, segment});
+    return netEngine.request(
+        requestType, request, {type, stream, segment, isPreload});
   }
 
   /**

package/lib/mss/mss_parser.js

@@ -82,17 +82,25 @@ shaka.mss.MssParser = class {
      * @private {!Map.<number, !BufferSource>}
      */
     this.initSegmentDataByStreamId_ = new Map();
+
+    /** @private {function():boolean} */
+    this.isPreloadFn_ = () => false;
   }
 
   /**
+   * @param {shaka.extern.ManifestConfiguration} config
+   * @param {(function():boolean)=} isPreloadFn
    * @override
    * @exportInterface
    */
-  configure(config) {
+  configure(config, isPreloadFn) {
     goog.asserts.assert(config.mss != null,
         'MssManifestConfiguration should not be null!');
 
     this.config_ = config;
+    if (isPreloadFn) {
+      this.isPreloadFn_ = isPreloadFn;
+    }
   }
 
   /**
@@ -252,7 +260,10 @@ shaka.mss.MssParser = class {
     const networkingEngine = this.playerInterface_.networkingEngine;
 
     const startTime = Date.now();
-    const operation = networkingEngine.request(requestType, request, {type});
+    const operation = networkingEngine.request(requestType, request, {
+      type,
+      isPreload: this.isPreloadFn_(),
+    });
     this.operationManager_.manage(operation);
 
     const response = await operation.promise;
@@ -429,6 +440,7 @@ shaka.mss.MssParser = class {
         periodCount: 1,
         gapCount: 0,
         isLowLatency: false,
+        startTime: null,
       };
 
       // This is the first point where we have a meaningful presentation start

package/lib/net/http_fetch_plugin.js

@@ -29,10 +29,12 @@ shaka.net.HttpFetchPlugin = class {
    *   progress event happened.
    * @param {shaka.extern.HeadersReceived} headersReceived Called when the
    *   headers for the download are received, but before the body is.
+   * @param {shaka.extern.SchemePluginConfig} config
    * @return {!shaka.extern.IAbortableOperation.<shaka.extern.Response>}
    * @export
    */
-  static parse(uri, request, requestType, progressUpdated, headersReceived) {
+  static parse(uri, request, requestType, progressUpdated, headersReceived,
+      config) {
     const headers = new shaka.net.HttpFetchPlugin.Headers_();
     shaka.util.MapUtils.asMap(request.headers).forEach((value, key) => {
       headers.append(key, value);
@@ -56,9 +58,11 @@ shaka.net.HttpFetchPlugin = class {
       timedOut: false,
     };
 
+    const minBytes = config.minBytesForProgressEvents || 0;
+
     const pendingRequest = shaka.net.HttpFetchPlugin.request_(
         uri, requestType, init, abortStatus, progressUpdated, headersReceived,
-        request.streamDataCallback);
+        request.streamDataCallback, minBytes);
 
     /** @type {!shaka.util.AbortableOperation} */
     const op = new shaka.util.AbortableOperation(pendingRequest, () => {
@@ -96,11 +100,12 @@ shaka.net.HttpFetchPlugin = class {
    * @param {shaka.extern.ProgressUpdated} progressUpdated
    * @param {shaka.extern.HeadersReceived} headersReceived
    * @param {?function(BufferSource):!Promise} streamDataCallback
+   * @param {number} minBytes
    * @return {!Promise<!shaka.extern.Response>}
    * @private
    */
   static async request_(uri, requestType, init, abortStatus, progressUpdated,
-      headersReceived, streamDataCallback) {
+      headersReceived, streamDataCallback, minBytes) {
     const fetch = shaka.net.HttpFetchPlugin.fetch_;
     const ReadableStream = shaka.net.HttpFetchPlugin.ReadableStream_;
     let response;
@@ -163,13 +168,15 @@ shaka.net.HttpFetchPlugin = class {
             }
 
             const currentTime = Date.now();
+            const chunkSize = loaded - lastLoaded;
             // If the time between last time and this time we got progress event
             // is long enough, or if a whole segment is downloaded, call
             // progressUpdated().
-            if (currentTime - lastTime > 100 || readObj.done) {
+            if ((currentTime - lastTime > 100 && chunkSize >= minBytes) ||
+                readObj.done) {
               const numBytesRemaining =
                   readObj.done ? 0 : contentLength - loaded;
-              progressUpdated(currentTime - lastTime, loaded - lastLoaded,
+              progressUpdated(currentTime - lastTime, chunkSize,
                   numBytesRemaining);
               lastLoaded = loaded;
               lastTime = currentTime;

package/lib/net/http_xhr_plugin.js

@@ -26,10 +26,12 @@ shaka.net.HttpXHRPlugin = class {
    *   progress event happened.
    * @param {shaka.extern.HeadersReceived} headersReceived Called when the
    *   headers for the download are received, but before the body is.
+   * @param {shaka.extern.SchemePluginConfig} config
    * @return {!shaka.extern.IAbortableOperation.<shaka.extern.Response>}
    * @export
    */
-  static parse(uri, request, requestType, progressUpdated, headersReceived) {
+  static parse(uri, request, requestType, progressUpdated, headersReceived,
+      config) {
     const xhr = new shaka.net.HttpXHRPlugin.Xhr_();
 
     // Last time stamp when we got a progress event.
@@ -98,11 +100,13 @@ shaka.net.HttpXHRPlugin = class {
         // If the time between last time and this time we got progress event
         // is long enough, or if a whole segment is downloaded, call
         // progressUpdated().
-        if (currentTime - lastTime > 100 ||
+        const minBytes = config.minBytesForProgressEvents || 0;
+        const chunkSize = event.loaded - lastLoaded;
+        if ((currentTime - lastTime > 100 && chunkSize >= minBytes) ||
             (event.lengthComputable && event.loaded == event.total)) {
           const numBytesRemaining =
               xhr.readyState == 4 ? 0 : event.total - event.loaded;
-          progressUpdated(currentTime - lastTime, event.loaded - lastLoaded,
+          progressUpdated(currentTime - lastTime, chunkSize,
               numBytesRemaining);
           lastLoaded = event.loaded;
           lastTime = currentTime;

package/lib/net/networking_engine.js

@@ -101,6 +101,9 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
 
     /** @private {boolean} */
     this.forceHTTPS_ = false;
+
+    /** @private {number} */
+    this.minBytesForProgressEvents_ = 16e3;
   }
 
   /**
@@ -119,6 +122,14 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
     this.forceHTTPS_ = forceHTTPS;
   }
 
+
+  /**
+   * @param {number} minBytes
+   */
+  setMinBytesForProgressEvents(minBytes) {
+    this.minBytesForProgressEvents_ = minBytes;
+  }
+
   /**
    * Registers a scheme plugin.  This plugin will handle all requests with the
    * given scheme.  If a plugin with the same scheme already exists, it is
@@ -575,7 +586,10 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
       request.requestStartTime = Date.now();
 
       const requestPlugin = plugin(
-          request.uris[index], request, type, progressUpdated, headersReceived);
+          request.uris[index], request, type, progressUpdated, headersReceived,
+          {
+            minBytesForProgressEvents: this.minBytesForProgressEvents_,
+          });
 
       if (!progressSupport) {
         return requestPlugin;
@@ -872,6 +886,12 @@ shaka.net.NetworkingEngine.AdvancedRequestType = {
   'MPD': 4,
   'MSS': 5,
   'MPD_PATCH': 6,
+  'MEDIATAILOR_SESSION_INFO': 7,
+  'MEDIATAILOR_TRACKING_INFO': 8,
+  'MEDIATAILOR_STATIC_RESOURCE': 9,
+  'MEDIATAILOR_TRACKING_EVENT': 10,
+  'INTERSTITIAL_ASSET_LIST': 11,
+  'INTERSTITIAL_AD_URL': 12,
 };
 
 

package/lib/offline/manifest_converter.js

@@ -97,6 +97,7 @@ shaka.offline.ManifestConverter = class {
       periodCount: 1,
       gapCount: 0,
       isLowLatency: false,
+      startTime: null,
     };
   }
 

package/lib/offline/storage.js

@@ -1180,6 +1180,7 @@ shaka.offline.Storage = class {
       getBandwidthEstimate: () => config.abr.defaultBandwidthEstimate,
       onMetadata: () => {},
       disableStream: (stream) => {},
+      addFont: (name, url) => {},
     };
 
     parser.configure(config.manifest);