shaka-player 4.9.21 → 4.9.22

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/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

@@ -2012,7 +2012,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 +2054,7 @@ shaka.media.MediaSourceEngine = class {
       }
     }
 
-    const newCodec = MimeUtils.getCodecBase(
+    const newCodec = MimeUtils.getNormalizedCodec(
         MimeUtils.getCodecs(newMimeType));
     const newBasicType = MimeUtils.getBasicType(newMimeType);
 
@@ -2113,7 +2113,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 +2140,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,10 +1984,11 @@ 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;
@@ -2109,7 +2183,8 @@ 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;
@@ -2147,11 +2222,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 +2271,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

@@ -7484,7 +7484,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.22' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/ui_text_displayer.js

@@ -471,8 +471,8 @@ shaka.text.UITextDisplayer = class {
     const linesUnit = shaka.text.CueRegion.units.LINES;
     const percentageUnit = shaka.text.CueRegion.units.PERCENTAGE;
     const pixelUnit = shaka.text.CueRegion.units.PX;
-    const heightUnit = region.heightUnits == percentageUnit ? '%' : 'px';
-    const widthUnit = region.widthUnits == percentageUnit ? '%' : 'px';
+    let heightUnit = region.heightUnits == percentageUnit ? '%' : 'px';
+    let widthUnit = region.widthUnits == percentageUnit ? '%' : 'px';
     const viewportAnchorUnit =
         region.viewportAnchorUnits == percentageUnit ? '%' : 'px';
 
@@ -481,16 +481,19 @@ shaka.text.UITextDisplayer = class {
 
     regionElement.style.position = 'absolute';
 
+    let regionHeight = region.height;
+    let regionWidth = region.width;
+
     if (region.heightUnits === linesUnit) {
-      regionElement.style.height = region.height * lineHeightMultiple + '%';
-    } else {
-      regionElement.style.height = region.height + heightUnit;
+      regionHeight = region.height * lineHeightMultiple;
+      heightUnit = '%';
     }
     if (region.widthUnits === linesUnit) {
-      regionElement.style.width = region.width * lineWidthMultiple + '%';
-    } else {
-      regionElement.style.width = region.width + widthUnit;
+      regionWidth = region.width * lineWidthMultiple;
+      widthUnit = '%';
     }
+    regionElement.style.height = regionHeight + heightUnit;
+    regionElement.style.width = regionWidth + widthUnit;
 
     if (region.viewportAnchorUnits === linesUnit) {
       // from https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#positioning-in-cea-708
@@ -498,15 +501,15 @@ shaka.text.UITextDisplayer = class {
       const windowWidth = this.aspectRatio_ === 4/3 ? 160 : 210;
       let left = region.viewportAnchorX / windowWidth * 100;
       // adjust top and left values based on the region anchor and window size
-      top -= region.regionAnchorY * region.height * lineHeightMultiple / 100;
-      left -= region.regionAnchorX * region.width * lineWidthMultiple / 100;
+      top -= region.regionAnchorY * regionHeight / 100;
+      left -= region.regionAnchorX * regionWidth / 100;
       regionElement.style.top = top + '%';
       regionElement.style.left = left + '%';
     } else {
       regionElement.style.top = region.viewportAnchorY -
-        region.regionAnchorY * region.height / 100 + viewportAnchorUnit;
+        region.regionAnchorY * regionHeight / 100 + viewportAnchorUnit;
       regionElement.style.left = region.viewportAnchorX -
-        region.regionAnchorX * region.width / 100 + viewportAnchorUnit;
+        region.regionAnchorX * regionWidth / 100 + viewportAnchorUnit;
     }
     if (region.heightUnits !== pixelUnit &&
         region.widthUnits !== pixelUnit &&

package/lib/text/vtt_text_parser.js

@@ -160,9 +160,17 @@ shaka.text.VttTextParser = class {
           shaka.util.Error.Code.INVALID_TEXT_HEADER);
     }
 
-    const mpegTime = Number(mpegTimeMatch[1]);
+    let mpegTime = Number(mpegTimeMatch[1]);
     const mpegTimescale = shaka.text.VttTextParser.MPEG_TIMESCALE_;
 
+    const rolloverSeconds =
+        shaka.text.VttTextParser.TS_ROLLOVER_ / mpegTimescale;
+    let segmentStart = time.segmentStart - time.periodStart;
+    while (segmentStart >= rolloverSeconds) {
+      segmentStart -= rolloverSeconds;
+      mpegTime += shaka.text.VttTextParser.TS_ROLLOVER_;
+    }
+
     return time.periodStart + mpegTime / mpegTimescale - cueTime;
   }
 
@@ -1007,6 +1015,13 @@ shaka.text.VttTextParser = class {
  */
 shaka.text.VttTextParser.MPEG_TIMESCALE_ = 90000;
 
+/**
+ * At this value, timestamps roll over in TS content.
+ * @const {number}
+ * @private
+ */
+shaka.text.VttTextParser.TS_ROLLOVER_ = 0x200000000;
+
 /**
  * @const
  * @private {!RegExp}

package/lib/util/platform.js

@@ -749,10 +749,21 @@ shaka.util.Platform = class {
       maxResolution.width = 1920;
       maxResolution.height = 1080;
       try {
+        let winRT = undefined;
+
+        // Try to access to WinRT for WebView, if it's not defined,
+        // try to access to WinRT for WebView2, if it's not defined either,
+        // let it throw.
+        if (typeof Windows !== 'undefined') {
+          winRT = Windows;
+        } else {
+          winRT = chrome.webview.hostObjects.sync.Windows;
+        }
+
         const protectionCapabilities =
-            new Windows.Media.Protection.ProtectionCapabilities();
+            new winRT.Media.Protection.ProtectionCapabilities();
         const protectionResult =
-            Windows.Media.Protection.ProtectionCapabilityResult;
+            winRT.Media.Protection.ProtectionCapabilityResult;
         // isTypeSupported may return "maybe", which means the operation is not
         // completed. This means we need to retry
         // https://learn.microsoft.com/en-us/uwp/api/windows.media.protection.protectioncapabilityresult?view=winrt-22621

package/lib/util/stream_utils.js

@@ -374,6 +374,9 @@ shaka.util.StreamUtils = class {
     goog.asserts.assert(navigator.mediaCapabilities,
         'MediaCapabilities should be valid.');
 
+    if (shaka.util.Platform.isXboxOne()) {
+      shaka.util.StreamUtils.overrideDolbyVisionCodecs(manifest.variants);
+    }
     await shaka.util.StreamUtils.getDecodingInfosForVariants(
         manifest.variants, usePersistentLicenses, /* srcEquals= */ false,
         preferredKeySystems);
@@ -400,6 +403,40 @@ shaka.util.StreamUtils = class {
   }
 
 
+  /**
+   * Maps Dolby Vision codecs to H.264 and H.265 equivalents as a workaround
+   * to make Dolby Vision playback work on some platforms.
+   *
+   * Mapping is done according to the relevant Dolby documentation found here:
+   * https://professionalsupport.dolby.com/s/article/How-to-signal-Dolby-Vision-in-MPEG-DASH?language=en_US
+   * @param {!Array<!shaka.extern.Variant>} variants
+   */
+  static overrideDolbyVisionCodecs(variants) {
+    /** @type {!Object<string, string>} */
+    const codecMap = {
+      'dvav': 'avc3',
+      'dva1': 'avc1',
+      'dvhe': 'hev1',
+      'dvh1': 'hvc1',
+    };
+    /** @type {!Set<!shaka.extern.Stream>} */
+    const streams = new Set();
+    for (const variant of variants) {
+      if (variant.video) {
+        streams.add(variant.video);
+      }
+    }
+    for (const video of streams) {
+      for (const dvCodec of Object.keys(codecMap)) {
+        if (video.codecs.includes(dvCodec)) {
+          video.codecs = video.codecs.replace(dvCodec, codecMap[dvCodec]);
+          break;
+        }
+      }
+    }
+  }
+
+
   /**
    * @param {!shaka.extern.Variant} variant
    * @param {?string} keySystem

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.9.21",
+  "version": "4.9.22",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -36,7 +36,7 @@
     "google-closure-library": "^20221102.0.0",
     "htmlhint": "^1.1.3",
     "jasmine-ajax": "^4.0.0",
-    "jimp": "^0.16.1",
+    "jimp": "^0.22.12",
     "js-yaml": "^4.1.0",
     "jsdoc": "github:joeyparrish/jsdoc#2ca85bb6",
     "karma": "github:joeyparrish/karma#shaka-fixes",
@@ -50,7 +50,7 @@
     "karma-webdriver-launcher": "^1.0.8",
     "lcevc_dec.js": "^1.1.3",
     "less": "^4.2.0",
-    "less-plugin-clean-css": "github:austingardner/less-plugin-clean-css#4e9e77bf",
+    "less-plugin-clean-css": "^1.6.0",
     "material-design-lite": "^1.3.0",
     "open-sans-fonts": "^1.6.2",
     "postcss-less": "^6.0.0",