shaka-player 4.4.3 → 4.5.0

package/lib/media/segment_reference.js

@@ -32,7 +32,7 @@ shaka.media.InitSegmentReference = class {
    *   the quality of the media associated with this init segment.
    * @param {(null|number)=} timescale
    * @param {(null|BufferSource)=} segmentData
-   * @param {?shaka.extern.HlsAes128Key=} aes128Key
+   * @param {?shaka.extern.aes128Key=} aes128Key
    *  The segment's AES-128-CBC full segment encryption key and iv.
    */
   constructor(uris, startByte, endByte, mediaQuality = null, timescale = null,
@@ -55,8 +55,8 @@ shaka.media.InitSegmentReference = class {
     /** @type {BufferSource|null} */
     this.segmentData = segmentData;
 
-    /** @type {?shaka.extern.HlsAes128Key} */
-    this.hlsAes128Key = aes128Key;
+    /** @type {?shaka.extern.aes128Key} */
+    this.aes128Key = aes128Key;
   }
 
   /**
@@ -196,7 +196,7 @@ shaka.media.SegmentReference = class {
    * @param {shaka.media.SegmentReference.Status=} status
    *  The segment status is used to indicate that a segment does not exist or is
    *  not available.
-   * @param {?shaka.extern.HlsAes128Key=} hlsAes128Key
+   * @param {?shaka.extern.aes128Key=} aes128Key
    *  The segment's AES-128-CBC full segment encryption key and iv.
    */
   constructor(
@@ -204,7 +204,7 @@ shaka.media.SegmentReference = class {
       timestampOffset, appendWindowStart, appendWindowEnd,
       partialReferences = [], tilesLayout = '', tileDuration = null,
       syncTime = null, status = shaka.media.SegmentReference.Status.AVAILABLE,
-      hlsAes128Key = null) {
+      aes128Key = null) {
     // 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');
@@ -276,8 +276,8 @@ shaka.media.SegmentReference = class {
     /** @type {boolean} */
     this.byterangeOptimization = false;
 
-    /** @type {?shaka.extern.HlsAes128Key} */
-    this.hlsAes128Key = hlsAes128Key;
+    /** @type {?shaka.extern.aes128Key} */
+    this.aes128Key = aes128Key;
 
     /** @type {?shaka.media.SegmentReference.ThumbnailSprite} */
     this.thumbnailSprite = null;

package/lib/media/streaming_engine.js

@@ -1498,7 +1498,7 @@ shaka.media.StreamingEngine = class {
 
   /**
    * @param {!BufferSource} rawResult
-   * @param {shaka.extern.HlsAes128Key} aes128Key
+   * @param {shaka.extern.aes128Key} aes128Key
    * @param {!shaka.media.SegmentIterator} iter
    * @return {!Promise.<!BufferSource>} finalResult
    * @private
@@ -1684,22 +1684,21 @@ shaka.media.StreamingEngine = class {
       shaka.log.v1(logPrefix,
           'setting append window end to ' + appendWindowEnd);
 
-      if ((mediaState.lastCodecs && codecs != mediaState.lastCodecs) ||
-          (mediaState.lastMimeType && mimeType != mediaState.lastMimeType)) {
+      const isResetMediaSourceNecessary =
+          mediaState.lastCodecs && mediaState.lastMimeType &&
+          this.playerInterface_.mediaSourceEngine.isResetMediaSourceNecessary(
+              mediaState.type, mediaState.stream);
+      if (isResetMediaSourceNecessary) {
+        let otherState = null;
         if (mediaState.type === ContentType.VIDEO) {
-          /** @type {shaka.media.StreamingEngine.MediaState_} */
-          const audioState = this.mediaStates_.get(ContentType.AUDIO);
-          if (audioState) {
-            audioState.lastInitSegmentReference = null;
-            this.abortOperations_(audioState);
-          }
+          otherState = this.mediaStates_.get(ContentType.AUDIO);
         } else if (mediaState.type === ContentType.AUDIO) {
-          /** @type {shaka.media.StreamingEngine.MediaState_} */
-          const videoState = this.mediaStates_.get(ContentType.VIDEO);
-          if (videoState) {
-            videoState.lastInitSegmentReference = null;
-            this.abortOperations_(videoState);
-          }
+          otherState = this.mediaStates_.get(ContentType.VIDEO);
+        }
+        if (otherState) {
+          otherState.lastInitSegmentReference = null;
+          this.forceClearBuffer_(otherState);
+          this.abortOperations_(otherState).catch(() => {});
         }
       }
 
@@ -1729,6 +1728,19 @@ shaka.media.StreamingEngine = class {
               mediaState.type, timestampOffset, appendWindowStart,
               appendWindowEnd, ignoreTimestampOffset,
               mediaState.stream, streamsByType);
+          if (isResetMediaSourceNecessary) {
+            let otherState = null;
+            if (mediaState.type === ContentType.VIDEO) {
+              otherState = this.mediaStates_.get(ContentType.AUDIO);
+            } else if (mediaState.type === ContentType.AUDIO) {
+              otherState = this.mediaStates_.get(ContentType.VIDEO);
+            }
+            if (otherState) {
+              otherState.waitingToClearBuffer = false;
+              otherState.performingUpdate = false;
+              this.forceClearBuffer_(otherState);
+            }
+          }
         } catch (error) {
           mediaState.lastAppendWindowStart = null;
           mediaState.lastAppendWindowEnd = null;
@@ -1738,7 +1750,10 @@ shaka.media.StreamingEngine = class {
           throw error;
         }
       };
-      operations.push(setProperties());
+      // Dispatching init asynchronously causes the sourceBuffers in
+      // the MediaSourceEngine to become detached do to race conditions
+      // with mediaSource and sourceBuffers being created simultaneously.
+      await setProperties();
     }
 
     if (!shaka.media.InitSegmentReference.equal(
@@ -2185,10 +2200,10 @@ shaka.media.StreamingEngine = class {
     const response = await op.promise;
     mediaState.operation = null;
     let result = response.data;
-    if (reference.hlsAes128Key) {
+    if (reference.aes128Key) {
       const iter = mediaState.segmentIterator;
       goog.asserts.assert(iter, 'mediaState.segmentIterator should exist');
-      result = await this.aes128Decrypt_(result, reference.hlsAes128Key, iter);
+      result = await this.aes128Decrypt_(result, reference.aes128Key, iter);
     }
     return result;
   }

package/lib/mss/mss_parser.js

@@ -500,6 +500,7 @@ shaka.mss.MssParser = class {
     const stream = {
       id: id,
       originalId: streamIndex.getAttribute('Name') || String(id),
+      groupId: null,
       createSegmentIndex: () => Promise.resolve(),
       closeSegmentIndex: () => Promise.resolve(),
       segmentIndex: null,

package/lib/net/networking_engine.js

@@ -769,6 +769,7 @@ shaka.net.NetworkingEngine.RequestType = {
   'TIMING': 4,
   'SERVER_CERTIFICATE': 5,
   'KEY': 6,
+  'ADS': 7,
 };
 
 /**

package/lib/offline/indexeddb/v1_storage_cell.js

@@ -150,6 +150,7 @@ shaka.offline.indexeddb.V1StorageCell = class
     return {
       id: old.id,
       originalId: null,
+      groupId: null,
       primary: old.primary,
       type: old.contentType,
       mimeType: old.mimeType,

package/lib/offline/indexeddb/v2_storage_cell.js

@@ -99,6 +99,7 @@ shaka.offline.indexeddb.V2StorageCell = class
     return {
       id: old.id,
       originalId: old.originalId,
+      groupId: null,
       primary: old.primary,
       type: old.contentType,
       mimeType: old.mimeType,

package/lib/offline/manifest_converter.js

@@ -180,6 +180,7 @@ shaka.offline.ManifestConverter = class {
     const stream = {
       id: streamDB.id,
       originalId: streamDB.originalId,
+      groupId: streamDB.groupId,
       createSegmentIndex: () => Promise.resolve(),
       segmentIndex,
       mimeType: streamDB.mimeType,

package/lib/offline/storage.js

@@ -1168,6 +1168,8 @@ shaka.offline.Storage = class {
       enableLowLatencyMode: () => {},
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
+      onManifestUpdated: () => {},
+      getBandwidthEstimate: () => config.abr.defaultBandwidthEstimate,
     };
 
     parser.configure(config.manifest);
@@ -1299,6 +1301,7 @@ shaka.offline.Storage = class {
     const streamDb = {
       id: stream.id,
       originalId: stream.originalId,
+      groupId: stream.groupId,
       primary: stream.primary,
       type: stream.type,
       mimeType: stream.mimeType,