shaka-player 4.10.7 → 4.10.9

package/externs/shaka/ads.js

@@ -210,6 +210,11 @@ shaka.extern.IAdManager.Factory;
  * @exportDoc
  */
 shaka.extern.IAd = class {
+  /**
+   * @return {boolean}
+   */
+  needsSkipUI() {}
+
   /**
    * @return {number}
    */

package/externs/shaka/net.js

@@ -26,6 +26,7 @@
  *
  * @property {number} maxAttempts
  *   The maximum number of times the request should be attempted.
+ *   The minimum supported value is 1 (only one request without retries).
  * @property {number} baseDelay
  *   The delay before the first retry, in milliseconds.
  * @property {number} backoffFactor

package/lib/ads/client_side_ad.js

@@ -50,6 +50,14 @@ shaka.ads.ClientSideAd = class {
         });
   }
 
+  /**
+   * @override
+   * @export
+   */
+  needsSkipUI() {
+    return false;
+  }
+
   /**
    * @override
    * @export

package/lib/ads/interstitial_ad.js

@@ -36,6 +36,13 @@ shaka.ads.InterstitialAd = class {
     this.adPosition_ = adPosition;
   }
 
+  /**
+   * @override
+   * @export
+   */
+  needsSkipUI() {
+    return true;
+  }
 
   /**
    * @override

package/lib/ads/interstitial_ad_manager.js

@@ -91,7 +91,7 @@ shaka.ads.InterstitialAdManager = class {
       if (this.playingAd_) {
         return;
       }
-      const needPreRoll = this.lastTime_ == null;
+      const needPreRoll = this.lastTime_ == null || this.lastTime_ == 0;
       this.lastTime_ = this.baseVideo_.currentTime;
       const currentInterstitial = this.getCurrentInterstitial_(needPreRoll);
       if (currentInterstitial) {
@@ -342,7 +342,7 @@ shaka.ads.InterstitialAdManager = class {
       }).length;
     }
 
-    if (interstitial.once) {
+    if (interstitial.once || interstitial.pre) {
       oncePlayed++;
       this.interstitials_.delete(interstitial);
       this.cuepointsChanged_();
@@ -384,7 +384,8 @@ shaka.ads.InterstitialAdManager = class {
     const updateBaseVideoTime = () => {
       if (!this.usingBaseVideo_) {
         if (interstitial.resumeOffset == null) {
-          if (interstitial.timelineRange && interstitial.endTime) {
+          if (interstitial.timelineRange && interstitial.endTime &&
+              interstitial.endTime != Infinity) {
             if (this.baseVideo_.currentTime != interstitial.endTime) {
               this.baseVideo_.currentTime = interstitial.endTime;
             }
@@ -423,7 +424,8 @@ shaka.ads.InterstitialAdManager = class {
         if (this.usingBaseVideo_) {
           let offset = interstitial.resumeOffset;
           if (offset == null) {
-            if (interstitial.timelineRange && interstitial.endTime) {
+            if (interstitial.timelineRange && interstitial.endTime &&
+                interstitial.endTime != Infinity) {
               offset = interstitial.endTime - (this.lastTime_ || 0);
             } else {
               offset = (Date.now() - initialTime) / 1000;
@@ -604,14 +606,14 @@ shaka.ads.InterstitialAdManager = class {
       pre = data.includes('PRE');
       post = data.includes('POST');
     }
-    let timelineRange = true;
+    let timelineRange = false;
     const timelineOccupies =
         interstitial.values.find((v) => v.key == 'X-TIMELINE-OCCUPIES');
     if (timelineOccupies) {
       const data = /** @type {string} */(timelineOccupies.data);
       timelineRange = data.includes('RANGE');
     } else if (!resume && this.basePlayer_.isLive()) {
-      timelineRange = true;
+      timelineRange = !pre && !post;
     }
     if (assetUri) {
       const uri = /** @type {string} */(assetUri.data);

package/lib/ads/media_tailor_ad.js

@@ -43,6 +43,13 @@ shaka.ads.MediaTailorAd = class {
     this.isSkipped_ = false;
   }
 
+  /**
+   * @override
+   * @export
+   */
+  needsSkipUI() {
+    return true;
+  }
 
   /**
    * @override

package/lib/ads/server_side_ad.js

@@ -35,6 +35,13 @@ shaka.ads.ServerSideAd = class {
     this.adProgressData_ = data;
   }
 
+  /**
+   * @override
+   * @export
+   */
+  needsSkipUI() {
+    return true;
+  }
 
   /**
    * @override

package/lib/dash/dash_parser.js

@@ -1723,7 +1723,8 @@ shaka.dash.DashParser = class {
     for (const prop of accessibilities) {
       const schemeId = prop.attributes['schemeIdUri'];
       const value = prop.attributes['value'];
-      if (schemeId == 'urn:scte:dash:cc:cea-608:2015' ) {
+      if (schemeId == 'urn:scte:dash:cc:cea-608:2015' &&
+          !this.config_.disableText) {
         let channelId = 1;
         if (value != null) {
           const channelAssignments = value.split(';');
@@ -1764,7 +1765,8 @@ shaka.dash.DashParser = class {
           // 'CC1' as channel id and 'und' as language info.
           closedCaptions.set('CC1', 'und');
         }
-      } else if (schemeId == 'urn:scte:dash:cc:cea-708:2015') {
+      } else if (schemeId == 'urn:scte:dash:cc:cea-708:2015' &&
+          !this.config_.disableText) {
         let serviceNumber = 1;
         if (value != null) {
           for (const captionStr of value.split(';')) {
@@ -2042,13 +2044,15 @@ shaka.dash.DashParser = class {
 
         const duration = context.periodInfo.duration || 0;
         const getBaseUris = context.representation.getBaseUris;
+        const mimeType = context.representation.mimeType;
+        const codecs = context.representation.codecs;
         streamInfo = {
           generateSegmentIndex: () => {
             const segmentIndex = shaka.media.SegmentIndex.forSingleSegment(
                 periodStart, duration, getBaseUris());
             segmentIndex.forEachTopLevelReference((ref) => {
-              ref.mimeType = context.representation.mimeType;
-              ref.codecs = context.representation.codecs;
+              ref.mimeType = mimeType;
+              ref.codecs = codecs;
             });
             return Promise.resolve(segmentIndex);
           },

package/lib/hls/hls_parser.js

@@ -1889,7 +1889,11 @@ shaka.hls.HlsParser = class {
     // the value NONE. If the value is a quoted-string, it MUST match the
     // value of the GROUP-ID attribute of an EXT-X-MEDIA tag elsewhere in the
     // Playlist whose TYPE attribute is CLOSED-CAPTIONS.
-    if (type == ContentType.VIDEO) {
+    if (type == ContentType.VIDEO ) {
+      if (this.config_.disableText) {
+        this.needsClosedCaptionsDetection_ = false;
+        return null;
+      }
       if (closedCaptionsAttr) {
         if (closedCaptionsAttr != 'NONE') {
           return this.groupIdToClosedCaptionsMap_.get(closedCaptionsAttr);
@@ -2800,7 +2804,9 @@ shaka.hls.HlsParser = class {
       languageValue = basicInfo.language;
       channelsCount = basicInfo.channelCount;
       sampleRate = basicInfo.sampleRate;
-      closedCaptions = basicInfo.closedCaptions;
+      if (!this.config_.disableText) {
+        closedCaptions = basicInfo.closedCaptions;
+      }
 
       height = basicInfo.height;
       width = basicInfo.width;

package/lib/media/adaptation_set.js

@@ -150,6 +150,12 @@ shaka.media.AdaptationSet = class {
       }
     }
 
+    // Don't adapt between spatial and non spatial audio, which may
+    // annoy the user.
+    if (a.spatialAudio !== b.spatialAudio) {
+      return false;
+    }
+
     // We can only adapt between base-codecs.
     if (compareCodecs && !AdaptationSet.canTransitionBetween_(a, b)) {
       return false;

package/lib/media/streaming_engine.js

@@ -1827,12 +1827,10 @@ shaka.media.StreamingEngine = class {
     });
 
     if (!waitingForAnotherStreamToRecover) {
-      if (this.config_.maxDisabledTime > 0) {
-        const handled = this.playerInterface_.disableStream(
-            mediaState.stream, this.config_.maxDisabledTime);
-        if (handled) {
-          return;
-        }
+      const handled = this.playerInterface_.disableStream(
+          mediaState.stream, this.config_.maxDisabledTime);
+      if (handled) {
+        return;
       }
       // Reduction schedule: 80%, 60%, 40%, 20%, 16%, 12%, 8%, 4%, fail.
       // Note: percentages are used for comparisons to avoid rounding errors.
@@ -2319,10 +2317,11 @@ shaka.media.StreamingEngine = class {
         this.playerInterface_.onManifestUpdate();
       } else {
         // All other schemes are dispatched as a general 'emsg' event.
+        const endTime = startTime + (eventDuration / timescale);
         /** @type {shaka.extern.EmsgInfo} */
         const emsg = {
           startTime: startTime,
-          endTime: startTime + (eventDuration / timescale),
+          endTime: endTime,
           schemeIdUri: schemeId,
           value: value,
           timescale: timescale,
@@ -2355,17 +2354,17 @@ shaka.media.StreamingEngine = class {
             schemeId == 'https://developer.apple.com/streaming/emsg-id3') {
           // See https://aomediacodec.github.io/id3-emsg/
           const frames = shaka.util.Id3Utils.getID3Frames(messageData);
-          if (frames.length && reference) {
+          if (frames.length) {
             /** @private {shaka.extern.ID3Metadata} */
             const metadata = {
-              cueTime: reference.startTime,
+              cueTime: startTime,
               data: messageData,
               frames: frames,
-              dts: reference.startTime,
-              pts: reference.startTime,
+              dts: startTime,
+              pts: startTime,
             };
             this.playerInterface_.onMetadata(
-                [metadata], /* offset= */ 0, reference.endTime);
+                [metadata], /* offset= */ 0, endTime);
           }
         }
       }
@@ -2722,11 +2721,9 @@ shaka.media.StreamingEngine = class {
     // use the backoff system to delay and backoff the error handling.
     await this.failureCallbackBackoff_.attempt();
     this.destroyer_.ensureNotDestroyed();
-
-    const maxDisabledTime = this.getDisabledTime_(error);
     // Try to recover from network errors
-    if (error.category === shaka.util.Error.Category.NETWORK &&
-        maxDisabledTime > 0) {
+    if (error.category === shaka.util.Error.Category.NETWORK) {
+      const maxDisabledTime = this.getDisabledTime_(error);
       error.handled = this.playerInterface_.disableStream(
           mediaState.stream, maxDisabledTime);
 

package/lib/player.js

@@ -3147,7 +3147,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    */
   processTimedMetadataMediaSrc_(metadata, offset, segmentEndTime) {
     for (const sample of metadata) {
-      if (sample.data && sample.cueTime && sample.frames) {
+      if (sample.data && typeof(sample.cueTime) == 'number' && sample.frames) {
         const start = sample.cueTime + offset;
         let end = segmentEndTime;
         // This can happen when the ID3 info arrives in a previous segment.
@@ -7227,6 +7227,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return false;
     }
 
+    if (disableTime == 0) {
+      return false;
+    }
+
     // It only makes sense to disable a stream if we have an alternative else we
     // end up disabling all variants.
     const hasAltStream = this.manifest_.variants.some((variant) => {
@@ -7813,7 +7817,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.10.7' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.10.9' + '-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

@@ -726,6 +726,15 @@ shaka.text.UITextDisplayer = class {
       style.display = 'flex';
       style.flexDirection = 'column';
       style.alignItems = 'center';
+      if (cue.textAlign == Cue.textAlign.LEFT ||
+          cue.textAlign == Cue.textAlign.START) {
+        style.width = '100%';
+        style.alignItems = 'start';
+      } else if (cue.textAlign == Cue.textAlign.RIGHT ||
+          cue.textAlign == Cue.textAlign.END) {
+        style.width = '100%';
+        style.alignItems = 'end';
+      }
 
       if (cue.displayAlign == Cue.displayAlign.BEFORE) {
         style.justifyContent = 'flex-start';
@@ -811,23 +820,41 @@ shaka.text.UITextDisplayer = class {
 
     style.lineHeight = cue.lineHeight;
 
-    // The position defines the indent of the text container in the
-    // direction defined by the writing direction.
-    if (cue.position != null) {
-      if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
-        style.paddingLeft = cue.position;
-      } else {
-        style.paddingTop = cue.position;
-      }
-    }
-
     // The positionAlign attribute is an alignment for the text container in
     // the dimension of the writing direction.
     const computedPositionAlign = this.computeCuePositionAlignment_(cue);
     if (computedPositionAlign == Cue.positionAlign.LEFT) {
       style.cssFloat = 'left';
+      if (cue.position !== null) {
+        style.position = 'absolute';
+        if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
+          style.left = cue.position + '%';
+          style.width = 'auto';
+        } else {
+          style.top = cue.position + '%';
+        }
+      }
     } else if (computedPositionAlign == Cue.positionAlign.RIGHT) {
       style.cssFloat = 'right';
+      if (cue.position !== null) {
+        style.position = 'absolute';
+        if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
+          style.right = cue.position + '%';
+          style.width = 'auto';
+        } else {
+          style.bottom = cue.position + '%';
+        }
+      }
+    } else {
+      if (cue.position !== null && cue.position != 50) {
+        style.position = 'absolute';
+        if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
+          style.left = cue.position + '%';
+          style.width = 'auto';
+        } else {
+          style.top = cue.position + '%';
+        }
+      }
     }
 
     style.textAlign = cue.textAlign;

package/lib/util/periods.js

@@ -1242,7 +1242,7 @@ shaka.util.PeriodCombiner = class {
         return true;
       } else if (candidateRoleMatches.length < bestRoleMatches.length) {
         return false;
-      } else {
+      } else if (candidate.roles.length !== best.roles.length) {
         // Both streams have the same role overlap with the outputStream
         // If this is the case, choose the stream with the fewer roles overall.
         // Streams that match best together tend to be streams with the same

package/lib/util/stream_utils.js

@@ -949,13 +949,17 @@ shaka.util.StreamUtils = class {
             if (!keySystemConfig.audio) {
               // KeySystemTrackConfiguration
               keySystemConfig.audio = {
-                encryptionScheme: info.encryptionScheme,
                 robustness: info.audioRobustness,
               };
+              if (info.encryptionScheme) {
+                keySystemConfig.audio.encryptionScheme = info.encryptionScheme;
+              }
             } else {
-              keySystemConfig.audio.encryptionScheme =
-                  keySystemConfig.audio.encryptionScheme ||
-                  info.encryptionScheme;
+              if (info.encryptionScheme) {
+                keySystemConfig.audio.encryptionScheme =
+                    keySystemConfig.audio.encryptionScheme ||
+                    info.encryptionScheme;
+              }
               keySystemConfig.audio.robustness =
                   keySystemConfig.audio.robustness ||
                   info.audioRobustness;
@@ -970,13 +974,17 @@ shaka.util.StreamUtils = class {
             if (!keySystemConfig.video) {
               // KeySystemTrackConfiguration
               keySystemConfig.video = {
-                encryptionScheme: info.encryptionScheme,
                 robustness: info.videoRobustness,
               };
+              if (info.encryptionScheme) {
+                keySystemConfig.video.encryptionScheme = info.encryptionScheme;
+              }
             } else {
-              keySystemConfig.video.encryptionScheme =
-                  keySystemConfig.video.encryptionScheme ||
-                  info.encryptionScheme;
+              if (info.encryptionScheme) {
+                keySystemConfig.video.encryptionScheme =
+                    keySystemConfig.video.encryptionScheme ||
+                    info.encryptionScheme;
+              }
               keySystemConfig.video.robustness =
                   keySystemConfig.video.robustness ||
                   info.videoRobustness;

package/package.json

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

package/ui/seek_bar.js

@@ -455,8 +455,8 @@ shaka.ui.SeekBar = class extends shaka.ui.RangeElement {
    * @private
    */
   onAdCuePointsChanged_() {
-    this.markAdBreaks_();
     const action = () => {
+      this.markAdBreaks_();
       const seekRange = this.player.seekRange();
       const seekRangeSize = seekRange.end - seekRange.start;
       const minSeekBarWindow =

package/ui/skip_ad_button.js

@@ -127,7 +127,7 @@ shaka.ui.SkipAdButton = class extends shaka.ui.Element {
    * @private
    */
   onAdStarted_() {
-    if (this.ad.isSkippable()) {
+    if (this.ad.isSkippable() && this.ad.needsSkipUI()) {
       shaka.ui.Utils.setDisplay(this.button_, true);
       shaka.ui.Utils.setDisplay(this.counter_, true);
       this.counter_.textContent = '';