shaka-player 4.10.2 → 4.10.4

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
@@ -646,12 +647,12 @@ shaka.ads.InterstitialAdManager = class {
         const dataAsJson =
         /** @type {!shaka.ads.InterstitialAdManager.AssetsList} */ (
             JSON.parse(data));
-        for (const asset of dataAsJson.ASSETS) {
-          if (asset.URI) {
+        for (const asset of dataAsJson['ASSETS']) {
+          if (asset['URI']) {
             interstitialsAd.push({
               startTime: interstitial.startTime,
               endTime: interstitial.endTime,
-              uri: asset.URI,
+              uri: asset['URI'],
               isSkippable,
               canJump,
               resumeOffset,

package/lib/hls/hls_parser.js

@@ -1019,7 +1019,7 @@ shaka.hls.HlsParser = class {
     if (!segments.length) {
       return defaultBasicInfo;
     }
-    const segment = this.getAvailableSegment_(segments);
+    const {segment, segmentIndex} = this.getAvailableSegment_(segments);
     const segmentUris = segment.getUris();
     const segmentUri = segmentUris[0];
     const parsedUri = new goog.Uri(segmentUri);
@@ -1044,6 +1044,10 @@ shaka.hls.HlsParser = class {
       const initResponse = await this.makeNetworkRequest_(
           initSegmentRequest, requestType, {type: initType});
       initData = initResponse.data;
+      if (initSegmentRef.aesKey) {
+        initData = await shaka.media.SegmentUtils.aesDecrypt(
+            initData, initSegmentRef.aesKey, 0);
+      }
 
       initMimeType = initResponse.headers['content-type'];
       if (initMimeType) {
@@ -1058,6 +1062,11 @@ shaka.hls.HlsParser = class {
     const type = shaka.net.NetworkingEngine.AdvancedRequestType.MEDIA_SEGMENT;
     const response = await this.makeNetworkRequest_(
         segmentRequest, requestType, {type});
+    let data = response.data;
+    if (segment.aesKey) {
+      data = await shaka.media.SegmentUtils.aesDecrypt(
+          data, segment.aesKey, segmentIndex);
+    }
 
     let contentMimeType = response.headers['content-type'];
     if (contentMimeType) {
@@ -1085,9 +1094,9 @@ shaka.hls.HlsParser = class {
     ];
 
     if (shaka.util.TsParser.probe(
-        shaka.util.BufferUtils.toUint8(response.data))) {
+        shaka.util.BufferUtils.toUint8(data))) {
       const basicInfo =
-          shaka.media.SegmentUtils.getBasicInfoFromTs(response.data);
+          shaka.media.SegmentUtils.getBasicInfoFromTs(data);
       if (basicInfo) {
         return basicInfo;
       }
@@ -1095,7 +1104,7 @@ shaka.hls.HlsParser = class {
         validMp4MimeType.includes(contentMimeType) ||
         (initMimeType && validMp4MimeType.includes(initMimeType))) {
       const basicInfo = shaka.media.SegmentUtils.getBasicInfoFromMp4(
-          initData, response.data);
+          initData, data);
       if (basicInfo) {
         return basicInfo;
       }
@@ -1579,7 +1588,7 @@ shaka.hls.HlsParser = class {
       videoLayout = videoLayout || 'CH-MONO';
 
       const streamInfos = this.createStreamInfosForVariantTags_(tags,
-          mediaTags, resolution, frameRate, bandwidth);
+          mediaTags, resolution, frameRate);
 
       goog.asserts.assert(streamInfos.audio.length ||
           streamInfos.video.length, 'We should have created a stream!');
@@ -1607,12 +1616,10 @@ shaka.hls.HlsParser = class {
    * @param {!Array.<!shaka.hls.Tag>} mediaTags
    * @param {?string} resolution
    * @param {?string} frameRate
-   * @param {number} bandwidth
    * @return {!shaka.hls.HlsParser.StreamInfos}
    * @private
    */
-  createStreamInfosForVariantTags_(
-      tags, mediaTags, resolution, frameRate, bandwidth) {
+  createStreamInfosForVariantTags_(tags, mediaTags, resolution, frameRate) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
     /** @type {shaka.hls.HlsParser.StreamInfos} */
@@ -1747,9 +1754,6 @@ shaka.hls.HlsParser = class {
       if (globalGroupId) {
         streamInfo.stream.groupId = globalGroupId;
       }
-      if (!streamInfos.length) {
-        streamInfo.stream.bandwidth = bandwidth;
-      }
       res[streamInfo.stream.type] = [streamInfo];
     }
     return res;
@@ -1971,6 +1975,12 @@ shaka.hls.HlsParser = class {
           videoStream.drmInfos = drmInfos;
           videoStream.keyIds = keyIds;
         }
+        if (videoStream && !audioStream) {
+          videoStream.bandwidth = bandwidth;
+        }
+        if (!videoStream && audioStream) {
+          audioStream.bandwidth = bandwidth;
+        }
         const audioDrmInfos = audioInfo ? audioInfo.stream.drmInfos : null;
         const videoDrmInfos = videoInfo ? videoInfo.stream.drmInfos : null;
         const videoStreamUri =
@@ -4224,7 +4234,7 @@ shaka.hls.HlsParser = class {
 
   /**
    * @param {!Array.<!shaka.media.SegmentReference>} segments
-   * @return {!shaka.media.SegmentReference}
+   * @return {{segment: !shaka.media.SegmentReference, segmentIndex: number}}
    * @private
    */
   getAvailableSegment_(segments) {
@@ -4241,7 +4251,7 @@ shaka.hls.HlsParser = class {
       segmentIndex ++;
       segment = segments[segmentIndex];
     }
-    return segment;
+    return {segment, segmentIndex};
   }
 
   /**
@@ -4257,7 +4267,7 @@ shaka.hls.HlsParser = class {
     const HlsParser = shaka.hls.HlsParser;
     const requestType = shaka.net.NetworkingEngine.RequestType.SEGMENT;
 
-    const segment = this.getAvailableSegment_(segments);
+    const {segment} = this.getAvailableSegment_(segments);
 
     if (segment.status == shaka.media.SegmentReference.Status.MISSING) {
       return this.guessMimeTypeFallback_(contentType);

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/playhead.js

@@ -18,6 +18,7 @@ goog.require('shaka.media.VideoWrapper');
 goog.require('shaka.util.EventManager');
 goog.require('shaka.util.IReleasable');
 goog.require('shaka.util.MediaReadyState');
+goog.require('shaka.util.Platform');
 goog.require('shaka.util.Timer');
 goog.requireType('shaka.media.PresentationTimeline');
 
@@ -420,12 +421,20 @@ shaka.media.MediaSourcePlayhead = class {
 
     const gapLimit = shaka.media.GapJumpingController.BROWSER_GAP_TOLERANCE;
     if (Math.abs(targetTime - currentTime) > gapLimit) {
-      // You can only seek like this every so often. This is to prevent an
-      // infinite loop on systems where changing currentTime takes a significant
-      // amount of time (e.g. Chromecast).
-      const time = Date.now() / 1000;
-      if (!this.lastCorrectiveSeek_ || this.lastCorrectiveSeek_ < time - 1) {
-        this.lastCorrectiveSeek_ = time;
+      let canCorrectiveSeek = false;
+      if (shaka.util.Platform.isSeekingSlow()) {
+        // You can only seek like this every so often. This is to prevent an
+        // infinite loop on systems where changing currentTime takes a
+        // significant amount of time (e.g. Chromecast).
+        const time = Date.now() / 1000;
+        if (!this.lastCorrectiveSeek_ || this.lastCorrectiveSeek_ < time - 1) {
+          this.lastCorrectiveSeek_ = time;
+          canCorrectiveSeek = true;
+        }
+      } else {
+        canCorrectiveSeek = true;
+      }
+      if (canCorrectiveSeek) {
         this.videoWrapper_.setTime(targetTime);
         return;
       }

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(
@@ -537,6 +534,47 @@ shaka.media.SegmentUtils = class {
         .parse(data, /* partialOkay= */ true);
     return defaultKID;
   }
+
+  /**
+   * @param {!BufferSource} rawResult
+   * @param {shaka.extern.aesKey} aesKey
+   * @param {number} position
+   * @return {!Promise.<!BufferSource>}
+   */
+  static async aesDecrypt(rawResult, aesKey, position) {
+    const key = aesKey;
+    if (!key.cryptoKey) {
+      goog.asserts.assert(key.fetchKey, 'If AES cryptoKey was not ' +
+          'preloaded, fetchKey function should be provided');
+      await key.fetchKey();
+      goog.asserts.assert(key.cryptoKey, 'AES cryptoKey should now be set');
+    }
+    let iv = key.iv;
+    if (!iv) {
+      iv = shaka.util.BufferUtils.toUint8(new ArrayBuffer(16));
+      let sequence = key.firstMediaSequenceNumber + position;
+      for (let i = iv.byteLength - 1; i >= 0; i--) {
+        iv[i] = sequence & 0xff;
+        sequence >>= 8;
+      }
+    }
+    let algorithm;
+    if (aesKey.blockCipherMode == 'CBC') {
+      algorithm = {
+        name: 'AES-CBC',
+        iv,
+      };
+    } else {
+      algorithm = {
+        name: 'AES-CTR',
+        counter: iv,
+        // NIST SP800-38A standard suggests that the counter should occupy half
+        // of the counter block
+        length: 64,
+      };
+    }
+    return window.crypto.subtle.decrypt(algorithm, key.cryptoKey, rawResult);
+  }
 };
 
 

package/lib/media/streaming_engine.js

@@ -18,9 +18,9 @@ goog.require('shaka.media.MediaSourceEngine');
 goog.require('shaka.media.SegmentIterator');
 goog.require('shaka.media.SegmentReference');
 goog.require('shaka.media.SegmentPrefetch');
+goog.require('shaka.media.SegmentUtils');
 goog.require('shaka.net.Backoff');
 goog.require('shaka.net.NetworkingEngine');
-goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.DelayedTick');
 goog.require('shaka.util.Destroyer');
 goog.require('shaka.util.Error');
@@ -769,25 +769,16 @@ shaka.media.StreamingEngine = class {
       const mediaState = this.mediaStates_.get(type);
       const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
 
-      let segment = null;
-      if (mediaState.segmentIterator) {
-        segment = mediaState.segmentIterator.current();
-      }
-      if (mediaState.segmentPrefetch) {
-        mediaState.segmentPrefetch.resetPosition();
-      }
-      if (mediaState.type === ContentType.AUDIO) {
-        for (const prefetch of this.audioPrefetchMap_.values()) {
-          prefetch.resetPosition();
+      if (!newTimeIsBuffered(type)) {
+        if (mediaState.segmentPrefetch) {
+          mediaState.segmentPrefetch.resetPosition();
+        }
+        if (mediaState.type === ContentType.AUDIO) {
+          for (const prefetch of this.audioPrefetchMap_.values()) {
+            prefetch.resetPosition();
+          }
         }
-      }
-      // Only reset the iterator if we seek outside the current segment.
-      if (!segment || segment.startTime > presentationTime ||
-          segment.endTime < presentationTime) {
         mediaState.segmentIterator = null;
-      }
-
-      if (!newTimeIsBuffered(type)) {
         const bufferEnd =
             this.playerInterface_.mediaSourceEngine.bufferEnd(type);
         const somethingBuffered = bufferEnd != null;
@@ -1400,7 +1391,7 @@ shaka.media.StreamingEngine = class {
 
     if (mediaState.segmentPrefetch && mediaState.segmentIterator &&
         !this.audioPrefetchMap_.has(mediaState.stream)) {
-      mediaState.segmentPrefetch.evict(presentationTime);
+      mediaState.segmentPrefetch.evict(reference.startTime);
       mediaState.segmentPrefetch.prefetchSegmentsByTime(reference.startTime);
     }
 
@@ -1758,48 +1749,6 @@ shaka.media.StreamingEngine = class {
     }
   }
 
-  /**
-   * @param {!BufferSource} rawResult
-   * @param {shaka.extern.aesKey} aesKey
-   * @param {number} position
-   * @return {!Promise.<!BufferSource>} finalResult
-   * @private
-   */
-  async aesDecrypt_(rawResult, aesKey, position) {
-    const key = aesKey;
-    if (!key.cryptoKey) {
-      goog.asserts.assert(key.fetchKey, 'If AES cryptoKey was not ' +
-          'preloaded, fetchKey function should be provided');
-      await key.fetchKey();
-      goog.asserts.assert(key.cryptoKey, 'AES cryptoKey should now be set');
-    }
-    let iv = key.iv;
-    if (!iv) {
-      iv = shaka.util.BufferUtils.toUint8(new ArrayBuffer(16));
-      let sequence = key.firstMediaSequenceNumber + position;
-      for (let i = iv.byteLength - 1; i >= 0; i--) {
-        iv[i] = sequence & 0xff;
-        sequence >>= 8;
-      }
-    }
-    let algorithm;
-    if (aesKey.blockCipherMode == 'CBC') {
-      algorithm = {
-        name: 'AES-CBC',
-        iv,
-      };
-    } else {
-      algorithm = {
-        name: 'AES-CTR',
-        counter: iv,
-        // NIST SP800-38A standard suggests that the counter should occupy half
-        // of the counter block
-        length: 64,
-      };
-    }
-    return window.crypto.subtle.decrypt(algorithm, key.cryptoKey, rawResult);
-  }
-
 
   /**
    * Clear per-stream error states and retry any failed streams.
@@ -2576,7 +2525,8 @@ shaka.media.StreamingEngine = class {
     mediaState.operation = null;
     let result = response.data;
     if (reference.aesKey) {
-      result = await this.aesDecrypt_(result, reference.aesKey, position);
+      result = await shaka.media.SegmentUtils.aesDecrypt(
+          result, reference.aesKey, position);
     }
     return result;
   }

package/lib/player.js

@@ -4862,13 +4862,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    */
   selectVariantTrack(track, clearBuffer = false, safeMargin = 0) {
     if (this.manifest_ && this.streamingEngine_) {
-      if (this.config_.abr.enabled) {
-        shaka.log.alwaysWarn('Changing tracks while abr manager is enabled ' +
-                             'will likely result in the selected track ' +
-                             'being overriden. Consider disabling abr before ' +
-                             'calling selectVariantTrack().');
-      }
-
       const variant = this.manifest_.variants.find(
           (variant) => variant.id == track.id);
       if (!variant) {
@@ -4885,6 +4878,17 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         return;
       }
 
+      const active = this.streamingEngine_.getCurrentVariant();
+      if (this.config_.abr.enabled && (active.video != variant.video ||
+          (active.audio && variant.audio &&
+          active.audio.language == variant.audio.language &&
+          active.audio.channelsCount == variant.audio.channelsCount))) {
+        shaka.log.alwaysWarn('Changing tracks while abr manager is enabled ' +
+                             'will likely result in the selected track ' +
+                             'being overriden. Consider disabling abr before ' +
+                             'calling selectVariantTrack().');
+      }
+
       this.switchVariant_(
           variant, /* fromAdaptation= */ false, clearBuffer, safeMargin);
 
@@ -7809,7 +7813,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.4' + '-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',
-};