shaka-player 4.7.13 → 4.7.14

package/lib/ads/client_side_ad_manager.js

@@ -533,7 +533,9 @@ shaka.ads.ClientSideAdManager = class {
         shaka.ads.AdManager.AD_STARTED, data));
     if (this.ad_.isLinear()) {
       this.adContainer_.setAttribute('ad-active', 'true');
-      this.video_.pause();
+      if (!this.config_.customPlayheadTracker) {
+        this.video_.pause();
+      }
       if (this.video_.muted) {
         this.ad_.setInitialMuted(this.video_.volume);
       } else {
@@ -551,7 +553,7 @@ shaka.ads.ClientSideAdManager = class {
         (new Map()).set('originalEvent', e)));
     if (this.ad_ && this.ad_.isLinear()) {
       this.adContainer_.removeAttribute('ad-active');
-      if (!this.video_.ended) {
+      if (!this.config_.customPlayheadTracker && !this.video_.ended) {
         this.video_.play();
       }
     }

package/lib/dash/segment_template.js

@@ -394,6 +394,11 @@ shaka.dash.SegmentTemplate = class {
         Math.ceil(availablePeriodTimes[1] / segmentDuration) - 1,
       ];
 
+      // For Low Latency we can request the partial current position.
+      if (context.representation.availabilityTimeOffset) {
+        availablePeriodPositions[1]++;
+      }
+
       // In absolute positions.
       const availablePresentationPositions =
           availablePeriodPositions.map((x) => x + startNumber);
@@ -696,7 +701,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
    */
   appendTemplateInfo(info, periodStart, periodEnd, shouldFit,
       initSegmentReference) {
-    this.initSegmentReference_ = initSegmentReference;
+    this.updateInitSegmentReference(initSegmentReference);
     if (!this.templateInfo_) {
       this.templateInfo_ = info;
       this.periodStart_ = periodStart;
@@ -727,6 +732,24 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     }
   }
 
+  /**
+   * Updates the init segment reference and propagates the update to all
+   * references.
+   * @param {shaka.media.InitSegmentReference} initSegmentReference
+   */
+  updateInitSegmentReference(initSegmentReference) {
+    if (this.initSegmentReference_ === initSegmentReference) {
+      return;
+    }
+
+    this.initSegmentReference_ = initSegmentReference;
+    for (const reference of this.references) {
+      if (reference) {
+        reference.updateInitSegmentReference(initSegmentReference);
+      }
+    }
+  }
+
   /**
    *
    * @param {number} time

package/lib/media/drm_engine.js

@@ -1551,6 +1551,9 @@ shaka.media.DrmEngine = class {
       const req = this.playerInterface_.netEngine.request(requestType, request);
       response = await req.promise;
     } catch (error) {
+      if (this.destroyer_.destroyed()) {
+        return;
+      }
       // Request failed!
       goog.asserts.assert(error instanceof shaka.util.Error,
           'Wrong NetworkingEngine error type!');
@@ -1559,9 +1562,20 @@ shaka.media.DrmEngine = class {
           shaka.util.Error.Category.DRM,
           shaka.util.Error.Code.LICENSE_REQUEST_FAILED,
           error);
-      this.onError_(shakaErr);
-      if (metadata && metadata.updatePromise) {
-        metadata.updatePromise.reject(shakaErr);
+      if (this.activeSessions_.size == 1) {
+        this.onError_(shakaErr);
+        if (metadata && metadata.updatePromise) {
+          metadata.updatePromise.reject(shakaErr);
+        }
+      } else {
+        if (metadata && metadata.updatePromise) {
+          metadata.updatePromise.reject(shakaErr);
+        }
+        this.activeSessions_.delete(session);
+        if (this.areAllSessionsLoaded_()) {
+          this.allSessionsLoaded_.resolve();
+          this.keyStatusTimer_.tickAfter(/* seconds= */ 0.1);
+        }
       }
       return;
     }

package/lib/media/media_source_engine.js

@@ -1839,12 +1839,17 @@ shaka.media.MediaSourceEngine = class {
 
       const totalOfBuffers = streamsByType.size;
       let numberOfSourceBufferAdded = 0;
-      this.eventManager_.listen(sourceBuffers, 'addsourcebuffer', (event) => {
+      const onSourceBufferAdded = () => {
         numberOfSourceBufferAdded++;
         if (numberOfSourceBufferAdded === totalOfBuffers) {
           sourceBufferAdded.resolve();
+          this.eventManager_.unlisten(sourceBuffers, 'addsourcebuffer',
+              onSourceBufferAdded);
         }
-      });
+      };
+
+      this.eventManager_.listen(sourceBuffers, 'addsourcebuffer',
+          onSourceBufferAdded);
 
       for (const contentType of streamsByType.keys()) {
         const stream = streamsByType.get(contentType);
@@ -1868,7 +1873,12 @@ shaka.media.MediaSourceEngine = class {
       this.destroyer_.ensureNotDestroyed();
 
       this.eventManager_.listenOnce(this.video_, 'canplaythrough', () => {
-        this.destroyer_.ensureNotDestroyed();
+        // Don't use ensureNotDestroyed() from this event listener, because
+        // that results in an uncaught exception.  Instead, just check the
+        // flag.
+        if (this.destroyer_.destroyed()) {
+          return;
+        }
 
         this.video_.autoplay = previousAutoPlayState;
         if (!previousPausedState) {

package/lib/media/playhead.js

@@ -382,10 +382,10 @@ shaka.media.MediaSourcePlayhead = class {
       seekStart = seekEnd - this.minSeekRange_;
     }
 
-    if (currentTime < seekStart || currentTime > seekEnd) {
-      // playhead is outside of the seekrange.  Move playhead to catch up.
+    if (currentTime < seekStart) {
+      // The seek range has moved past the playhead.  Move ahead to catch up.
       const targetTime = this.reposition_(currentTime);
-      shaka.log.info('Jumping by ' + (targetTime - currentTime) +
+      shaka.log.info('Jumping forward ' + (targetTime - currentTime) +
                      ' seconds to catch up with the seek range.');
       this.mediaElement_.currentTime = targetTime;
     }

package/lib/media/segment_index.js

@@ -694,6 +694,16 @@ shaka.media.MetaSegmentIndex = class extends shaka.media.SegmentIndex {
     this.indexes_ = [];
   }
 
+  /**
+   * @override
+   * @export
+   */
+  forEachTopLevelReference(fn) {
+    for (const index of this.indexes_) {
+      index.forEachTopLevelReference(fn);
+    }
+  }
+
   /**
    * @override
    * @export

package/lib/media/segment_reference.js

@@ -598,6 +598,18 @@ shaka.media.SegmentReference = class {
       this.offset(offset);
     }
   }
+
+  /**
+   * Updates the init segment reference and propagates the update to all partial
+   * references.
+   * @param {shaka.media.InitSegmentReference} initSegmentReference
+   */
+  updateInitSegmentReference(initSegmentReference) {
+    this.initSegmentReference = initSegmentReference;
+    for (const partialReference of this.partialReferences) {
+      partialReference.updateInitSegmentReference(initSegmentReference);
+    }
+  }
 };
 
 

package/lib/media/streaming_engine.js

@@ -1733,9 +1733,16 @@ shaka.media.StreamingEngine = class {
           otherState = this.mediaStates_.get(ContentType.VIDEO);
         }
         if (otherState) {
+          // First, abort all operations in progress on the other stream.
+          await this.abortOperations_(otherState).catch(() => {});
+          // Then clear our cache of the last init segment, since MSE will be
+          // reloaded and no init segment will be there post-reload.
           otherState.lastInitSegmentReference = null;
+          // Now force the existing buffer to be cleared.  It is not necessary
+          // to perform the MSE clear operation, but this has the side-effect
+          // that our state for that stream will then match MSE's post-reload
+          // state.
           this.forceClearBuffer_(otherState);
-          this.abortOperations_(otherState).catch(() => {});
         }
       }
 
@@ -1766,19 +1773,6 @@ shaka.media.StreamingEngine = class {
               appendWindowEnd, ignoreTimestampOffset,
               reference.mimeType || mediaState.stream.mimeType,
               reference.codecs || mediaState.stream.codecs, streamsByType);
-          if (isResetMediaSourceNecessary) {
-            let otherState = null;
-            if (mediaState.type === ContentType.VIDEO) {
-              otherState = this.mediaStates_.get(ContentType.AUDIO);
-            } else if (mediaState.type === ContentType.AUDIO) {
-              otherState = this.mediaStates_.get(ContentType.VIDEO);
-            }
-            if (otherState) {
-              otherState.waitingToClearBuffer = false;
-              otherState.performingUpdate = false;
-              this.forceClearBuffer_(otherState);
-            }
-          }
         } catch (error) {
           mediaState.lastAppendWindowStart = null;
           mediaState.lastAppendWindowEnd = null;

package/lib/player.js

@@ -1977,31 +1977,49 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.config_.playRangeStart,
         this.config_.playRangeEnd);
 
-    this.playhead_ = this.createPlayhead(this.startTime_);
-    this.playheadObservers_ =
-        this.createPlayheadObserversForMSE_(startTimeOfLoad);
 
-    // We need to start the buffer management code near the end because it
-    // will set the initial buffering state and that depends on other
-    // components being initialized.
-    const rebufferThreshold = Math.max(
-        this.manifest_.minBufferTime, this.config_.streaming.rebufferingGoal);
-    this.startBufferManagement_(mediaElement, rebufferThreshold);
+    const setupPlayhead = (startTime) => {
+      this.playhead_ = this.createPlayhead(startTime);
+      this.playheadObservers_ =
+          this.createPlayheadObserversForMSE_(startTimeOfLoad);
+
+      // We need to start the buffer management code near the end because it
+      // will set the initial buffering state and that depends on other
+      // components being initialized.
+      const rebufferThreshold = Math.max(
+          this.manifest_.minBufferTime,
+          this.config_.streaming.rebufferingGoal);
+      this.startBufferManagement_(mediaElement, rebufferThreshold);
+    };
+
+    if (!this.config_.streaming.startAtSegmentBoundary) {
+      setupPlayhead(this.startTime_);
+    }
 
     // Now we can switch to the initial variant.
     if (!activeVariant) {
       goog.asserts.assert(initialVariant,
           'Must have choosen an initial variant!');
 
-      this.switchVariant_(initialVariant, /* fromAdaptation= */ true,
-          /* clearBuffer= */ false, /* safeMargin= */ 0);
-
       // Now that we have initial streams, we may adjust the start time to
       // align to a segment boundary.
       if (this.config_.streaming.startAtSegmentBoundary) {
-        this.playhead_.setStartTime(await this.adjustStartTime_(
-            initialVariant, this.playhead_.getTime()));
+        const timeline = this.manifest_.presentationTimeline;
+        let initialTime = this.startTime_ || this.video_.currentTime;
+        const seekRangeStart = timeline.getSeekRangeStart();
+        const seekRangeEnd = timeline.getSeekRangeEnd();
+        if (initialTime < seekRangeStart) {
+          initialTime = seekRangeStart;
+        } else if (initialTime > seekRangeEnd) {
+          initialTime = seekRangeEnd;
+        }
+        const startTime = await this.adjustStartTime_(
+            initialVariant, initialTime);
+        setupPlayhead(startTime);
       }
+
+      this.switchVariant_(initialVariant, /* fromAdaptation= */ true,
+          /* clearBuffer= */ false, /* safeMargin= */ 0);
     }
 
     this.playhead_.ready();
@@ -2316,6 +2334,15 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       mediaElement.load();
     }
 
+    // In Safari using HLS won't load anything unless you call load()
+    // explicitly, no matter the value of the preload attribute.
+    // Note: this only happens when there are not autoplay.
+    if (mediaElement.preload != 'none' && !mediaElement.autoplay &&
+        shaka.util.MimeUtils.isHlsType(mimeType) &&
+        shaka.util.Platform.safariVersion()) {
+      mediaElement.load();
+    }
+
     // Set the load mode last so that we know that all our components are
     // initialized.
     this.loadMode_ = shaka.Player.LoadMode.SRC_EQUALS;
@@ -6960,7 +6987,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.7.13' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.7.14' + '-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

@@ -72,7 +72,9 @@ shaka.text.UITextDisplayer = class {
 
     /** @private {shaka.util.Timer} */
     this.captionsTimer_ = new shaka.util.Timer(() => {
-      this.updateCaptions_();
+      if (!this.video_.paused) {
+        this.updateCaptions_();
+      }
     }).tickEvery(updatePeriod);
 
     /**
@@ -93,6 +95,10 @@ shaka.text.UITextDisplayer = class {
       this.updateCaptions_(/* forceUpdate= */ true);
     });
 
+    this.eventManager_.listen(this.video_, 'seeking', () => {
+      this.updateCaptions_(/* forceUpdate= */ true);
+    });
+
     // From: https://html.spec.whatwg.org/multipage/media.html#dom-video-videowidth
     // Whenever the natural width or natural height of the video changes
     // (including, for example, because the selected video track was changed),
@@ -339,6 +345,9 @@ shaka.text.UITextDisplayer = class {
         const cueRegistry = this.currentCuesMap_.get(cue);
         goog.asserts.assert(cueRegistry, 'cueRegistry should exist.');
         if (cueRegistry.regionElement) {
+          if (cueRegistry.regionElement.contains(container)) {
+            cueRegistry.regionElement.removeChild(container);
+          }
           container.appendChild(cueRegistry.regionElement);
           cueRegistry.regionElement.appendChild(cueRegistry.cueElement);
         } else {

package/lib/util/platform.js

@@ -149,10 +149,9 @@ shaka.util.Platform = class {
    * @return {boolean}
    */
   static isWebOS3() {
-    // See: http://webostv.developer.lge.com/discover/specifications/web-engine/
-    return shaka.util.Platform.userAgentContains_('Web0S') &&
-        shaka.util.Platform.userAgentContains_(
-            'Chrome/38.0.2125.122 Safari/537.36');
+    // See: https://webostv.developer.lge.com/develop/specifications/web-api-and-web-engine#useragent-string
+    return shaka.util.Platform.isWebOS() &&
+        shaka.util.Platform.chromeVersion() === 38;
   }
 
   /**
@@ -161,18 +160,20 @@ shaka.util.Platform = class {
    * @return {boolean}
    */
   static isWebOS4() {
-    // See: http://webostv.developer.lge.com/discover/specifications/web-engine/
-    return !!navigator.userAgent.match(/webOS\/4/i);
+    // See: https://webostv.developer.lge.com/develop/specifications/web-api-and-web-engine#useragent-string
+    return shaka.util.Platform.isWebOS() &&
+        shaka.util.Platform.chromeVersion() === 53;
   }
 
   /**
-   * Check if the current platform is a WebOS 4.
+   * Check if the current platform is a WebOS 5.
    *
    * @return {boolean}
    */
   static isWebOS5() {
-    // See: http://webostv.developer.lge.com/discover/specifications/web-engine/
-    return !!navigator.userAgent.match(/webOS\/5/i);
+    // See: https://webostv.developer.lge.com/develop/specifications/web-api-and-web-engine#useragent-string
+    return shaka.util.Platform.isWebOS() &&
+        shaka.util.Platform.chromeVersion() === 68;
   }
 
   /**
@@ -184,6 +185,17 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('CrKey');
   }
 
+  /**
+   * Check if the current platform is a Google Chromecast with Android
+   * (i.e. Chromecast with GoogleTV).
+   *
+   * @return {boolean}
+   */
+  static isAndroidCastDevice() {
+    const Platform = shaka.util.Platform;
+    return Platform.isChromecast() && Platform.isAndroid();
+  }
+
   /**
    * Returns a major version number for Chrome, or Chromium-based browsers.
    *
@@ -414,6 +426,9 @@ shaka.util.Platform = class {
       return navigator.userAgentData.platform.toLowerCase() == 'macos';
     }
     // Fall back to the old API, with less strict matching.
+    if (!navigator.platform) {
+      return false;
+    }
     return navigator.platform.toLowerCase().includes('mac');
   }
 
@@ -428,6 +443,9 @@ shaka.util.Platform = class {
       return navigator.userAgentData.platform.toLowerCase() == 'windows';
     }
     // Fall back to the old API, with less strict matching.
+    if (!navigator.platform) {
+      return false;
+    }
     return navigator.platform.toLowerCase().includes('windows');
   }
 
@@ -535,6 +553,10 @@ shaka.util.Platform = class {
         Platform.isWebOS4() || Platform.isWebOS5()) {
       return false;
     }
+    // Older chromecasts without GoogleTV seem to not support SMOOTH properly.
+    if (Platform.isChromecast() && !Platform.isAndroidCastDevice()) {
+      return false;
+    }
     // See: https://chromium-review.googlesource.com/c/chromium/src/+/4577759
     if (Platform.isWindows() && Platform.isEdge()) {
       return false;

package/lib/util/stream_utils.js

@@ -973,8 +973,12 @@ shaka.util.StreamUtils = class {
     // currently don't support 'fLaC', while 'flac' is supported by most
     // major browsers.
     // See https://bugs.chromium.org/p/chromium/issues/detail?id=1422728
-    if (codecs === 'fLaC' && !shaka.util.Platform.isSafari()) {
-      return 'flac';
+    if (codecs.toLowerCase() == 'flac') {
+      if (!shaka.util.Platform.isSafari()) {
+        return 'flac';
+      } else {
+        return 'fLaC';
+      }
     }
 
     // The same is true for 'Opus'.

package/package.json

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

package/ui/resolution_selection.js

@@ -96,6 +96,7 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
       } else {
         otherIdx = tracks.findIndex((t) => {
           return t.height == track.height &&
+              t.videoBandwidth == track.videoBandwidth &&
               t.frameRate == track.frameRate &&
               t.hdr == track.hdr &&
               t.videoLayout == track.videoLayout;