shaka-player 4.10.2 → 4.10.3

package/lib/ads/interstitial_ad_manager.js

@@ -108,7 +108,8 @@ shaka.ads.InterstitialAdManager = class {
         const interstitials = Array.from(this.interstitials_);
         const seekRange = this.basePlayer_.seekRange();
         for (const interstitial of interstitials) {
-          if ((seekRange.start - interstitial.startTime) >= 1) {
+          const comparisonTime = interstitial.endTime || interstitial.startTime;
+          if ((seekRange.start - comparisonTime) >= 1) {
             if (this.preloadManagerInterstitials_.has(interstitial)) {
               const preloadManager =
                   // eslint-disable-next-line no-await-in-loop

package/lib/media/media_source_engine.js

@@ -151,6 +151,15 @@ shaka.media.MediaSourceEngine = class {
 
     /** @private {?shaka.util.TsParser} */
     this.tsParser_ = null;
+
+    /** @private {?number} */
+    this.firstVideoTimestamp_ = null;
+
+    /** @private {?number} */
+    this.firstAudioTimestamp_ = null;
+
+    /** @private {!shaka.util.PublicPromise.<number>} */
+    this.audioCompensation_ = new shaka.util.PublicPromise();
   }
 
   /**
@@ -924,6 +933,24 @@ shaka.media.MediaSourceEngine = class {
       const timestamp = this.getTimestampAndDispatchMetadata_(
           contentType, data, reference, mimeType, timestampOffset);
       if (timestamp != null) {
+        if (this.firstVideoTimestamp_ == null &&
+            contentType == ContentType.VIDEO) {
+          this.firstVideoTimestamp_ = timestamp;
+          if (this.firstAudioTimestamp_ != null) {
+            const compensation =
+                this.firstVideoTimestamp_ - this.firstAudioTimestamp_;
+            this.audioCompensation_.resolve(compensation);
+          }
+        }
+        if (this.firstAudioTimestamp_ == null &&
+            contentType == ContentType.AUDIO) {
+          this.firstAudioTimestamp_ = timestamp;
+          if (this.firstVideoTimestamp_ != null) {
+            const compensation =
+                this.firstVideoTimestamp_ - this.firstAudioTimestamp_;
+            this.audioCompensation_.resolve(compensation);
+          }
+        }
         const calculatedTimestampOffset = reference.startTime - timestamp;
         const timestampOffsetDifference =
             Math.abs(timestampOffset - calculatedTimestampOffset);
@@ -992,7 +1019,19 @@ shaka.media.MediaSourceEngine = class {
       // and are either performing an unbuffered seek or handling an automatic
       // adaptation, we need to set a new timestampOffset on the sourceBuffer.
       if (seeked || adaptation) {
-        const timestampOffset = reference.startTime;
+        let timestampOffset = reference.startTime;
+        // Audio and video may not be aligned, so we will compensate for audio
+        // if necessary.
+        if (this.manifestType_ == shaka.media.ManifestParser.HLS &&
+            !this.needSplitMuxedContent_ &&
+            contentType == ContentType.AUDIO &&
+            this.sourceBuffers_[ContentType.VIDEO]) {
+          const compensation = await this.audioCompensation_;
+          // Only apply compensation if the difference is greater than 100ms
+          if (Math.abs(compensation) > 0.1) {
+            timestampOffset -= compensation;
+          }
+        }
         // The logic to call abort() before setting the timestampOffset is
         // extended during unbuffered seeks or automatic adaptations; it is
         // possible for the append state to be PARSING_MEDIA_SEGMENT from the

package/lib/media/segment_utils.js

@@ -218,21 +218,18 @@ shaka.media.SegmentUtils = class {
 
     const genericVideoBox = (box) => {
       baseBox = box.name;
-      Mp4Parser.visualSampleEntry(box);
+      const parsedVisualSampleEntryBox =
+          shaka.util.Mp4BoxParsers.visualSampleEntry(box.reader);
+      width = String(parsedVisualSampleEntryBox.width);
+      height = String(parsedVisualSampleEntryBox.height);
+      if (box.reader.hasMoreData()) {
+        Mp4Parser.children(box);
+      }
     };
 
     new Mp4Parser()
         .box('moov', Mp4Parser.children)
         .box('trak', Mp4Parser.children)
-        .fullBox('tkhd', (box) => {
-          goog.asserts.assert(
-              box.version != null,
-              'TKHD is a full box and should have a valid version.');
-          const parsedTKHDBox = shaka.util.Mp4BoxParsers.parseTKHD(
-              box.reader, box.version);
-          height = String(parsedTKHDBox.height);
-          width = String(parsedTKHDBox.width);
-        })
         .box('mdia', Mp4Parser.children)
         .fullBox('mdhd', (box) => {
           goog.asserts.assert(

package/lib/player.js

@@ -7809,7 +7809,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.10.2' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.10.3' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/cue.js

@@ -5,8 +5,8 @@
  */
 
 goog.provide('shaka.text.Cue');
-goog.provide('shaka.text.CueRegion');
 
+goog.require('shaka.text.CueRegion');
 goog.require('shaka.util.ArrayUtils');
 
 
@@ -553,119 +553,3 @@ shaka.text.Cue.textDecoration = {
   'LINE_THROUGH': 'lineThrough',
   'OVERLINE': 'overline',
 };
-
-
-/**
- * @export
- */
-shaka.text.CueRegion = class {
-  /** */
-  constructor() {
-    const CueRegion = shaka.text.CueRegion;
-
-    /**
-     * Region identifier.
-     * @type {string}
-     * @export
-     */
-    this.id = '';
-
-    /**
-     * The X offset to start the rendering area in viewportAnchorUnits of the
-     * video width.
-     * @type {number}
-     * @export
-     */
-    this.viewportAnchorX = 0;
-
-    /**
-     * The X offset to start the rendering area in viewportAnchorUnits of the
-     * video height.
-     * @type {number}
-     * @export
-     */
-    this.viewportAnchorY = 0;
-
-    /**
-     * The X offset to start the rendering area in percentage (0-100) of this
-     * region width.
-     * @type {number}
-     * @export
-     */
-    this.regionAnchorX = 0;
-
-    /**
-     * The Y offset to start the rendering area in percentage (0-100) of the
-     * region height.
-     * @type {number}
-     * @export
-     */
-    this.regionAnchorY = 0;
-
-    /**
-     * The width of the rendering area in widthUnits.
-     * @type {number}
-     * @export
-     */
-    this.width = 100;
-
-    /**
-     * The width of the rendering area in heightUnits.
-     * @type {number}
-     * @export
-     */
-    this.height = 100;
-
-    /**
-     * The units (percentage, pixels or lines) the region height is in.
-     * @type {shaka.text.CueRegion.units}
-     * @export
-     */
-    this.heightUnits = CueRegion.units.PERCENTAGE;
-
-    /**
-     * The units (percentage or pixels) the region width is in.
-     * @type {shaka.text.CueRegion.units}
-     * @export
-     */
-    this.widthUnits = CueRegion.units.PERCENTAGE;
-
-    /**
-     * The units (percentage or pixels) the region viewportAnchors are in.
-     * @type {shaka.text.CueRegion.units}
-     * @export
-     */
-    this.viewportAnchorUnits = CueRegion.units.PERCENTAGE;
-
-    /**
-     * If scroll=UP, it means that cues in the region will be added to the
-     * bottom of the region and will push any already displayed cues in the
-     * region up.  Otherwise (scroll=NONE) cues will stay fixed at the location
-     * they were first painted in.
-     * @type {shaka.text.CueRegion.scrollMode}
-     * @export
-     */
-    this.scroll = CueRegion.scrollMode.NONE;
-  }
-};
-
-
-/**
- * @enum {number}
- * @export
- */
-shaka.text.CueRegion.units = {
-  'PX': 0,
-  'PERCENTAGE': 1,
-  'LINES': 2,
-};
-
-
-/**
- * @enum {string}
- * @export
- */
-shaka.text.CueRegion.scrollMode = {
-  'NONE': '',
-  'UP': 'up',
-};

package/lib/text/cue_region.js

@@ -0,0 +1,123 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.provide('shaka.text.CueRegion');
+
+
+/**
+ * @export
+ */
+shaka.text.CueRegion = class {
+  /** */
+  constructor() {
+    const CueRegion = shaka.text.CueRegion;
+
+    /**
+     * Region identifier.
+     * @type {string}
+     * @export
+     */
+    this.id = '';
+
+    /**
+     * The X offset to start the rendering area in viewportAnchorUnits of the
+     * video width.
+     * @type {number}
+     * @export
+     */
+    this.viewportAnchorX = 0;
+
+    /**
+     * The X offset to start the rendering area in viewportAnchorUnits of the
+     * video height.
+     * @type {number}
+     * @export
+     */
+    this.viewportAnchorY = 0;
+
+    /**
+     * The X offset to start the rendering area in percentage (0-100) of this
+     * region width.
+     * @type {number}
+     * @export
+     */
+    this.regionAnchorX = 0;
+
+    /**
+     * The Y offset to start the rendering area in percentage (0-100) of the
+     * region height.
+     * @type {number}
+     * @export
+     */
+    this.regionAnchorY = 0;
+
+    /**
+     * The width of the rendering area in widthUnits.
+     * @type {number}
+     * @export
+     */
+    this.width = 100;
+
+    /**
+     * The width of the rendering area in heightUnits.
+     * @type {number}
+     * @export
+     */
+    this.height = 100;
+
+    /**
+     * The units (percentage, pixels or lines) the region height is in.
+     * @type {shaka.text.CueRegion.units}
+     * @export
+     */
+    this.heightUnits = CueRegion.units.PERCENTAGE;
+
+    /**
+     * The units (percentage or pixels) the region width is in.
+     * @type {shaka.text.CueRegion.units}
+     * @export
+     */
+    this.widthUnits = CueRegion.units.PERCENTAGE;
+
+    /**
+     * The units (percentage or pixels) the region viewportAnchors are in.
+     * @type {shaka.text.CueRegion.units}
+     * @export
+     */
+    this.viewportAnchorUnits = CueRegion.units.PERCENTAGE;
+
+    /**
+     * If scroll=UP, it means that cues in the region will be added to the
+     * bottom of the region and will push any already displayed cues in the
+     * region up.  Otherwise (scroll=NONE) cues will stay fixed at the location
+     * they were first painted in.
+     * @type {shaka.text.CueRegion.scrollMode}
+     * @export
+     */
+    this.scroll = CueRegion.scrollMode.NONE;
+  }
+};
+
+
+/**
+ * @enum {number}
+ * @export
+ */
+shaka.text.CueRegion.units = {
+  'PX': 0,
+  'PERCENTAGE': 1,
+  'LINES': 2,
+};
+
+
+/**
+ * @enum {string}
+ * @export
+ */
+shaka.text.CueRegion.scrollMode = {
+  'NONE': '',
+  'UP': 'up',
+};

package/lib/text/ui_text_displayer.js

@@ -468,7 +468,9 @@ shaka.text.UITextDisplayer = class {
 
     const regionElement = shaka.util.Dom.createHTMLElement('span');
 
+    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';
     const viewportAnchorUnit =
@@ -479,12 +481,14 @@ shaka.text.UITextDisplayer = class {
 
     regionElement.style.position = 'absolute';
 
-    const linesUnit = shaka.text.CueRegion.units.LINES;
-    if (region.heightUnits === linesUnit && region.widthUnits === linesUnit) {
+    if (region.heightUnits === linesUnit) {
       regionElement.style.height = region.height * lineHeightMultiple + '%';
-      regionElement.style.width = region.width * lineWidthMultiple + '%';
     } else {
       regionElement.style.height = region.height + heightUnit;
+    }
+    if (region.widthUnits === linesUnit) {
+      regionElement.style.width = region.width * lineWidthMultiple + '%';
+    } else {
       regionElement.style.width = region.width + widthUnit;
     }
 
@@ -504,6 +508,19 @@ shaka.text.UITextDisplayer = class {
       regionElement.style.left = region.viewportAnchorX -
         region.regionAnchorX * region.width / 100 + viewportAnchorUnit;
     }
+    if (region.heightUnits !== pixelUnit &&
+        region.widthUnits !== pixelUnit &&
+        region.viewportAnchorUnits !== pixelUnit) {
+      // Clip region
+      const top = parseInt(regionElement.style.top.slice(0, -1), 10) || 0;
+      const left = parseInt(regionElement.style.left.slice(0, -1), 10) || 0;
+      const height = parseInt(regionElement.style.height.slice(0, -1), 10) || 0;
+      const width = parseInt(regionElement.style.width.slice(0, -1), 10) || 0;
+      const realTop = Math.max(0, Math.min(100 - height, top));
+      const realLeft = Math.max(0, Math.min(100 - width, left));
+      regionElement.style.top = realTop + '%';
+      regionElement.style.left = realLeft + '%';
+    }
 
     regionElement.style.display = 'flex';
     regionElement.style.flexDirection = 'column';

package/lib/util/mp4_box_parsers.js

@@ -274,6 +274,35 @@ shaka.util.Mp4BoxParsers = class {
     };
   }
 
+
+  /**
+   * Parses an visual sample entry box.
+   * @param {!shaka.util.DataViewReader} reader
+   * @return {!shaka.util.ParsedVisualSampleEntryBox}
+   */
+  static visualSampleEntry(reader) {
+    // Skip 6 reserved bytes.
+    // Skip 2-byte data reference index.
+    // Skip 16 more reserved bytes.
+    reader.skip(24);
+    // 4 bytes for width/height.
+    const width = reader.readUint16();
+    const height = reader.readUint16();
+    // Skip 8 bytes for horizontal/vertical resolution.
+    // Skip 4 more reserved bytes (0)
+    // Skip 2-byte frame count.
+    // Skip 32-byte compressor name (length byte, then name, then 0-padding).
+    // Skip 2-byte depth.
+    // Skip 2 more reserved bytes (0xff)
+    reader.skip(50);
+
+    return {
+      width: width,
+      height: height,
+    };
+  }
+
+
   /**
    * Parses an audio sample entry box.
    * @param {!shaka.util.DataViewReader} reader
@@ -866,6 +895,19 @@ shaka.util.ParsedFRMABox;
  */
 shaka.util.ParsedTENCBox;
 
+/**
+ * @typedef {{
+ *    width: number,
+ *    height: number
+ *  }}
+ *
+ * @property {number} width
+ * @property {number} height
+ *
+ * @exportDoc
+ */
+shaka.util.ParsedVisualSampleEntryBox;
+
 /**
  * @typedef {{
  *    channelCount: number,

package/lib/util/platform.js

@@ -727,15 +727,17 @@ shaka.util.Platform = class {
             'screen size 1920x1080.');
       }
     } else if (Platform.isXboxOne()) {
-      const protectionCapabilities =
-          new Windows.Media.Protection.ProtectionCapabilities();
-      const protectionResult =
-          Windows.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
-      let result = null;
+      maxResolution.width = 1920;
+      maxResolution.height = 1080;
       try {
+        const protectionCapabilities =
+            new Windows.Media.Protection.ProtectionCapabilities();
+        const protectionResult =
+            Windows.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
+        let result = null;
         const type =
             'video/mp4;codecs="hvc1,mp4a";features="decode-res-x=3840,' +
             'decode-res-y=2160,decode-bitrate=20000,decode-fps=30,' +
@@ -745,15 +747,13 @@ shaka.util.Platform = class {
         do {
           result = protectionCapabilities.isTypeSupported(type, keySystem);
         } while (result === protectionResult.maybe);
+        if (result === protectionResult.probably) {
+          maxResolution.width = 3840;
+          maxResolution.height = 2160;
+        }
       } catch (e) {
-        result = protectionResult.notSupported;
-      }
-      if (result === protectionResult.probably) {
-        maxResolution.width = 3840;
-        maxResolution.height = 2160;
-      } else {
-        maxResolution.width = 1920;
-        maxResolution.height = 1080;
+        shaka.log.alwaysWarn('Xbox: Error detecting screen size, default ' +
+            'screen size 1920x1080.');
       }
     } else if (Platform.isWebOS()) {
       try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.10.2",
+  "version": "4.10.3",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

package/ui/seek_bar.js

@@ -396,15 +396,14 @@ shaka.ui.SeekBar = class extends shaka.ui.RangeElement {
       // Post-roll ads are marked as starting at -1 in CS IMA ads.
       if (point.start == -1 && !point.end) {
         postRollAd = true;
+        continue;
       }
       // Filter point within the seek range. For points with no endpoint
       // (client side ads) check that the start point is within range.
-      if (point.start >= seekRange.start && point.start < seekRange.end) {
-        if (point.end && point.end > seekRange.end) {
-          continue;
-        }
-
-        const startDist = point.start - seekRange.start;
+      if ((!point.end && point.start >= seekRange.start) ||
+          (typeof point.end == 'number' && point.end > seekRange.start)) {
+        const startDist =
+            Math.max(point.start, seekRange.start) - seekRange.start;
         const startFrac = (startDist / seekRangeSize) || 0;
         // For points with no endpoint assume a 1% length: not too much,
         // but enough to be visible on the timeline.