shaka-player 4.11.4 → 4.11.5

package/lib/hls/hls_parser.js

@@ -152,6 +152,14 @@ shaka.hls.HlsParser = class {
      */
     this.lowestSyncTime_ = Infinity;
 
+    /**
+     * Flag to indicate if any of the media playlists use
+     * EXT-X-PROGRAM-DATE-TIME.
+     *
+     * @private {boolean}
+     */
+    this.usesProgramDateTime_ = false;
+
     /**
      * Whether the streams have previously been "finalized"; that is to say,
      * whether we have loaded enough streams to know information about the asset
@@ -621,9 +629,10 @@ shaka.hls.HlsParser = class {
    * Align the streams by sequence number by dropping early segments.  Then
    * offset the streams to begin at presentation time 0.
    * @param {!Array.<!shaka.hls.HlsParser.StreamInfo>} streamInfos
+   * @param {boolean=} force
    * @private
    */
-  syncStreamsWithSequenceNumber_(streamInfos) {
+  syncStreamsWithSequenceNumber_(streamInfos, force = false) {
     // We assume that, when this is first called, we have enough info to
     // determine how to use the program date times (e.g. we have both a video
     // and an audio, and all other videos and audios match those).
@@ -678,7 +687,7 @@ shaka.hls.HlsParser = class {
         this.minSequenceNumber_);
 
     for (const streamInfo of streamInfos) {
-      if (!this.ignoreManifestProgramDateTimeFor_(streamInfo.type)) {
+      if (!this.ignoreManifestProgramDateTimeFor_(streamInfo.type) && !force) {
         continue;
       }
       const segmentIndex = streamInfo.stream.segmentIndex;
@@ -2750,8 +2759,12 @@ shaka.hls.HlsParser = class {
       }
     }
     this.notifySegmentsForStreams_(streamInfos.map((s) => s.stream));
-    if (this.config_.hls.ignoreManifestProgramDateTime) {
-      this.syncStreamsWithSequenceNumber_(streamInfos);
+    const liveWithNoProgramaDateTime =
+        this.isLive_() && !this.usesProgramDateTime_;
+    if (this.config_.hls.ignoreManifestProgramDateTime ||
+        liveWithNoProgramaDateTime) {
+      this.syncStreamsWithSequenceNumber_(
+          streamInfos, liveWithNoProgramaDateTime);
     } else {
       this.syncStreamsWithProgramDateTime_(streamInfos);
       if (this.config_.hls.ignoreManifestProgramDateTimeForTypes.length > 0) {
@@ -3624,6 +3637,7 @@ shaka.hls.HlsParser = class {
         syncTime = shaka.util.TXml.parseDate(dateTimeTag.value);
         goog.asserts.assert(syncTime != null,
             'EXT-X-PROGRAM-DATE-TIME format not valid');
+        this.usesProgramDateTime_ = true;
       }
     }
 

package/lib/media/presentation_timeline.js

@@ -78,6 +78,9 @@ shaka.media.PresentationTimeline = class {
     /** @private {boolean} */
     this.static_ = true;
 
+    /** @private {boolean} */
+    this.isLive2VodTransition_ = false;
+
     /** @private {number} */
     this.userSeekStart_ = 0;
 
@@ -179,6 +182,9 @@ shaka.media.PresentationTimeline = class {
    */
   setStatic(isStatic) {
     // NOTE: the argument name is not "static" because that's a keyword in ES6
+    if (isStatic && !this.static_) {
+      this.isLive2VodTransition_ = true;
+    }
     this.static_ = isStatic;
   }
 
@@ -419,7 +425,7 @@ shaka.media.PresentationTimeline = class {
       // No data yet, and Math.min(null, startTime) is always 0.  So just store
       // startTime.
       this.minSegmentStartTime_ = startTime;
-    } else {
+    } else if (!this.isLive2VodTransition_) {
       this.minSegmentStartTime_ =
           Math.min(this.minSegmentStartTime_, startTime);
     }

package/lib/player.js

@@ -7080,6 +7080,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       oldTrack = shaka.util.StreamUtils.variantToTrack(currentVariant);
     }
     const newTrack = shaka.util.StreamUtils.variantToTrack(variant);
+    newTrack.active = true;
 
     if (fromAdaptation) {
       // Dispatch an 'adaptation' event
@@ -7231,27 +7232,28 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @private
    */
   onSegmentAppended_(start, end, contentType, isMuxed) {
-    // When we append a segment to media source (via streaming engine) we are
-    // changing what data we have buffered, so notify the playhead of the
-    // change.
-    if (this.playhead_) {
-      this.playhead_.notifyOfBufferingChange();
-      // Skip the initial buffer gap
-      const startTime = this.mediaSourceEngine_.bufferStart(contentType);
-      const ContentType = shaka.util.ManifestParserUtils.ContentType;
-      if (
-        !this.isLive() &&
-        // If not paused then GapJumpingController will handle this gap.
-        this.video_.paused &&
-        startTime != null &&
-        contentType != ContentType.TEXT &&
-        startTime > 0 &&
-        this.playhead_.getTime() < startTime
-      ) {
-        this.playhead_.setStartTime(startTime);
-      }
-    }
-    this.pollBufferState_();
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
+    if (contentType != ContentType.TEXT) {
+      // When we append a segment to media source (via streaming engine) we are
+      // changing what data we have buffered, so notify the playhead of the
+      // change.
+      if (this.playhead_) {
+        this.playhead_.notifyOfBufferingChange();
+        // Skip the initial buffer gap
+        const startTime = this.mediaSourceEngine_.bufferStart(contentType);
+        if (
+          !this.isLive() &&
+          // If not paused then GapJumpingController will handle this gap.
+          this.video_.paused &&
+          startTime != null &&
+          startTime > 0 &&
+          this.playhead_.getTime() < startTime
+        ) {
+          this.playhead_.setStartTime(startTime);
+        }
+      }
+      this.pollBufferState_();
+    }
 
     // Dispatch an event for users to consume, too.
     const data = new Map()
@@ -8072,7 +8074,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat, max-len
-shaka.Player.version = 'v4.11.4' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.11.5' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/encryption_scheme.js

@@ -7,6 +7,7 @@
 goog.provide('shaka.polyfill.EncryptionScheme');
 
 goog.require('shaka.polyfill');
+goog.require('shaka.util.Platform');
 
 /**
  * @summary A polyfill to add support for EncryptionScheme queries in EME.
@@ -23,6 +24,14 @@ shaka.polyfill.EncryptionScheme = class {
    * @export
    */
   static install() {
+    // Skip polyfill for PlayStation 4 and SkyQ devices due to known crashes
+    // caused by unsupported encryptionScheme handling. These platforms do not
+    // require the polyfill, and forcing encryptionScheme processing can result
+    // in playback crashes.
+    if (shaka.util.Platform.isPS4() || shaka.util.Platform.isSkyQ()) {
+      return;
+    }
+
     EncryptionSchemePolyfills.install();
   }
 };

package/lib/util/platform.js

@@ -301,7 +301,8 @@ shaka.util.Platform = class {
         !shaka.util.Platform.isPS4() &&
         !shaka.util.Platform.isAmazonFireTV() &&
         !shaka.util.Platform.isWPE() &&
-        !shaka.util.Platform.isZenterio();
+        !shaka.util.Platform.isZenterio() &&
+        !shaka.util.Platform.isSkyQ();
   }
 
   /**
@@ -346,6 +347,13 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('SOPOpenBrowser');
   }
 
+  /**
+   * Check if the current platform is SkyQ STB.
+   */
+  static isSkyQ() {
+    return shaka.util.Platform.userAgentContains_('Sky_STB');
+  }
+
   /**
    * Check if the current platform is Amazon Fire TV.
    * https://developer.amazon.com/docs/fire-tv/identify-amazon-fire-tv-devices.html

package/package.json

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

package/ui/resolution_selection.js

@@ -19,6 +19,7 @@ goog.require('shaka.ui.SettingsMenu');
 goog.require('shaka.ui.Utils');
 goog.require('shaka.util.Dom');
 goog.require('shaka.util.FakeEvent');
+goog.require('shaka.util.Functional');
 goog.requireType('shaka.ui.Controls');
 
 
@@ -91,6 +92,7 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
           return false;
         }
         if (this.controls.getConfig().showAudioChannelCountVariants &&
+            track.channelsCount && selectedTrack.channelsCount &&
             track.channelsCount != selectedTrack.channelsCount) {
           return false;
         }
@@ -117,7 +119,8 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
         return tracks.findIndex((t) => t.bandwidth == track.bandwidth) == idx;
       });
     } else {
-      const audiosIds = [...new Set(tracks.map((t) => t.audioId))];
+      const audiosIds = [...new Set(tracks.map((t) => t.audioId))]
+          .filter(shaka.util.Functional.isNotNull);
       if (audiosIds.length > 1) {
         tracks = tracks.filter((track, idx) => {
           // Keep the first one with the same height and framerate or bandwidth.