shaka-player 4.9.0 → 4.9.2

package/lib/media/content_workarounds.js

@@ -30,10 +30,11 @@ shaka.media.ContentWorkarounds = class {
    * need this workaround.
    *
    * @param {!BufferSource} initSegmentBuffer
+   * @param {?string} uri
    * @return {!Uint8Array}
    * @see https://github.com/shaka-project/shaka-player/issues/2759
    */
-  static fakeEncryption(initSegmentBuffer) {
+  static fakeEncryption(initSegmentBuffer, uri) {
     const ContentWorkarounds = shaka.media.ContentWorkarounds;
     let initSegment = shaka.util.BufferUtils.toUint8(initSegmentBuffer);
     let isEncrypted = false;
@@ -154,7 +155,8 @@ shaka.media.ContentWorkarounds = class {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.CONTENT_TRANSFORMATION_FAILED);
+          shaka.util.Error.Code.CONTENT_TRANSFORMATION_FAILED,
+          uri);
     }
 
     // Modify boxes in order from largest offset to smallest, so that earlier

package/lib/media/drm_engine.js

@@ -393,7 +393,6 @@ shaka.media.DrmEngine = class {
           this.config_.keySystemsMapping);
     }
 
-
     /** @type {!Map.<string, MediaKeySystemConfiguration>} */
     let configsByKeySystem;
 
@@ -402,6 +401,7 @@ shaka.media.DrmEngine = class {
     await shaka.util.StreamUtils.getDecodingInfosForVariants(variants,
         this.usePersistentLicenses_, this.srcEquals_,
         this.config_.preferredKeySystems);
+    this.destroyer_.ensureNotDestroyed();
 
     const hasDrmInfo = hadDrmInfo || Object.keys(this.config_.servers).length;
     // An unencrypted content is initialized.

package/lib/media/media_source_engine.js

@@ -569,7 +569,8 @@ shaka.media.MediaSourceEngine = class {
             shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,
             exception,
             'The mediaSource_ status was ' + this.mediaSource_.readyState +
-            ' expected \'open\'');
+            ' expected \'open\'',
+            null);
       }
 
       if (this.sequenceMode_) {
@@ -935,10 +936,12 @@ shaka.media.MediaSourceEngine = class {
           if (this.attemptTimestampOffsetCalculation_) {
             this.enqueueOperation_(
                 contentType,
-                () => this.abort_(contentType));
+                () => this.abort_(contentType),
+                null);
             this.enqueueOperation_(
                 contentType,
-                () => this.setTimestampOffset_(contentType, timestampOffset));
+                () => this.setTimestampOffset_(contentType, timestampOffset),
+                null);
           }
         }
         // Timestamps can only be reliably extracted from video, not audio.
@@ -983,7 +986,8 @@ shaka.media.MediaSourceEngine = class {
     }
 
     data = this.workAroundBrokenPlatforms_(
-        data, reference ? reference.startTime : null, contentType);
+        data, reference ? reference.startTime : null, contentType,
+        reference ? reference.getUris()[0] : null);
 
     if (reference && this.sequenceMode_ && contentType != ContentType.TEXT) {
       // In sequence mode, for non-text streams, if we just cleared the buffer
@@ -995,10 +999,14 @@ shaka.media.MediaSourceEngine = class {
         // extended during unbuffered seeks or automatic adaptations; it is
         // possible for the append state to be PARSING_MEDIA_SEGMENT from the
         // previous SourceBuffer#appendBuffer() call.
-        this.enqueueOperation_(contentType, () => this.abort_(contentType));
         this.enqueueOperation_(
             contentType,
-            () => this.setTimestampOffset_(contentType, timestampOffset));
+            () => this.abort_(contentType),
+            null);
+        this.enqueueOperation_(
+            contentType,
+            () => this.setTimestampOffset_(contentType, timestampOffset),
+            null);
       }
     }
 
@@ -1009,7 +1017,7 @@ shaka.media.MediaSourceEngine = class {
         bufferedBefore = this.getBuffered_(contentType);
       }
       this.append_(contentType, data, timestampOffset);
-    });
+    }, reference ? reference.getUris()[0] : null);
 
     if (goog.DEBUG && reference && !reference.isPreload() && !isChunkedData) {
       const bufferedAfter = this.getBuffered_(contentType);
@@ -1067,11 +1075,13 @@ shaka.media.MediaSourceEngine = class {
     } else {
       await this.enqueueOperation_(
           contentType,
-          () => this.remove_(contentType, startTime, endTime));
+          () => this.remove_(contentType, startTime, endTime),
+          null);
       if (this.needSplitMuxedContent_) {
         await this.enqueueOperation_(
             ContentType.AUDIO,
-            () => this.remove_(ContentType.AUDIO, startTime, endTime));
+            () => this.remove_(ContentType.AUDIO, startTime, endTime),
+            null);
       }
     }
   }
@@ -1093,12 +1103,14 @@ shaka.media.MediaSourceEngine = class {
       // Note that not all platforms allow clearing to Infinity.
       await this.enqueueOperation_(
           contentType,
-          () => this.remove_(contentType, 0, this.mediaSource_.duration));
+          () => this.remove_(contentType, 0, this.mediaSource_.duration),
+          null);
       if (this.needSplitMuxedContent_) {
         await this.enqueueOperation_(
             ContentType.AUDIO,
             () => this.remove_(
-                ContentType.AUDIO, 0, this.mediaSource_.duration));
+                ContentType.AUDIO, 0, this.mediaSource_.duration),
+            null);
       }
     }
   }
@@ -1129,11 +1141,13 @@ shaka.media.MediaSourceEngine = class {
     }
     await this.enqueueOperation_(
         contentType,
-        () => this.flush_(contentType));
+        () => this.flush_(contentType),
+        null);
     if (this.needSplitMuxedContent_) {
       await this.enqueueOperation_(
           ContentType.AUDIO,
-          () => this.flush_(ContentType.AUDIO));
+          () => this.flush_(ContentType.AUDIO),
+          null);
     }
   }
 
@@ -1188,33 +1202,39 @@ shaka.media.MediaSourceEngine = class {
       // set it.
       operations.push(this.enqueueOperation_(
           contentType,
-          () => this.abort_(contentType)));
+          () => this.abort_(contentType),
+          null));
       if (this.needSplitMuxedContent_) {
         operations.push(this.enqueueOperation_(
             ContentType.AUDIO,
-            () => this.abort_(ContentType.AUDIO)));
+            () => this.abort_(ContentType.AUDIO),
+            null));
       }
     }
     if (!ignoreTimestampOffset) {
       operations.push(this.enqueueOperation_(
           contentType,
-          () => this.setTimestampOffset_(contentType, timestampOffset)));
+          () => this.setTimestampOffset_(contentType, timestampOffset),
+          null));
       if (this.needSplitMuxedContent_) {
         operations.push(this.enqueueOperation_(
             ContentType.AUDIO,
             () => this.setTimestampOffset_(
-                ContentType.AUDIO, timestampOffset)));
+                ContentType.AUDIO, timestampOffset),
+            null));
       }
     }
     operations.push(this.enqueueOperation_(
         contentType,
         () => this.setAppendWindow_(
-            contentType, appendWindowStart, appendWindowEnd)));
+            contentType, appendWindowStart, appendWindowEnd),
+        null));
     if (this.needSplitMuxedContent_) {
       operations.push(this.enqueueOperation_(
           ContentType.AUDIO,
           () => this.setAppendWindow_(
-              ContentType.AUDIO, appendWindowStart, appendWindowEnd)));
+              ContentType.AUDIO, appendWindowStart, appendWindowEnd),
+          null));
     }
 
     await Promise.all(operations);
@@ -1251,19 +1271,23 @@ shaka.media.MediaSourceEngine = class {
     // set it.
     this.enqueueOperation_(
         contentType,
-        () => this.abort_(contentType));
+        () => this.abort_(contentType),
+        null);
     if (this.needSplitMuxedContent_) {
       this.enqueueOperation_(
           ContentType.AUDIO,
-          () => this.abort_(ContentType.AUDIO));
+          () => this.abort_(ContentType.AUDIO),
+          null);
     }
     await this.enqueueOperation_(
         contentType,
-        () => this.setTimestampOffset_(contentType, timestampOffset));
+        () => this.setTimestampOffset_(contentType, timestampOffset),
+        null);
     if (this.needSplitMuxedContent_) {
       await this.enqueueOperation_(
           ContentType.AUDIO,
-          () => this.setTimestampOffset_(ContentType.AUDIO, timestampOffset));
+          () => this.setTimestampOffset_(ContentType.AUDIO, timestampOffset),
+          null);
     }
   }
 
@@ -1306,6 +1330,7 @@ shaka.media.MediaSourceEngine = class {
           const dummyOperation = {
             start: () => {},
             p: new shaka.util.PublicPromise(),
+            uri: null,
           };
           this.queues_[contentType].unshift(dummyOperation);
         }
@@ -1465,7 +1490,7 @@ shaka.media.MediaSourceEngine = class {
         shaka.util.Error.Severity.CRITICAL,
         shaka.util.Error.Category.MEDIA,
         shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_FAILED,
-        code));
+        code, operation.uri));
     // Do not pop from queue.  An 'updateend' event will fire next, and to
     // avoid synchronizing these two event handlers, we will allow that one to
     // pop from the queue as normal.  Note that because the operation has
@@ -1497,14 +1522,16 @@ shaka.media.MediaSourceEngine = class {
    *
    * @param {shaka.util.ManifestParserUtils.ContentType} contentType
    * @param {function()} start
+   * @param {?string} uri
    * @return {!Promise}
    * @private
    */
-  enqueueOperation_(contentType, start) {
+  enqueueOperation_(contentType, start, uri) {
     this.destroyer_.ensureNotDestroyed();
     const operation = {
       start: start,
       p: new shaka.util.PublicPromise(),
+      uri,
     };
     this.queues_[contentType].push(operation);
 
@@ -1536,6 +1563,7 @@ shaka.media.MediaSourceEngine = class {
       const operation = {
         start: () => ready.resolve(),
         p: ready,
+        uri: null,
       };
 
       this.queues_[contentType].push(operation);
@@ -1593,7 +1621,8 @@ shaka.media.MediaSourceEngine = class {
           shaka.util.Error.Category.MEDIA,
           shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,
           exception,
-          this.video_.error || 'No error in the media element');
+          this.video_.error || 'No error in the media element',
+          null);
     } finally {
       // Unblock the queues.
       for (const contentType in this.sourceBuffers_) {
@@ -1637,7 +1666,8 @@ shaka.media.MediaSourceEngine = class {
               shaka.util.Error.Category.MEDIA,
               shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,
               exception,
-              this.video_.error || 'No error in the media element'));
+              this.video_.error || 'No error in the media element',
+              next.uri));
         }
         this.popFromQueue_(contentType);
       }
@@ -1684,10 +1714,11 @@ shaka.media.MediaSourceEngine = class {
    * @param {!BufferSource} segment
    * @param {?number} startTime
    * @param {shaka.util.ManifestParserUtils.ContentType} contentType
+   * @param {?string} uri
    * @return {!BufferSource}
    * @private
    */
-  workAroundBrokenPlatforms_(segment, startTime, contentType) {
+  workAroundBrokenPlatforms_(segment, startTime, contentType, uri) {
     const isInitSegment = startTime == null;
     const encryptionExpected = this.expectedEncryption_[contentType];
 
@@ -1708,7 +1739,7 @@ shaka.media.MediaSourceEngine = class {
         shaka.util.MimeUtils.getContainerType(
             this.sourceBufferTypes_[contentType]) == 'mp4') {
       shaka.log.debug('Forcing fake encryption information in init segment.');
-      segment = shaka.media.ContentWorkarounds.fakeEncryption(segment);
+      segment = shaka.media.ContentWorkarounds.fakeEncryption(segment, uri);
     }
 
     return segment;
@@ -1761,7 +1792,8 @@ shaka.media.MediaSourceEngine = class {
   changeType(contentType, mimeType, transmuxer) {
     return this.enqueueOperation_(
         contentType,
-        () => this.change_(contentType, mimeType, transmuxer));
+        () => this.change_(contentType, mimeType, transmuxer),
+        null);
   }
 
   /**
@@ -2096,7 +2128,8 @@ shaka.media.MediaSourceEngine.createObjectURL = window.URL.createObjectURL;
 /**
  * @typedef {{
  *   start: function(),
- *   p: !shaka.util.PublicPromise
+ *   p: !shaka.util.PublicPromise,
+ *   uri: ?string
  * }}
  *
  * @summary An operation in queue.
@@ -2104,6 +2137,8 @@ shaka.media.MediaSourceEngine.createObjectURL = window.URL.createObjectURL;
  *   The function which starts the operation.
  * @property {!shaka.util.PublicPromise} p
  *   The PublicPromise which is associated with this operation.
+ * @property {?string} uri
+ *   A segment URI (if any) associated with this operation.
  */
 shaka.media.MediaSourceEngine.Operation;
 

package/lib/media/preload_manager.js

@@ -132,19 +132,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     this.stats_ = new shaka.util.Stats();
 
     /** @private {!shaka.util.PublicPromise} */
-    this.manifestPromise_ = new shaka.util.PublicPromise();
-
-    /** @private {!shaka.util.PublicPromise} */
-    this.drmPromise_ = new shaka.util.PublicPromise();
-
-    /** @private {!shaka.util.PublicPromise} */
-    this.chooseInitialVariantPromise_ = new shaka.util.PublicPromise();
-
-    /** @private {!shaka.util.PublicPromise} */
-    this.destroyPromise_ = new shaka.util.PublicPromise();
-
-    // Silence promise failures, in case nobody is catching this.destroyPromise_
-    this.destroyPromise_.catch((error) => {});
+    this.successPromise_ = new shaka.util.PublicPromise();
 
     /** @private {?shaka.util.FakeEventTarget} */
     this.eventHandoffTarget_ = null;
@@ -353,21 +341,6 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     return this.segmentPrefetchById_;
   }
 
-  /** @return {!Promise} */
-  waitForManifest() {
-    return this.manifestPromise_;
-  }
-
-  /** @return {!Promise} */
-  waitForDrm() {
-    return this.drmPromise_;
-  }
-
-  /** @return {!Promise} */
-  waitForChooseInitialVariant() {
-    return this.chooseInitialVariantPromise_;
-  }
-
   /**
    * @param {?shaka.extern.AbrManager} abrManager
    * @param {?shaka.extern.AbrManager.Factory} abrFactory
@@ -397,34 +370,30 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
 
   /**
    * Starts the process of loading the asset.
-   * @return {!Promise}
+   * Success or failure will be measured through waitForFinish()
    */
-  async start() {
-    // Force a context switch, to give the player a chance to hook up events
-    // immediately if desired.
-    await Promise.resolve();
-
-    // Perform the preloading process.
-    try {
-      await this.parseManifestInner_();
-      if (this.isDestroyed()) {
-        return;
-      }
-      this.manifestPromise_.resolve();
-      await this.initializeDrmInner_();
-      if (this.isDestroyed()) {
-        return;
-      }
-      this.drmPromise_.resolve();
-      await this.chooseInitialVariantInner_();
-      if (this.isDestroyed()) {
-        return;
+  start() {
+    (async () => {
+      // Force a context switch, to give the player a chance to hook up events
+      // immediately if desired.
+      await Promise.resolve();
+
+      // Perform the preloading process.
+      try {
+        await this.parseManifestInner_();
+        this.throwIfDestroyed_();
+
+        await this.initializeDrmInner_();
+        this.throwIfDestroyed_();
+
+        await this.chooseInitialVariantInner_();
+        this.throwIfDestroyed_();
+
+        this.successPromise_.resolve();
+      } catch (error) {
+        this.successPromise_.reject(error);
       }
-      this.chooseInitialVariantPromise_.resolve();
-    } catch (error) {
-      this.destroyPromise_.reject(error);
-      throw error;
-    }
+    })();
   }
 
   /**
@@ -446,7 +415,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
   onError(error) {
     if (error.severity === shaka.util.Error.Severity.CRITICAL) {
       // Cancel the loading process.
-      this.destroyPromise_.reject(error);
+      this.successPromise_.reject(error);
       this.destroy();
     }
 
@@ -458,6 +427,20 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     }
   }
 
+  /**
+   * Throw if destroyed, to interrupt processes with a recognizable error.
+   *
+   * @private
+   */
+  throwIfDestroyed_() {
+    if (this.isDestroyed()) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.PLAYER,
+          shaka.util.Error.Code.OBJECT_DESTROYED);
+    }
+  }
+
   /**
    * Makes a fires an event corresponding to entering a state of the loading
    * process.
@@ -553,12 +536,11 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
 
     const tracksChangedInitial = this.manifestFilterer_.applyRestrictions(
         this.manifest_);
-    const tracksChangedBefore = await this.manifestFilterer_.filterManifest(
-        this.manifest_);
-    if (tracksChangedInitial || tracksChangedBefore) {
+    if (tracksChangedInitial) {
       const event = this.makeEvent_(
           shaka.util.FakeEvent.EventName.TracksChanged);
       await Promise.resolve();
+      this.throwIfDestroyed_();
       this.dispatchEvent(event);
     }
 
@@ -567,6 +549,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     await this.drmEngine_.initForPlayback(
         playableVariants,
         this.manifest_.offlineSessionIds);
+    this.throwIfDestroyed_();
 
     // Now that we have drm information, filter the manifest (again) so that
     // we can ensure we only use variants with the selected key system.
@@ -717,10 +700,7 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
    * @export
    */
   waitForFinish() {
-    return Promise.race([
-      this.chooseInitialVariantPromise_,
-      this.destroyPromise_,
-    ]);
+    return this.successPromise_;
   }
 
   /**

package/lib/player.js

@@ -1607,7 +1607,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         if (preloadManager) {
           preloadManager.setEventHandoffTarget(this);
           this.stats_ = preloadManager.getStats();
-          await mutexWrapOperation(() => preloadManager.start(), 'preload');
+          preloadManager.start();
+          // Silence "uncaught error" warnings from this. Unless we are
+          // interrupted, we will check the result of this process and respond
+          // appropriately. If we are interrupted, we can ignore any error
+          // there.
+          preloadManager.waitForFinish().catch(() => {});
         } else {
           this.stats_ = new shaka.util.Stats();
         }
@@ -1648,9 +1653,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           }, 'initializeMediaSourceEngineInner_');
         }
 
+        // Wait for the preload manager to do all of the loading it can do.
+        await mutexWrapOperation(async () => {
+          await preloadManager.waitForFinish();
+        }, 'waitForFinish');
+
         // Get manifest and associated values from preloader.
-        await mutexWrapOperation(
-            () => preloadManager.waitForManifest(), 'waitForManifest');
         this.config_ = preloadManager.getConfiguration();
         this.manifestFilterer_ = preloadManager.getManifestFilterer();
         this.parserFactory_ = preloadManager.getParserFactory();
@@ -1674,18 +1682,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         }
 
         // Get drm engine from preloader, then finalize it.
-        await mutexWrapOperation(
-            () => preloadManager.waitForDrm(), 'waitForDrm');
         this.drmEngine_ = preloadManager.receiveDrmEngine();
         await mutexWrapOperation(async () => {
           await this.drmEngine_.attach(this.video_);
         }, 'drmEngine_.attach');
 
-        // Choose an initial variant.
-        await mutexWrapOperation(
-            () => preloadManager.waitForChooseInitialVariant(),
-            'waitForChooseInitialVariant');
-
         // Also get the ABR manager, which has special logic related to being
         // received.
         const abrManagerFactory = preloadManager.getAbrManagerFactory();
@@ -1873,7 +1874,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           shaka.util.Error.Category.PLAYER,
           shaka.util.Error.Code.SRC_EQUALS_PRELOAD_NOT_SUPPORTED));
     } else {
-      preloadManager.start().catch((error) => {}); // Catch errors.
+      preloadManager.start();
     }
     return preloadManager;
   }
@@ -2405,7 +2406,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     const setupPlayhead = (startTime) => {
       this.playhead_ = this.createPlayhead(startTime);
       this.playheadObservers_ =
-          this.createPlayheadObserversForMSE_(startTimeOfLoad);
+          this.createPlayheadObserversForMSE_(startTime);
 
       // We need to start the buffer management code near the end because it
       // will set the initial buffering state and that depends on other
@@ -3242,16 +3243,16 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * Create the observers for MSE playback. These observers are responsible for
    * notifying the app and player of specific events during MSE playback.
    *
-   * @param {number} startTimeOfLoad
+   * @param {number} startTime
    * @return {!shaka.media.PlayheadObserverManager}
    * @private
    */
-  createPlayheadObserversForMSE_(startTimeOfLoad) {
+  createPlayheadObserversForMSE_(startTime) {
     goog.asserts.assert(this.manifest_, 'Must have manifest');
     goog.asserts.assert(this.regionTimeline_, 'Must have region timeline');
     goog.asserts.assert(this.video_, 'Must have video element');
 
-    const startsPastZero = this.isLive() || startTimeOfLoad > 0;
+    const startsPastZero = this.isLive() || startTime > 0;
 
     // Create the region observer. This will allow us to notify the app when we
     // move in and out of timeline regions.
@@ -7103,7 +7104,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         shaka.util.FakeEvent.EventName.KeyStatusChanged);
     this.dispatchEvent(event);
 
-    const keyIds = Object.keys(keyStatusMap);
+    let keyIds = Object.keys(keyStatusMap);
     if (keyIds.length == 0) {
       shaka.log.warning(
           'Got a key status event without any key statuses, so we don\'t ' +
@@ -7111,6 +7112,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           'you\'ll need to set restrictions so we don\'t select those tracks.');
     }
 
+    // Non-standard version of global key status. Modify it to match standard
+    // behavior.
+    if (keyIds.length == 1 && keyIds[0] == '') {
+      keyIds = ['00'];
+      keyStatusMap = {'00': keyStatusMap['']};
+    }
+
     // If EME is using a synthetic key ID, the only key ID is '00' (a single 0
     // byte).  In this case, it is only used to report global success/failure.
     // See note about old platforms in: https://bit.ly/2tpez5Z
@@ -7446,7 +7454,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.9.0' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.2' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/mediasource.js

@@ -67,6 +67,18 @@ shaka.polyfill.MediaSource = class {
         // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=165342
         shaka.polyfill.MediaSource.stubAbort_();
       }
+    } else if (shaka.util.Platform.isZenterio()) {
+      // Zenterio uses WPE based on Webkit 607.x.x which do not correctly
+      // implement abort() on SourceBuffer.
+      // Calling abort() before appending a segment causes that segment to be
+      // incomplete in the buffer.
+      // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=165342
+      shaka.polyfill.MediaSource.stubAbort_();
+      // If you remove up to a keyframe, Webkit 607.x.x incorrectly will also
+      // remove that keyframe and the content up to the next.
+      // Offsetting the end of the removal range seems to help.
+      // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=177884
+      shaka.polyfill.MediaSource.patchRemovalRange_();
     } else if (shaka.util.Platform.isTizen2() ||
         shaka.util.Platform.isTizen3() ||
         shaka.util.Platform.isTizen4()) {

package/lib/transmuxer/aac_transmuxer.js

@@ -141,7 +141,8 @@ shaka.transmuxer.AacTransmuxer = class {
       return Promise.reject(new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MEDIA,
-          shaka.util.Error.Code.TRANSMUXING_FAILED));
+          shaka.util.Error.Code.TRANSMUXING_FAILED,
+          reference ? reference.getUris()[0] : null));
     }
     stream.audioSamplingRate = info.sampleRate;
     stream.channelsCount = info.channelCount;
@@ -155,7 +156,8 @@ shaka.transmuxer.AacTransmuxer = class {
         return Promise.reject(new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED));
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null));
       }
       const length = header.headerLength + header.frameLength;
       if (offset + length <= uint8ArrayData.length) {

package/lib/transmuxer/ac3_transmuxer.js

@@ -144,7 +144,8 @@ shaka.transmuxer.Ac3Transmuxer = class {
         return Promise.reject(new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED));
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null));
       }
       stream.audioSamplingRate = frame.sampleRate;
       stream.channelsCount = frame.channelCount;

package/lib/transmuxer/ec3_transmuxer.js

@@ -144,7 +144,8 @@ shaka.transmuxer.Ec3Transmuxer = class {
         return Promise.reject(new shaka.util.Error(
             shaka.util.Error.Severity.CRITICAL,
             shaka.util.Error.Category.MEDIA,
-            shaka.util.Error.Code.TRANSMUXING_FAILED));
+            shaka.util.Error.Code.TRANSMUXING_FAILED,
+            reference ? reference.getUris()[0] : null));
       }
       stream.audioSamplingRate = frame.sampleRate;
       stream.channelsCount = frame.channelCount;