shaka-player 4.3.10 → 4.4.0

package/lib/net/networking_engine.js

@@ -5,6 +5,7 @@
  */
 
 goog.provide('shaka.net.NetworkingEngine');
+goog.provide('shaka.net.NetworkingEngine.AdvancedRequestType');
 goog.provide('shaka.net.NetworkingEngine.RequestType');
 goog.provide('shaka.net.NetworkingEngine.PendingRequest');
 
@@ -52,8 +53,11 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
    *   Called when the headers are received for a download.
    * @param {shaka.net.NetworkingEngine.OnDownloadFailed=} onDownloadFailed
    *   Called when a download fails, for any reason.
+   * @param {shaka.net.NetworkingEngine.OnRequest=} onRequest
+   *   Called when a request is made
    */
-  constructor(onProgressUpdated, onHeadersReceived, onDownloadFailed) {
+  constructor(onProgressUpdated, onHeadersReceived, onDownloadFailed,
+      onRequest) {
     super();
 
     /** @private {boolean} */
@@ -77,6 +81,9 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
     /** @private {?shaka.net.NetworkingEngine.OnDownloadFailed} */
     this.onDownloadFailed_ = onDownloadFailed || null;
 
+    /** @private {?shaka.net.NetworkingEngine.OnRequest} */
+    this.onRequest_ = onRequest || null;
+
     /** @private {boolean} */
     this.forceHTTPS_ = false;
   }
@@ -247,10 +254,11 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
    *
    * @param {shaka.net.NetworkingEngine.RequestType} type
    * @param {shaka.extern.Request} request
+   * @param {shaka.extern.RequestContext=} context
    * @return {!shaka.net.NetworkingEngine.PendingRequest}
    * @export
    */
-  request(type, request) {
+  request(type, request, context) {
     const ObjectUtils = shaka.util.ObjectUtils;
     const numBytesRemainingObj =
         new shaka.net.NetworkingEngine.NumBytesRemainingClass();
@@ -285,12 +293,12 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
     request.uris = ObjectUtils.cloneObject(request.uris);
 
     // Apply the registered filters to the request.
-    const requestFilterOperation = this.filterRequest_(type, request);
+    const requestFilterOperation = this.filterRequest_(type, request, context);
     const requestOperation = requestFilterOperation.chain(
         () => this.makeRequestWithRetry_(type, request, numBytesRemainingObj));
     const responseFilterOperation = requestOperation.chain(
         (responseAndGotProgress) =>
-          this.filterResponse_(type, responseAndGotProgress));
+          this.filterResponse_(type, responseAndGotProgress, context));
 
     // Keep track of time spent in filters.
     const requestFilterStartTime = Date.now();
@@ -342,14 +350,14 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
   /**
    * @param {shaka.net.NetworkingEngine.RequestType} type
    * @param {shaka.extern.Request} request
+   * @param {shaka.extern.RequestContext=} context
    * @return {!shaka.util.AbortableOperation.<undefined>}
    * @private
    */
-  filterRequest_(type, request) {
+  filterRequest_(type, request, context) {
     let filterOperation = shaka.util.AbortableOperation.completed(undefined);
 
-    for (const requestFilter of this.requestFilters_) {
-      // Request filters are run sequentially.
+    const applyFilter = (requestFilter) => {
       filterOperation = filterOperation.chain(() => {
         if (request.body) {
           // TODO: For v4.0 we should remove this or change to always pass a
@@ -359,8 +367,17 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
           // copying buffers if this is a partial view.
           request.body = shaka.util.BufferUtils.toArrayBuffer(request.body);
         }
-        return requestFilter(type, request);
+        return requestFilter(type, request, context);
       });
+    };
+
+    if (this.onRequest_) {
+      applyFilter(this.onRequest_);
+    }
+
+    for (const requestFilter of this.requestFilters_) {
+      // Request filters are run sequentially.
+      applyFilter(requestFilter);
     }
 
     // Catch any errors thrown by request filters, and substitute
@@ -608,11 +625,12 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
    * @param {shaka.net.NetworkingEngine.RequestType} type
    * @param {shaka.net.NetworkingEngine.ResponseAndGotProgress}
    *        responseAndGotProgress
+   * @param {shaka.extern.RequestContext=} context
    * @return {!shaka.extern.IAbortableOperation.<
    *               shaka.net.NetworkingEngine.ResponseAndGotProgress>}
    * @private
    */
-  filterResponse_(type, responseAndGotProgress) {
+  filterResponse_(type, responseAndGotProgress, context) {
     let filterOperation = shaka.util.AbortableOperation.completed(undefined);
     for (const responseFilter of this.responseFilters_) {
       // Response filters are run sequentially.
@@ -622,7 +640,7 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
           // TODO: See TODO in filterRequest_.
           resp.data = shaka.util.BufferUtils.toArrayBuffer(resp.data);
         }
-        return responseFilter(type, resp);
+        return responseFilter(type, resp, context);
       });
     }
     // If successful, return the filtered response with whether it got
@@ -753,6 +771,25 @@ shaka.net.NetworkingEngine.RequestType = {
   'KEY': 6,
 };
 
+/**
+ * A more advanced form of the RequestType structure, meant to describe
+ * sub-types of basic request types.
+ * For example, an INIT_SEGMENT is a sub-type of SEGMENT.
+ * This is meant to allow for more specificity to be added to the request type
+ * data, without breaking backwards compatibility.
+ *
+ * @enum {number}
+ * @export
+ */
+shaka.net.NetworkingEngine.AdvancedRequestType = {
+  'INIT_SEGMENT': 0,
+  'MEDIA_SEGMENT': 1,
+  'MEDIA_PLAYLIST': 2,
+  'MASTER_PLAYLIST': 3,
+  'MPD': 4,
+  'MSS': 5,
+};
+
 
 /**
  * Priority level for network scheme plugins.
@@ -836,3 +873,16 @@ shaka.net.NetworkingEngine.OnHeadersReceived;
  * @export
  */
 shaka.net.NetworkingEngine.OnDownloadFailed;
+
+
+/**
+ * @typedef {function(
+ *    !shaka.net.NetworkingEngine.RequestType,
+ *    !shaka.extern.Request,
+ *    (shaka.extern.RequestContext|undefined))}
+ *
+ * @description
+ * A callback function called on every request
+ * @export
+ */
+shaka.net.NetworkingEngine.OnRequest;

package/lib/offline/indexeddb/v1_storage_cell.js

@@ -159,6 +159,7 @@ shaka.offline.indexeddb.V1StorageCell = class
       hdr: undefined,
       kind: old.kind,
       language: old.language,
+      originalLanguage: old.language || null,
       label: old.label,
       width: old.width,
       height: old.height,

package/lib/offline/indexeddb/v2_storage_cell.js

@@ -108,6 +108,7 @@ shaka.offline.indexeddb.V2StorageCell = class
       hdr: undefined,
       kind: old.kind,
       language: old.language,
+      originalLanguage: old.language || null,
       label: old.label,
       width: old.width,
       height: old.height,

package/lib/offline/manifest_converter.js

@@ -8,6 +8,7 @@ goog.provide('shaka.offline.ManifestConverter');
 
 goog.require('goog.asserts');
 goog.require('shaka.media.InitSegmentReference');
+goog.require('shaka.media.ManifestParser');
 goog.require('shaka.media.PresentationTimeline');
 goog.require('shaka.media.SegmentIndex');
 goog.require('shaka.media.SegmentReference');
@@ -88,6 +89,9 @@ shaka.offline.ManifestConverter = class {
       textStreams: textStreams,
       imageStreams: imageStreams,
       sequenceMode: manifestDB.sequenceMode || false,
+      ignoreManifestTimestampsInSegmentsMode: false,
+      type: manifestDB.type || shaka.media.ManifestParser.UNKNOWN,
+      serviceDescription: null,
     };
   }
 
@@ -190,6 +194,7 @@ shaka.offline.ManifestConverter = class {
       drmInfos: [],
       keyIds: streamDB.keyIds,
       language: streamDB.language,
+      originalLanguage: streamDB.originalLanguage || null,
       label: streamDB.label,
       type: streamDB.type,
       primary: streamDB.primary,
@@ -202,6 +207,7 @@ shaka.offline.ManifestConverter = class {
       spatialAudio: streamDB.spatialAudio,
       closedCaptions: streamDB.closedCaptions,
       tilesLayout: streamDB.tilesLayout,
+      accessibilityPurpose: null,
       external: streamDB.external,
     };
 

package/lib/offline/storage.js

@@ -833,6 +833,7 @@ shaka.offline.Storage = class {
       appMetadata: metadata,
       isIncomplete: true,
       sequenceMode: manifest.sequenceMode,
+      type: manifest.type,
     };
 
     return {manifestDB, toDownload};
@@ -1146,10 +1147,6 @@ shaka.offline.Storage = class {
     const playerInterface = {
       networkingEngine: networkingEngine,
 
-      // No need to apply CMCD data for offline requests
-      modifyManifestRequest: (request, manifestInfo) => {},
-      modifySegmentRequest: (request, segmentInfo) => {},
-
       // Don't bother filtering now. We will do that later when we have all the
       // information we need to filter.
       filter: () => Promise.resolve(),
@@ -1311,6 +1308,7 @@ shaka.offline.Storage = class {
       hdr: stream.hdr,
       kind: stream.kind,
       language: stream.language,
+      originalLanguage: stream.originalLanguage,
       label: stream.label,
       width: stream.width || null,
       height: stream.height || null,