shaka-player 4.5.0 → 4.6.1

package/lib/offline/storage.js

@@ -12,6 +12,7 @@ goog.require('shaka.log');
 goog.require('shaka.media.DrmEngine');
 goog.require('shaka.media.ManifestParser');
 goog.require('shaka.net.NetworkingEngine');
+goog.require('shaka.net.NetworkingUtils');
 goog.require('shaka.offline.DownloadInfo');
 goog.require('shaka.offline.DownloadManager');
 goog.require('shaka.offline.OfflineUri');
@@ -271,10 +272,13 @@ shaka.offline.Storage = class {
       goog.asserts.assert(
           this.networkingEngine_, 'Should not call |store| after |destroy|');
 
-      const factory = await shaka.media.ManifestParser.getFactory(
+      if (!mimeType) {
+        mimeType = await shaka.net.NetworkingUtils.getMimeType(
+            uri, this.networkingEngine_, config.manifest.retryParameters);
+      }
+
+      const factory = shaka.media.ManifestParser.getFactory(
           uri,
-          this.networkingEngine_,
-          config.manifest.retryParameters,
           mimeType || null);
 
       return factory();
@@ -656,20 +660,19 @@ shaka.offline.Storage = class {
     // Filter the manifest based on what we know MediaCapabilities will be able
     // to play later (no point storing something we can't play).
     await shaka.util.StreamUtils.filterManifestByMediaCapabilities(
-        manifest, config.offline.usePersistentLicense);
+        drmEngine, 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;
 
     shaka.util.StreamUtils.chooseCodecsAndFilterManifest(
         manifest, preferredVideoCodecs, preferredAudioCodecs,
-        preferredAudioChannelCount, preferredDecodingAttributes);
+        preferredDecodingAttributes);
 
     for (const variant of manifest.variants) {
       goog.asserts.assert(
@@ -1230,7 +1233,6 @@ shaka.offline.Storage = class {
     drmEngine.configure(config.drm);
     await drmEngine.initForStorage(
         manifest.variants, config.offline.usePersistentLicense);
-    await drmEngine.setServerCertificate();
     await drmEngine.createOrLoad();
 
     return drmEngine;
@@ -1309,6 +1311,7 @@ shaka.offline.Storage = class {
       frameRate: stream.frameRate,
       pixelAspectRatio: stream.pixelAspectRatio,
       hdr: stream.hdr,
+      videoLayout: stream.videoLayout,
       kind: stream.kind,
       language: stream.language,
       originalLanguage: stream.originalLanguage,
@@ -1327,6 +1330,7 @@ shaka.offline.Storage = class {
       closedCaptions: stream.closedCaptions,
       tilesLayout: stream.tilesLayout,
       external: stream.external,
+      fastSwitching: stream.fastSwitching,
     };
 
     const startTime =