shaka-player 3.1.3 → 3.2.2

package/lib/media/segment_reference.js

@@ -135,12 +135,16 @@ shaka.media.SegmentReference = class {
    *   presentation.  Any content from after this time will be removed by
    *   MediaSource.
    * @param {!Array.<!shaka.media.SegmentReference>=} partialReferences
-       A list of SegmentReferences for the partial segments.
+   *   A list of SegmentReferences for the partial segments.
+   * @param {?string=} tilesLayout
+   *   The value is a grid-item-dimension consisting of two positive decimal
+   *   integers in the format: column-x-row ('4x3'). It describes the
+   *   arrangement of Images in a Grid. The minimum valid LAYOUT is '1x1'.
    */
   constructor(
       startTime, endTime, uris, startByte, endByte, initSegmentReference,
       timestampOffset, appendWindowStart, appendWindowEnd,
-      partialReferences = []) {
+      partialReferences = [], tilesLayout = '') {
     // A preload hinted Partial Segment has the same startTime and endTime.
     goog.asserts.assert(startTime <= endTime,
         'startTime must be less than or equal to endTime');
@@ -184,6 +188,9 @@ shaka.media.SegmentReference = class {
 
     /** @type {!Array.<!shaka.media.SegmentReference>} */
     this.partialReferences = partialReferences;
+
+    /** @type {?string} */
+    this.tilesLayout = tilesLayout;
   }
 
   /**
@@ -258,6 +265,16 @@ shaka.media.SegmentReference = class {
   hasPartialSegments() {
     return this.partialReferences.length > 0;
   }
+
+  /**
+   * Returns the segment's tiles layout. Only defined in image segments.
+   *
+   * @return {?string}
+   * @export
+   */
+  getTilesLayout() {
+    return this.tilesLayout;
+  }
 };
 
 

package/lib/media/streaming_engine.js

@@ -1001,10 +1001,10 @@ shaka.media.StreamingEngine = class {
     if (bufferedAhead >= scaledBufferingGoal) {
       shaka.log.v2(logPrefix, 'buffering goal met');
 
-      // Do not try to predict the next update.  Just poll twice every second.
-      // The playback rate can change at any time, so any prediction we make now
-      // could be terribly invalid soon.
-      return 0.5;
+      // Do not try to predict the next update.  Just poll according to
+      // configuration (seconds). The playback rate can change at any time, so
+      // any prediction we make now could be terribly invalid soon.
+      return this.config_.updateIntervalSeconds / 2;
     }
 
     const bufferEnd =
@@ -1016,7 +1016,7 @@ shaka.media.StreamingEngine = class {
       // In any case just try again... if the manifest is incomplete or is not
       // being updated then we'll idle forever; otherwise, we'll end up getting
       // a SegmentReference eventually.
-      return 1;
+      return this.config_.updateIntervalSeconds;
     }
 
     // Do not let any one stream get far ahead of any other.
@@ -1047,7 +1047,7 @@ shaka.media.StreamingEngine = class {
       // For example, let video buffering catch up to audio buffering before
       // fetching another audio segment.
       shaka.log.v2(logPrefix, 'waiting for other streams to buffer');
-      return 1;
+      return this.config_.updateIntervalSeconds;
     }
 
     const p = this.fetchAndAppend_(mediaState, presentationTime, reference);
@@ -1662,7 +1662,8 @@ shaka.media.StreamingEngine = class {
 
         // Dispatch an event to notify the application about the emsg box.
         const eventName = shaka.Player.EventName.Emsg;
-        const event = new shaka.util.FakeEvent(eventName, {'detail': emsg});
+        const data = (new Map()).set('detail', emsg);
+        const event = new shaka.util.FakeEvent(eventName, data);
         this.playerInterface_.onEvent(event);
       }
     }

package/lib/net/networking_engine.js

@@ -544,7 +544,8 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
         }
 
         if (error.severity == shaka.util.Error.Severity.RECOVERABLE) {
-          const event = new shaka.util.FakeEvent('retry', {'error': error});
+          const data = (new Map()).set('error', error);
+          const event = new shaka.util.FakeEvent('retry', data);
           this.dispatchEvent(event);
 
           // Move to the next URI.
@@ -706,6 +707,7 @@ shaka.net.NetworkingEngine.RequestType = {
   'LICENSE': 2,
   'APP': 3,
   'TIMING': 4,
+  'SERVER_CERTIFICATE': 5,
 };
 
 

package/lib/offline/download_manager.js

@@ -44,9 +44,8 @@ shaka.offline.DownloadManager = class {
 
     /** @private {!shaka.util.Destroyer} */
     this.destroyer_ = new shaka.util.Destroyer(() => {
-      const promises = Array.from(this.groups_.values());
       // Add a "catch" block to stop errors from being returned.
-      return Promise.all(promises.map((p) => p.catch(() => {})));
+      return this.abortAll().catch(() => {});
     });
 
     /**

package/lib/offline/indexeddb/v1_storage_cell.js

@@ -204,6 +204,7 @@ shaka.offline.indexeddb.V1StorageCell = class
       appendWindowStart,
       appendWindowEnd,
       timestampOffset,
+      tilesLayout: '',
     };
   }
 

package/lib/offline/indexeddb/v2_storage_cell.js

@@ -148,6 +148,7 @@ shaka.offline.indexeddb.V2StorageCell = class
       appendWindowEnd: periodEnd,
       timestampOffset,
       dataKey: old.dataKey,
+      tilesLayout: '',
     };
   }
 };

package/lib/offline/manifest_converter.js

@@ -229,7 +229,9 @@ shaka.offline.ManifestConverter = class {
         initSegmentReference,
         segmentDB.timestampOffset,
         segmentDB.appendWindowStart,
-        segmentDB.appendWindowEnd);
+        segmentDB.appendWindowEnd,
+        /* partialReferences= */ [],
+        segmentDB.tilesLayout || '');
   }
 
   /**

package/lib/offline/storage.js

@@ -484,25 +484,23 @@ shaka.offline.Storage = class {
     const maxHwRes = {width: Infinity, height: Infinity};
     StreamUtils.filterByRestrictions(manifest, config.restrictions, maxHwRes);
 
-    // Filter the manifest based on what we know media source will be able to
-    // play later (no point storing something we can't play).
-    if (config.useMediaCapabilities) {
-      StreamUtils.filterManifestByMediaCapabilities(
-          manifest, config.offline.usePersistentLicense);
-    } else {
-      StreamUtils.filterManifestByMediaSource(manifest);
-      // Filter the manifest based on what we know our drm system will support
-      // playing later.
-      StreamUtils.filterManifestByDrm(manifest, drmEngine);
-    }
+    // Filter the manifest based on what we know MediaCapabilities will be able
+    // to play later (no point storing something we can't play).
+    StreamUtils.filterManifestByMediaCapabilities(
+        manifest, config.offline.usePersistentLicense);
 
     // Gather all tracks.
     const allTracks = [];
 
     // Choose the codec that has the lowest average bandwidth.
     const preferredAudioChannelCount = config.preferredAudioChannelCount;
+    const preferredDecodingAttributes = config.preferredDecodingAttributes;
+    const preferredVideoCodecs = config.preferredVideoCodecs;
+    const preferredAudioCodecs = config.preferredAudioCodecs;
+
     StreamUtils.chooseCodecsAndFilterManifest(
-        manifest, preferredAudioChannelCount);
+        manifest, preferredVideoCodecs, preferredAudioCodecs,
+        preferredAudioChannelCount, preferredDecodingAttributes);
 
     for (const variant of manifest.variants) {
       goog.asserts.assert(
@@ -1001,8 +999,7 @@ shaka.offline.Storage = class {
 
     drmEngine.configure(config.drm);
     await drmEngine.initForStorage(
-        manifest.variants, config.offline.usePersistentLicense,
-        config.useMediaCapabilities);
+        manifest.variants, config.offline.usePersistentLicense);
     await drmEngine.setServerCertificate();
     await drmEngine.createOrLoad();
 
@@ -1204,6 +1201,7 @@ shaka.offline.Storage = class {
           appendWindowStart: segment.appendWindowStart,
           appendWindowEnd: segment.appendWindowEnd,
           timestampOffset: segment.timestampOffset,
+          tilesLayout: segment.tilesLayout,
           dataKey,
         });
       });