shaka-player 4.7.5 → 4.7.6

package/externs/shaka/abr_manager.js

@@ -96,6 +96,15 @@ shaka.extern.AbrManager = class {
    */
   segmentDownloaded(deltaTimeMs, numBytes, allowSwitch) {}
 
+  /**
+   * Notifies the ABR that it is a time to suggest new streams. This is used by
+   * the Player when it finishes adding the last partial segment of a fast
+   * switching stream.
+   *
+   * @exportDoc
+   */
+  trySuggestStreams() {}
+
   /**
    * Gets an estimate of the current bandwidth in bit/sec.  This is used by the
    * Player to generate stats.

package/lib/abr/simple_abr_manager.js

@@ -320,6 +320,17 @@ shaka.abr.SimpleAbrManager = class {
   }
 
 
+  /**
+   * @override
+   * @export
+   */
+  trySuggestStreams() {
+    if ((this.lastTimeChosenMs_ != null) && this.enabled_) {
+      this.suggestStreams_();
+    }
+  }
+
+
   /**
    * @override
    * @export

package/lib/media/segment_prefetch.js

@@ -97,6 +97,10 @@ shaka.media.SegmentPrefetch = class {
         this.segmentPrefetchMap_.set(reference, segmentPrefetchOperation);
       }
       this.prefetchPosTime_ = reference.startTime;
+      if (this.stream_.fastSwitching && reference.isPartial() &&
+          reference.isLastPartial()) {
+        break;
+      }
       reference = iterator.next().value;
     }
   }

package/lib/media/streaming_engine.js

@@ -121,7 +121,7 @@ shaka.media.StreamingEngine = class {
     this.destroyer_ = new shaka.util.Destroyer(() => this.doDestroy_());
 
     /** @private {number} */
-    this.lastMediaSourceReset_ = 0;
+    this.lastMediaSourceReset_ = Date.now() / 1000;
   }
 
   /** @override */
@@ -1488,8 +1488,7 @@ shaka.media.StreamingEngine = class {
           JSON.stringify(buffered));
 
       if (!mediaState.waitingToClearBuffer) {
-        this.playerInterface_.onSegmentAppended(
-            reference.startTime, reference.endTime, mediaState.type);
+        this.playerInterface_.onSegmentAppended(reference, mediaState.stream);
       }
 
       // Update right away.
@@ -2526,8 +2525,8 @@ shaka.media.StreamingEngine = class {
  *   onError: function(!shaka.util.Error),
  *   onEvent: function(!Event),
  *   onManifestUpdate: function(),
- *   onSegmentAppended: function(number, number,
- *     !shaka.util.ManifestParserUtils.ContentType),
+ *   onSegmentAppended: function(!shaka.media.SegmentReference,
+ *     !shaka.extern.Stream),
  *   onInitSegmentAppended: function(!number,!shaka.media.InitSegmentReference),
  *   beforeAppendSegment: function(
  *     shaka.util.ManifestParserUtils.ContentType,!BufferSource):Promise,
@@ -2552,10 +2551,9 @@ shaka.media.StreamingEngine = class {
  *   Called when an event occurs that should be sent to the app.
  * @property {function()} onManifestUpdate
  *   Called when an embedded 'emsg' box should trigger a manifest update.
- * @property {function(number, number,
- *   !shaka.util.ManifestParserUtils.ContentType)} onSegmentAppended
+ * @property {function(!shaka.media.SegmentReference,
+ *     !shaka.extern.Stream)} onSegmentAppended
  *   Called after a segment is successfully appended to a MediaSource.
- *   The parameters are the start and end time.
  * @property
  *  {function(!number, !shaka.media.InitSegmentReference)} onInitSegmentAppended
  *   Called when an init segment is appended to a MediaSource.

package/lib/net/networking_engine.js

@@ -700,7 +700,7 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
       const segment = context.segment;
       const stream = context.stream;
       if (segment && stream && stream.fastSwitching) {
-        if (segment.isPartial() && !segment.isLastPartial()) {
+        if (segment.isPartial()) {
           return false;
         }
       }

package/lib/player.js

@@ -1858,6 +1858,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
             'Please use an AbrManager with setCmsdManager function.');
         this.abrManager_.setCmsdManager = () => {};
       }
+      if (typeof this.abrManager_.trySuggestStreams != 'function') {
+        shaka.Deprecate.deprecateFeature(5,
+            'AbrManager',
+            'Please use an AbrManager with trySuggestStreams function.');
+        this.abrManager_.trySuggestStreams = () => {};
+      }
       this.abrManager_.configure(this.config_.abr);
     }
 
@@ -2915,8 +2921,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       onError: (error) => this.onError_(error),
       onEvent: (event) => this.dispatchEvent(event),
       onManifestUpdate: () => this.onManifestUpdate_(),
-      onSegmentAppended: (start, end, contentType) => {
-        this.onSegmentAppended_(start, end, contentType);
+      onSegmentAppended: (reference, stream) => {
+        this.onSegmentAppended_(
+            reference.startTime, reference.endTime, stream.type);
+        if (this.abrManager_ && stream.fastSwitching &&
+            reference.isPartial() && reference.isLastPartial()) {
+          this.abrManager_.trySuggestStreams();
+        }
       },
       onInitSegmentAppended: (position, initSegment) => {
         const mediaQuality = initSegment.getMediaQuality();
@@ -4605,13 +4616,16 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // variant yet because we set the load mode before we select the first
       // variant to stream.
       const variant = this.streamingEngine_.getCurrentVariant();
+      const textStream = this.streamingEngine_.getCurrentTextStream();
 
       if (variant) {
         const rate = this.playRateController_ ?
            this.playRateController_.getRealRate() : 1;
         const variantBandwidth = rate * variant.bandwidth;
-        // TODO: Should include text bandwidth if it enabled.
-        const currentStreamBandwidth = variantBandwidth;
+        let currentStreamBandwidth = variantBandwidth;
+        if (textStream && textStream.bandwidth) {
+          currentStreamBandwidth += (rate * textStream.bandwidth);
+        }
         this.stats_.setCurrentStreamBandwidth(currentStreamBandwidth);
       }
 
@@ -6900,7 +6914,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.7.5' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.7.6' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/util/periods.js

@@ -1031,6 +1031,10 @@ shaka.util.PeriodCombiner = class {
           continue;
         }
 
+        if (outputStream.fastSwitching != stream.fastSwitching) {
+          continue;
+        }
+
         if (!best || isBetterMatch(outputStream, best, stream)) {
           best = stream;
         }

package/lib/util/platform.js

@@ -220,6 +220,15 @@ shaka.util.Platform = class {
            !shaka.util.Platform.isLegacyEdge();
   }
 
+  /**
+   * Check if the current platform is Firefox.
+   *
+   * @return {boolean}
+   */
+  static isFirefox() {
+    return shaka.util.Platform.userAgentContains_('Firefox');
+  }
+
   /**
    * Check if the current platform is from Apple.
    *
@@ -422,6 +431,15 @@ shaka.util.Platform = class {
     return navigator.platform.toLowerCase().includes('windows');
   }
 
+  /**
+   * Return true if the platform is a Android, regardless of the browser.
+   *
+   * @return {boolean}
+   */
+  static isAndroid() {
+    return shaka.util.Platform.userAgentContains_('Android');
+  }
+
   /**
    * Check if the user agent contains a key. This is the best way we know of
    * right now to detect platforms. If there is a better way, please send a

package/lib/util/stream_utils.js

@@ -371,6 +371,9 @@ shaka.util.StreamUtils = class {
     const StreamUtils = shaka.util.StreamUtils;
     const isXboxOne = shaka.util.Platform.isXboxOne();
 
+    const isFirefoxAndroid = shaka.util.Platform.isFirefox() &&
+        shaka.util.Platform.isAndroid();
+
     manifest.variants = manifest.variants.filter((variant) => {
       // See: https://github.com/shaka-project/shaka-player/issues/3860
       const video = variant.video;
@@ -426,6 +429,17 @@ shaka.util.StreamUtils = class {
 
       const audio = variant.audio;
 
+      // See: https://github.com/shaka-project/shaka-player/issues/6111
+      // It seems that Firefox Android reports that it supports
+      // Opus + Widevine, but it is not actually supported.
+      // It makes sense to drop early.
+      if (isFirefoxAndroid && audio && audio.encrypted &&
+          audio.codecs.toLowerCase().includes('opus')) {
+        shaka.log.debug('Dropping variant - not compatible with platform',
+            StreamUtils.getVariantSummaryString_(variant));
+        return false;
+      }
+
       if (audio) {
         const codecs = StreamUtils.getCorrectAudioCodecs_(audio.codecs);
         const fullType = MimeUtils.getFullOrConvertedType(

package/package.json

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

package/ui/controls.js

@@ -650,6 +650,9 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
    * @export
    */
   isPiPAllowed() {
+    if (this.castProxy_.isCasting()) {
+      return false;
+    }
     if ('documentPictureInPicture' in window &&
         this.config_.preferDocumentPictureInPicture) {
       const video = /** @type {HTMLVideoElement} */(this.localVideo_);

package/ui/pip_button.js

@@ -98,8 +98,8 @@ shaka.ui.PipButton = class extends shaka.ui.Element {
       this.onLeavePictureInPicture_();
     });
 
-    this.eventManager.listen(this.controls, 'caststatuschanged', (e) => {
-      this.onCastStatusChange_(e);
+    this.eventManager.listen(this.controls, 'caststatuschanged', () => {
+      this.onTracksChanged_();
     });
 
     this.eventManager.listen(this.player, 'trackschanged', () => {
@@ -164,25 +164,6 @@ shaka.ui.PipButton = class extends shaka.ui.Element {
         this.localization.resolve(currentPipState);
   }
 
-  /**
-   * @param {Event} e
-   * @private
-   */
-  onCastStatusChange_(e) {
-    const isCasting = e['newStatus'];
-
-    if (isCasting) {
-      // Picture-in-picture is not applicable if we're casting
-      if (this.controls.isPiPAllowed()) {
-        shaka.ui.Utils.setDisplay(this.pipButton_, false);
-      }
-    } else {
-      if (this.controls.isPiPAllowed()) {
-        shaka.ui.Utils.setDisplay(this.pipButton_, true);
-      }
-    }
-  }
-
 
   /**
    * Display the picture-in-picture button only when the content contains video.
@@ -194,6 +175,9 @@ shaka.ui.PipButton = class extends shaka.ui.Element {
   async onTracksChanged_() {
     if (!this.controls.isPiPAllowed()) {
       shaka.ui.Utils.setDisplay(this.pipButton_, false);
+      if (this.controls.isPiPEnabled()) {
+        await this.controls.togglePiP();
+      }
     } else if (this.player && this.player.isAudioOnly()) {
       shaka.ui.Utils.setDisplay(this.pipButton_, false);
       if (this.controls.isPiPEnabled()) {