shaka-player 4.9.21 → 4.9.23

package/externs/xbox.js

@@ -41,3 +41,23 @@ Windows.Media.Protection.ProtectionCapabilityResult = {
   maybe: 'Maybe',
   probably: 'Probably',
 };
+
+
+/** @const */
+var chrome = {};
+
+
+/** @const */
+chrome.webview = {};
+
+
+/** @const */
+chrome.webview.hostObjects = {};
+
+
+/** @const */
+chrome.webview.hostObjects.sync = {};
+
+
+/** @const */
+chrome.webview.hostObjects.sync.Windows = Windows;

package/lib/abr/simple_abr_manager.js

@@ -107,7 +107,7 @@ shaka.abr.SimpleAbrManager = class {
 
     /** @private {shaka.util.Timer} */
     this.resizeObserverTimer_ = new shaka.util.Timer(() => {
-      if (this.config_.restrictToElementSize) {
+      if (this.enabled_ && this.config_.restrictToElementSize) {
         const chosenVariant = this.chooseVariant();
         if (chosenVariant) {
           this.switch_(chosenVariant, this.config_.clearBufferSwitch,

package/lib/dash/dash_parser.js

@@ -1006,12 +1006,16 @@ shaka.dash.DashParser = class {
   getContextIdsFromPath_(paths) {
     let periodId = '';
     let adaptationSetId = '';
+    let adaptationSetPosition = -1;
     let representationId = '';
     for (const node of paths) {
       if (node.name === 'Period') {
         periodId = node.id;
       } else if (node.name === 'AdaptationSet') {
         adaptationSetId = node.id;
+        if (node.position !== null) {
+          adaptationSetPosition = node.position;
+        }
       } else if (node.name === 'Representation') {
         representationId = node.id;
       }
@@ -1023,14 +1027,27 @@ shaka.dash.DashParser = class {
     if (representationId) {
       contextIds.push(periodId + ',' + representationId);
     } else {
-      for (const context of this.contextCache_.values()) {
-        if (context.period.id === periodId &&
-            context.adaptationSet.id === adaptationSetId &&
-            context.representation.id) {
-          contextIds.push(periodId + ',' + context.representation.id);
+      if (adaptationSetId) {
+        for (const context of this.contextCache_.values()) {
+          if (context.period.id === periodId &&
+              context.adaptationSet.id === adaptationSetId &&
+              context.representation.id) {
+            contextIds.push(periodId + ',' + context.representation.id);
+          }
+        }
+      } else {
+        if (adaptationSetPosition > -1) {
+          for (const context of this.contextCache_.values()) {
+            if (context.period.id === periodId &&
+                context.adaptationSet.position === adaptationSetPosition &&
+                context.representation.id) {
+              contextIds.push(periodId + ',' + context.representation.id);
+            }
+          }
         }
       }
     }
+
     return contextIds;
   }
 
@@ -1423,7 +1440,8 @@ shaka.dash.DashParser = class {
     const adaptationSetNodes =
         TXml.findChildren(periodInfo.node, 'AdaptationSet');
     const adaptationSets = adaptationSetNodes
-        .map((node) => this.parseAdaptationSet_(context, node))
+        .map((node, position) =>
+          this.parseAdaptationSet_(context, position, node))
         .filter(Functional.isNotNull);
 
     // For dynamic manifests, we use rep IDs internally, and they must be
@@ -1530,11 +1548,12 @@ shaka.dash.DashParser = class {
    * Parses an AdaptationSet XML element.
    *
    * @param {shaka.dash.DashParser.Context} context
+   * @param {number} position
    * @param {!shaka.extern.xml.Node} elem The AdaptationSet element.
    * @return {?shaka.dash.DashParser.AdaptationInfo}
    * @private
    */
-  parseAdaptationSet_(context, elem) {
+  parseAdaptationSet_(context, position, elem) {
     const TXml = shaka.util.TXml;
     const Functional = shaka.util.Functional;
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
@@ -1542,6 +1561,7 @@ shaka.dash.DashParser = class {
     const ContentProtection = shaka.dash.ContentProtection;
 
     context.adaptationSet = this.createFrame_(elem, context.period, null);
+    context.adaptationSet.position = position;
 
     let main = false;
     const roleElements = TXml.findChildren(elem, 'Role');
@@ -2199,6 +2219,7 @@ shaka.dash.DashParser = class {
           pixelAspectRatio: frameRef.pixelAspectRatio,
           emsgSchemeIdUris: frameRef.emsgSchemeIdUris,
           id: frameRef.id,
+          position: frameRef.position,
           numChannels: frameRef.numChannels,
           audioSamplingRate: frameRef.audioSamplingRate,
           availabilityTimeOffset: frameRef.availabilityTimeOffset,
@@ -2949,6 +2970,7 @@ shaka.dash.DashParser.RequestSegmentCallback;
  *   pixelAspectRatio: (string|undefined),
  *   emsgSchemeIdUris: !Array.<string>,
  *   id: ?string,
+ *   position: (number|undefined),
  *   language: ?string,
  *   numChannels: ?number,
  *   audioSamplingRate: ?number,
@@ -2988,6 +3010,8 @@ shaka.dash.DashParser.RequestSegmentCallback;
  *   emsg registered schemeIdUris.
  * @property {?string} id
  *   The ID of the element.
+ * @property {number|undefined} position
+ *   Position of the element used for indexing in case of no id
  * @property {?string} language
  *   The original language of the element.
  * @property {?number} numChannels

package/lib/hls/hls_classes.js

@@ -120,9 +120,13 @@ shaka.hls.Tag = class {
   /**
    * Create the string key of the tag.
    *
+   * @param {boolean} keepAllAtributtes
    * @return {string}
    */
-  getTagKey() {
+  getTagKey(keepAllAtributtes) {
+    if (keepAllAtributtes) {
+      return this.toString();
+    }
     const attributesToSkip = new Set()
         .add('AUDIO')
         .add('VIDEO')

package/lib/hls/hls_parser.js

@@ -1375,7 +1375,7 @@ shaka.hls.HlsParser = class {
 
     const groupedTags = {};
     for (const tag of mediaTags) {
-      const key = tag.getTagKey();
+      const key = tag.getTagKey(!this.contentSteeringManager_);
       if (!groupedTags[key]) {
         groupedTags[key] = [tag];
       } else {
@@ -1456,7 +1456,7 @@ shaka.hls.HlsParser = class {
 
     const groupedTags = {};
     for (const tag of tags) {
-      const key = tag.getTagKey();
+      const key = tag.getTagKey(!this.contentSteeringManager_);
       if (!groupedTags[key]) {
         groupedTags[key] = [tag];
       } else {

package/lib/media/closed_caption_parser.js

@@ -99,8 +99,8 @@ shaka.media.ClosedCaptionParser = class {
       // This is necessary when a new Period comes in DASH or a discontinuity
       // in HLS.
       this.reset();
-      this.ceaParser_.init(initSegment);
     }
+    this.ceaParser_.init(initSegment);
   }
 
   /**

package/lib/media/media_source_engine.js

@@ -1082,13 +1082,15 @@ shaka.media.MediaSourceEngine = class {
           bufferedBefore, bufferedAfter);
       if (newBuffered) {
         const segmentDuration = reference.endTime - reference.startTime;
+        const timeAdded = newBuffered.end - newBuffered.start;
         // Check end times instead of start times.  We may be overwriting a
         // buffer and only the end changes, and that would be fine.
         // Also, exclude tiny segments.  Sometimes alignment segments as small
         // as 33ms are seen in Google DAI content.  For such tiny segments,
         // half a segment duration would be no issue.
         const offset = Math.abs(newBuffered.end - reference.endTime);
-        if (segmentDuration > 0.100 && offset > segmentDuration / 2) {
+        if (segmentDuration > 0.100 && (offset > segmentDuration / 2 ||
+            Math.abs(segmentDuration - timeAdded) > 0.030)) {
           shaka.log.error('Possible encoding problem detected!',
               'Unexpected buffered range for reference', reference,
               'from URIs', reference.getUris(),
@@ -2012,7 +2014,7 @@ shaka.media.MediaSourceEngine = class {
       return false;
     }
     const MimeUtils = shaka.util.MimeUtils;
-    const currentCodec = MimeUtils.getCodecBase(
+    const currentCodec = MimeUtils.getNormalizedCodec(
         MimeUtils.getCodecs(this.sourceBufferTypes_[contentType]));
     const currentBasicType = MimeUtils.getBasicType(
         this.sourceBufferTypes_[contentType]);
@@ -2054,7 +2056,7 @@ shaka.media.MediaSourceEngine = class {
       }
     }
 
-    const newCodec = MimeUtils.getCodecBase(
+    const newCodec = MimeUtils.getNormalizedCodec(
         MimeUtils.getCodecs(newMimeType));
     const newBasicType = MimeUtils.getBasicType(newMimeType);
 
@@ -2113,7 +2115,7 @@ shaka.media.MediaSourceEngine = class {
       return false;
     }
     const MimeUtils = shaka.util.MimeUtils;
-    const currentCodec = MimeUtils.getCodecBase(
+    const currentCodec = MimeUtils.getNormalizedCodec(
         MimeUtils.getCodecs(this.sourceBufferTypes_[contentType]));
     const currentBasicType = MimeUtils.getBasicType(
         this.sourceBufferTypes_[contentType]);
@@ -2140,7 +2142,7 @@ shaka.media.MediaSourceEngine = class {
       }
     }
 
-    const newCodec = MimeUtils.getCodecBase(
+    const newCodec = MimeUtils.getNormalizedCodec(
         MimeUtils.getCodecs(newMimeType));
     const newBasicType = MimeUtils.getBasicType(newMimeType);
 

package/lib/media/streaming_engine.js

@@ -15,9 +15,10 @@ goog.require('shaka.log');
 goog.require('shaka.media.InitSegmentReference');
 goog.require('shaka.media.ManifestParser');
 goog.require('shaka.media.MediaSourceEngine');
+goog.require('shaka.media.SegmentIndex');
 goog.require('shaka.media.SegmentIterator');
-goog.require('shaka.media.SegmentReference');
 goog.require('shaka.media.SegmentPrefetch');
+goog.require('shaka.media.SegmentReference');
 goog.require('shaka.net.Backoff');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.BufferUtils');
@@ -73,6 +74,20 @@ shaka.media.StreamingEngine = class {
     /** @private {?shaka.extern.StreamingConfiguration} */
     this.config_ = null;
 
+    /**
+     * Retains deferred SegmentIndex objects for streams which were switched
+     * away from during an ongoing fetchAndAppend_().
+     * They are released and cleared from this map when the next onUpdate_() for
+     * a stream's content type occurs.
+     * This is because at that point, it is guaranteed no logic is actively
+     * using information for these old streams.
+     *
+     * Lastly, the operations are stored in arrays in the off chance multiple
+     * ABR switches happen during an ongoing fetchAndAppend_().
+     * @private {!Map.<string, !Array.<?shaka.media.SegmentIndex>>}
+     */
+    this.deferredCloseSegmentIndex_ = new Map();
+
     /** @private {number} */
     this.bufferingGoalScale_ = 1;
 
@@ -161,6 +176,7 @@ shaka.media.StreamingEngine = class {
         state.segmentPrefetch.clearAll();
         state.segmentPrefetch = null;
       }
+      this.handleDeferredCloseSegmentIndexes_(state);
     }
     for (const prefetch of this.audioPrefetchMap_.values()) {
       prefetch.clearAll();
@@ -170,6 +186,7 @@ shaka.media.StreamingEngine = class {
 
     this.mediaStates_.clear();
     this.audioPrefetchMap_.clear();
+    this.deferredCloseSegmentIndex_.clear();
 
     this.playerInterface_ = null;
     this.manifest_ = null;
@@ -504,6 +521,29 @@ shaka.media.StreamingEngine = class {
   }
 
 
+  /**
+   * Handles deferred releases of old SegmentIndexes for the mediaState's
+   * content type from a previous update.
+   * @param {!shaka.media.StreamingEngine.MediaState_} mediaState
+   * @private
+   */
+  handleDeferredCloseSegmentIndexes_(mediaState) {
+    for (const [key, value] of this.deferredCloseSegmentIndex_.entries()) {
+      const streamId = /** @type {string} */ (key);
+      const segmentIndexArray =
+      /** @type {!Array.<?shaka.media.SegmentIndex>} */ (value);
+      if (streamId.includes(mediaState.type)) {
+        for (const segmentIndex of segmentIndexArray) {
+          if (segmentIndex) {
+            segmentIndex.release();
+          }
+        }
+        this.deferredCloseSegmentIndex_.delete(streamId);
+      }
+    }
+  }
+
+
   /**
    * Switches to the given Stream. |stream| may be from any Variant.
    *
@@ -572,11 +612,30 @@ shaka.media.StreamingEngine = class {
           fullMimeType, this.manifest_.sequenceMode, stream.external);
     }
 
-    // Releases the segmentIndex of the old stream.
+    // Releases the segmentIndex of the old stream if safe to do so.
     // Do not close segment indexes we are prefetching.
     if (!this.audioPrefetchMap_.has(mediaState.stream)) {
       if (mediaState.stream.closeSegmentIndex) {
-        mediaState.stream.closeSegmentIndex();
+        if (mediaState.performingUpdate) {
+          const oldStreamTag =
+              shaka.media.StreamingEngine.logPrefix_(mediaState);
+          // The ongoing update is still using the old stream's segment
+          // reference information.
+          // If we close the old stream now, the update will not complete
+          // correctly.
+          // onUpdate_() will resume the closeSegmentIndex() operation for the
+          // old stream when the update has finished.
+          if (!this.deferredCloseSegmentIndex_.has(oldStreamTag)) {
+            this.deferredCloseSegmentIndex_.set(
+                oldStreamTag, [mediaState.stream.segmentIndex]);
+          } else {
+            // We switched from stream A -> B -> back to A.
+            this.deferredCloseSegmentIndex_.get(oldStreamTag).push(
+                mediaState.stream.segmentIndex);
+          }
+        } else {
+          mediaState.stream.closeSegmentIndex();
+        }
       }
     }
 
@@ -584,8 +643,8 @@ shaka.media.StreamingEngine = class {
     mediaState.segmentIterator = null;
     mediaState.adaptation = !!adaptation;
 
-    const streamTag = shaka.media.StreamingEngine.logPrefix_(mediaState);
-    shaka.log.debug('switch: switching to Stream ' + streamTag);
+    const newStreamTag = shaka.media.StreamingEngine.logPrefix_(mediaState);
+    shaka.log.debug('switch: switching to Stream ' + newStreamTag);
 
     if (clearBuffer) {
       if (mediaState.clearingBuffer) {
@@ -1169,6 +1228,8 @@ shaka.media.StreamingEngine = class {
       return;
     }
 
+    this.handleDeferredCloseSegmentIndexes_(mediaState);
+
     // Make sure the segment index exists. If not, create the segment index.
     if (!mediaState.stream.segmentIndex) {
       const thisStream = mediaState.stream;
@@ -1343,6 +1404,8 @@ shaka.media.StreamingEngine = class {
       return this.config_.updateIntervalSeconds / 2;
     }
 
+    // Lack of segment iterator is the best indicator stream has changed.
+    const streamChanged = !mediaState.segmentIterator;
     const reference = this.getSegmentReferenceNeeded_(
         mediaState, presentationTime, bufferEnd);
     if (!reference) {
@@ -1352,6 +1415,14 @@ shaka.media.StreamingEngine = class {
       // a SegmentReference eventually.
       return this.config_.updateIntervalSeconds;
     }
+    // Get media state adaptation and reset this value. By guarding it during
+    // actual stream change we ensure it won't be cleaned by accident on regular
+    // append.
+    let adaptation = false;
+    if (streamChanged && mediaState.adaptation) {
+      adaptation = true;
+      mediaState.adaptation = false;
+    }
 
     // Do not let any one stream get far ahead of any other.
     let minTimeNeeded = Infinity;
@@ -1390,7 +1461,8 @@ shaka.media.StreamingEngine = class {
       mediaState.segmentPrefetch.prefetchSegmentsByTime(reference.startTime);
     }
 
-    const p = this.fetchAndAppend_(mediaState, presentationTime, reference);
+    const p = this.fetchAndAppend_(mediaState, presentationTime, reference,
+        adaptation);
     p.catch(() => {});  // TODO(#1993): Handle asynchronous errors.
     return null;
   }
@@ -1512,9 +1584,10 @@ shaka.media.StreamingEngine = class {
    * @param {!shaka.media.StreamingEngine.MediaState_} mediaState
    * @param {number} presentationTime
    * @param {!shaka.media.SegmentReference} reference
+   * @param {boolean} adaptation
    * @private
    */
-  async fetchAndAppend_(mediaState, presentationTime, reference) {
+  async fetchAndAppend_(mediaState, presentationTime, reference, adaptation) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     const StreamingEngine = shaka.media.StreamingEngine;
     const logPrefix = StreamingEngine.logPrefix_(mediaState);
@@ -1543,7 +1616,7 @@ shaka.media.StreamingEngine = class {
             shaka.util.Error.Category.NETWORK,
             shaka.util.Error.Code.SEGMENT_MISSING);
       }
-      await this.initSourceBuffer_(mediaState, reference);
+      await this.initSourceBuffer_(mediaState, reference, adaptation);
       this.destroyer_.ensureNotDestroyed();
       if (this.fatalError_) {
         return;
@@ -1598,7 +1671,7 @@ shaka.media.StreamingEngine = class {
               remaining = remaining.subarray(offset);
               await this.append_(
                   mediaState, presentationTime, stream, reference, dataToAppend,
-                  /* isChunkedData= */ true);
+                  /* isChunkedData= */ true, adaptation);
 
               if (mediaState.segmentPrefetch && mediaState.segmentIterator) {
                 mediaState.segmentPrefetch.prefetchSegmentsByTime(
@@ -1637,8 +1710,8 @@ shaka.media.StreamingEngine = class {
             return;
           }
 
-          await this.append_(
-              mediaState, presentationTime, stream, reference, result);
+          await this.append_(mediaState, presentationTime, stream, reference,
+              result, /* chunkedData= */ false, adaptation);
         }
 
         if (mediaState.segmentPrefetch && mediaState.segmentIterator) {
@@ -1669,8 +1742,8 @@ shaka.media.StreamingEngine = class {
           return;
         }
 
-        await this.append_(
-            mediaState, presentationTime, stream, reference, result);
+        await this.append_(mediaState, presentationTime, stream, reference,
+            result, /* chunkedData= */ false, adaptation);
       }
 
       this.destroyer_.ensureNotDestroyed();
@@ -1911,14 +1984,17 @@ shaka.media.StreamingEngine = class {
    *
    * @param {shaka.media.StreamingEngine.MediaState_} mediaState
    * @param {!shaka.media.SegmentReference} reference
+   * @param {boolean} adaptation
    * @return {!Promise}
    * @private
    */
-  async initSourceBuffer_(mediaState, reference) {
+  async initSourceBuffer_(mediaState, reference, adaptation) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
     const MimeUtils = shaka.util.MimeUtils;
     const StreamingEngine = shaka.media.StreamingEngine;
     const logPrefix = StreamingEngine.logPrefix_(mediaState);
+    const nullLastReferences = mediaState.lastSegmentReference == null &&
+      mediaState.lastInitSegmentReference == null;
 
     /** @type {!Array.<!Promise>} */
     const operations = [];
@@ -2109,14 +2185,26 @@ shaka.media.StreamingEngine = class {
                 mediaState.type, initSegment);
             await this.playerInterface_.mediaSourceEngine.appendBuffer(
                 mediaState.type, initSegment, /* reference= */ null,
-                mediaState.stream, hasClosedCaptions);
+                mediaState.stream, hasClosedCaptions, mediaState.seeked,
+                adaptation);
           } catch (error) {
             mediaState.lastInitSegmentReference = null;
             throw error;
           }
         };
+        let initSegmentTime = reference.startTime;
+        if (nullLastReferences) {
+          const bufferEnd =
+            this.playerInterface_.mediaSourceEngine.bufferEnd(mediaState.type);
+          if (bufferEnd != null) {
+            // Adjust init segment appendance time if we have something in
+            // a buffer, i.e. due to running switchVariant() with non zero
+            // safe margin value.
+            initSegmentTime = bufferEnd;
+          }
+        }
         this.playerInterface_.onInitSegmentAppended(
-            reference.startTime, reference.initSegmentReference);
+            initSegmentTime, reference.initSegmentReference);
         operations.push(append());
       }
     }
@@ -2147,11 +2235,12 @@ shaka.media.StreamingEngine = class {
    * @param {!shaka.media.SegmentReference} reference
    * @param {BufferSource} segment
    * @param {boolean=} isChunkedData
+   * @param {boolean=} adaptation
    * @return {!Promise}
    * @private
    */
   async append_(mediaState, presentationTime, stream, reference, segment,
-      isChunkedData = false) {
+      isChunkedData = false, adaptation = false) {
     const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
 
     const hasClosedCaptions = stream.closedCaptions &&
@@ -2195,8 +2284,6 @@ shaka.media.StreamingEngine = class {
     // appendBuffer() call.
     const seeked = mediaState.seeked;
     mediaState.seeked = false;
-    const adaptation = mediaState.adaptation;
-    mediaState.adaptation = false;
 
     await this.playerInterface_.beforeAppendSegment(mediaState.type, segment);
     await this.playerInterface_.mediaSourceEngine.appendBuffer(

package/lib/media/video_wrapper.js

@@ -275,7 +275,8 @@ shaka.media.VideoWrapper.PlayheadMover = class {
     }
 
     // Yay! We were successful.
-    if (this.mediaElement_.currentTime != this.originTime_) {
+    if (this.mediaElement_.currentTime != this.originTime_ ||
+        this.mediaElement_.currentTime === this.targetTime_) {
       this.timer_.stop();
       return;
     }

package/lib/player.js

@@ -1728,7 +1728,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.dispatchEvent(shaka.Player.makeEvent_(
           shaka.util.FakeEvent.EventName.Loaded));
     } catch (error) {
-      if (error.code != shaka.util.Error.Code.LOAD_INTERRUPTED) {
+      if (error && error.code != shaka.util.Error.Code.LOAD_INTERRUPTED) {
         await this.unload(/* initializeMediaSource= */ false);
       }
       throw error;
@@ -2787,8 +2787,21 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     // By setting |src| we are done "loading" with src=. We don't need to set
     // the current time because |playhead| will do that for us.
-    mediaElement.src = this.cmcdManager_.appendSrcData(
-        this.assetUri_, mimeType);
+    let playbackUri = this.cmcdManager_.appendSrcData(this.assetUri_, mimeType);
+    // Apply temporal clipping using playRangeStart and playRangeEnd based
+    // in https://www.w3.org/TR/media-frags/
+    if (!playbackUri.includes('#t=') &&
+        (this.config_.playRangeStart > 0 ||
+        isFinite(this.config_.playRangeEnd))) {
+      playbackUri += '#t=';
+      if (this.config_.playRangeStart > 0) {
+        playbackUri += this.config_.playRangeStart;
+      }
+      if (isFinite(this.config_.playRangeEnd)) {
+        playbackUri += ',' + this.config_.playRangeEnd;
+      }
+    }
+    mediaElement.src = playbackUri;
 
     // Tizen 3 / WebOS won't load anything unless you call load() explicitly,
     // no matter the value of the preload attribute.  This is harmful on some
@@ -6166,10 +6179,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     let updateState = 'playing';
     if (this.bufferObserver_.getState() == State.STARVING) {
       updateState = 'buffering';
-    } else if (this.video_.paused) {
-      updateState = 'paused';
     } else if (this.video_.ended) {
       updateState = 'ended';
+    } else if (this.video_.paused) {
+      updateState = 'paused';
     }
     const stateChanged = history.update(updateState);
 
@@ -7072,18 +7085,25 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
   /**
    * Turn the media element's error object into a Shaka Player error object.
    *
+   * @param {boolean=} printAllErrors
    * @return {shaka.util.Error}
    * @private
    */
-  videoErrorToShakaError_() {
+  videoErrorToShakaError_(printAllErrors = true) {
     goog.asserts.assert(this.video_.error,
         'Video error expected, but missing!');
     if (!this.video_.error) {
+      if (printAllErrors) {
+        return new shaka.util.Error(
+            shaka.util.Error.Severity.CRITICAL,
+            shaka.util.Error.Category.MEDIA,
+            shaka.util.Error.Code.VIDEO_ERROR);
+      }
       return null;
     }
 
     const code = this.video_.error.code;
-    if (code == 1 /* MEDIA_ERR_ABORTED */) {
+    if (!printAllErrors && code == 1 /* MEDIA_ERR_ABORTED */) {
       // Ignore this error code, which should only occur when navigating away or
       // deliberately stopping playback of HTTP content.
       return null;
@@ -7115,7 +7135,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @private
    */
   onVideoError_(event) {
-    const error = this.videoErrorToShakaError_();
+    const error = this.videoErrorToShakaError_(/* printAllErrors= */ false);
     if (!error) {
       return;
     }
@@ -7484,7 +7504,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.9.21' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.23' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.