shaka-player 4.7.12 → 4.8.0

package/lib/offline/manifest_converter.js

@@ -14,6 +14,7 @@ goog.require('shaka.media.SegmentIndex');
 goog.require('shaka.media.SegmentReference');
 goog.require('shaka.offline.OfflineUri');
 goog.require('shaka.util.ManifestParserUtils');
+goog.require('shaka.util.MimeUtils');
 
 
 /**
@@ -169,7 +170,7 @@ shaka.offline.ManifestConverter = class {
   fromStreamDB_(streamDB, timeline) {
     /** @type {!Array.<!shaka.media.SegmentReference>} */
     const segments = streamDB.segments.map(
-        (segment, index) => this.fromSegmentDB_(index, segment));
+        (segment, index) => this.fromSegmentDB_(index, segment, streamDB));
 
     timeline.notifySegments(segments);
 
@@ -212,6 +213,8 @@ shaka.offline.ManifestConverter = class {
       accessibilityPurpose: null,
       external: streamDB.external,
       fastSwitching: streamDB.fastSwitching,
+      fullMimeTypes: new Set([shaka.util.MimeUtils.getFullType(
+          streamDB.mimeType, streamDB.codecs)]),
     };
 
     return stream;
@@ -220,10 +223,11 @@ shaka.offline.ManifestConverter = class {
   /**
    * @param {number} index
    * @param {shaka.extern.SegmentDB} segmentDB
+   * @param {shaka.extern.StreamDB} streamDB
    * @return {!shaka.media.SegmentReference}
    * @private
    */
-  fromSegmentDB_(index, segmentDB) {
+  fromSegmentDB_(index, segmentDB, streamDB) {
     /** @type {!shaka.offline.OfflineUri} */
     const uri = shaka.offline.OfflineUri.segment(
         this.mechanism_, this.cell_, segmentDB.dataKey);
@@ -231,7 +235,7 @@ shaka.offline.ManifestConverter = class {
     const initSegmentReference = segmentDB.initSegmentKey != null ?
         this.fromInitSegmentDB_(segmentDB.initSegmentKey) : null;
 
-    return new shaka.media.SegmentReference(
+    const ref = new shaka.media.SegmentReference(
         segmentDB.startTime,
         segmentDB.endTime,
         () => [uri.toString()],
@@ -243,6 +247,9 @@ shaka.offline.ManifestConverter = class {
         segmentDB.appendWindowEnd,
         /* partialReferences= */ [],
         segmentDB.tilesLayout || '');
+    ref.mimeType = segmentDB.mimeType || streamDB.mimeType || '';
+    ref.codecs = segmentDB.codecs || streamDB.codecs || '';
+    return ref;
   }
 
   /**

package/lib/offline/storage.js

@@ -664,7 +664,8 @@ 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(
-        drmEngine, manifest, config.offline.usePersistentLicense);
+        drmEngine, manifest, config.offline.usePersistentLicense,
+        config.drm.preferredKeySystems);
 
     // Gather all tracks.
     const allTracks = [];
@@ -1389,6 +1390,8 @@ shaka.offline.Storage = class {
         tilesLayout: segment.tilesLayout,
         pendingSegmentRefId,
         dataKey: 0,
+        mimeType: segment.mimeType,
+        codecs: segment.codecs,
       };
       streamDb.segments.push(segmentDB);
       groupId = (groupId + 1) % numberOfParallelDownloads;
@@ -1654,7 +1657,6 @@ shaka.offline.Storage.defaultSystemIds_ = new Map()
     .set('com.microsoft.playready.software',
         '9a04f07998404286ab92e65be0885f95')
     .set('com.microsoft.playready.hardware',
-        '9a04f07998404286ab92e65be0885f95')
-    .set('com.adobe.primetime', 'f239e769efa348509c16a903c6932efb');
+        '9a04f07998404286ab92e65be0885f95');
 
 shaka.Player.registerSupportPlugin('offline', shaka.offline.Storage.support);