shaka-player 4.6.9 → 4.6.10

package/lib/player.js

@@ -4536,13 +4536,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);
       }
 
@@ -6814,7 +6817,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.6.9' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.6.10' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

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

@@ -370,6 +370,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;
@@ -425,6 +428,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.6.9",
+  "version": "4.6.10",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

package/test/player_unit.js

@@ -2633,6 +2633,9 @@ describe('Player', () => {
           variant.addExistingStream(1);  // audio
           variant.addExistingStream(2);  // video
         });
+        manifest.addTextStream(4, (stream) => {
+          stream.bandwidth = 10;
+        });
       });
 
       await player.load(fakeManifestUri, 0, fakeMimeType);
@@ -2649,11 +2652,15 @@ describe('Player', () => {
     });
 
     it('tracks info about current stream', () => {
-      const stats = player.getStats();
+      let stats = player.getStats();
       // Should have chosen the first of each type of stream.
       expect(stats.width).toBe(100);
       expect(stats.height).toBe(200);
       expect(stats.streamBandwidth).toBe(200);
+      const textTracks = player.getTextTracks();
+      player.selectTextTrack(textTracks[0]);
+      stats = player.getStats();
+      expect(stats.streamBandwidth).toBe(210);
     });
 
     it('tracks frame info', () => {
@@ -2768,7 +2775,7 @@ describe('Player', () => {
        * @param {!Array.<shaka.extern.TrackChoice>} additional
        */
       function checkHistory(additional) {
-        const prefix = {
+        const variantPrefix = {
           timestamp: jasmine.any(Number),
           id: 0,
           type: 'variant',
@@ -2776,10 +2783,18 @@ describe('Player', () => {
           bandwidth: 200,
         };
 
+        const textPrefix = {
+          timestamp: jasmine.any(Number),
+          id: 4,
+          type: 'text',
+          fromAdaptation: true,
+          bandwidth: null,
+        };
         const switchHistory = player.getStats().switchHistory;
 
-        expect(switchHistory[0]).toEqual(prefix);
-        expect(switchHistory.slice(1)).toEqual(additional);
+        expect(switchHistory[0]).toEqual(variantPrefix);
+        expect(switchHistory[1]).toEqual(textPrefix);
+        expect(switchHistory.slice(2)).toEqual(additional);
       }
 
       /**

package/ui/controls.js

@@ -648,6 +648,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()) {