shaka-player 4.3.9 → 4.3.11

package/externs/shaka/namespace.js

@@ -6,8 +6,8 @@
 
 /**
  * @externs
- * @suppress {duplicate} To prevent compiler errors with the namespace
- *   being declared both here and by goog.provide in the library.
+ * @suppress {constantProperty, duplicate} To prevent compiler errors with the
+ *   namespace being declared both here and by goog.provide in the library.
  */
 
 /** @namespace */

package/karma.conf.js

@@ -351,6 +351,8 @@ module.exports = (config) => {
       },
 
       babelPreprocessor: {
+        // Cache results in .babel-cache
+        cachePath: '.babel-cache',
         options: {
           presets: ['@babel/preset-env'],
           // Add source maps so that backtraces refer to the original code.

package/lib/ads/client_side_ad_manager.js

@@ -33,6 +33,9 @@ shaka.ads.ClientSideAdManager = class {
     /** @private {HTMLMediaElement} */
     this.video_ = video;
 
+    /** @private {boolean} */
+    this.videoPlayed_ = false;
+
     /** @private {ResizeObserver} */
     this.resizeObserver_ = null;
 
@@ -82,6 +85,10 @@ shaka.ads.ClientSideAdManager = class {
     this.eventManager_.listen(this.video_, 'ended', () => {
       this.adsLoader_.contentComplete();
     });
+
+    this.eventManager_.listenOnce(this.video_, 'play', () => {
+      this.videoPlayed_ = true;
+    });
   }
 
   /**
@@ -219,9 +226,14 @@ shaka.ads.ClientSideAdManager = class {
       // seen the ads actually play until requestAds() is called.
       // Note: We listen for a play event to avoid autoplay issues that might
       // crash IMA.
-      this.eventManager_.listenOnce(this.video_, 'play', () => {
+      if (this.videoPlayed_) {
         this.imaAdsManager_.start();
-      });
+      } else {
+        this.eventManager_.listenOnce(this.video_, 'play', () => {
+          this.videoPlayed_ = true;
+          this.imaAdsManager_.start();
+        });
+      }
     } catch (adError) {
       // If there was a problem with the VAST response,
       // we we won't be getting an ad. Hide ad UI if we showed it already

package/lib/hls/hls_parser.js

@@ -1155,6 +1155,7 @@ shaka.hls.HlsParser = class {
       // and no video codec, so it should be audio.
       type = ContentType.AUDIO;
       shaka.log.debug('Guessing audio-only.');
+      ignoreStream = res.audio.length > 0;
     } else if (!streamInfos.length && audioCodecs && videoCodecs) {
       // There are both audio and video codecs, so assume multiplexed content.
       // Note that the default used when CODECS is missing assumes multiple

package/lib/player.js

@@ -7020,7 +7020,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v4.3.9-uncompiled';
+shaka.Player.version = 'v4.3.11-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/util/platform.js

@@ -214,6 +214,7 @@ shaka.util.Platform = class {
         !shaka.util.Platform.isTizen() &&
         !shaka.util.Platform.isEOS() &&
         !shaka.util.Platform.isVirginMedia() &&
+        !shaka.util.Platform.isOrange() &&
         !shaka.util.Platform.isPS4() &&
         !shaka.util.Platform.isAmazonFireTV();
   }
@@ -253,6 +254,13 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('VirginMedia');
   }
 
+  /**
+   * Check if the current platform is Orange.
+   */
+  static isOrange() {
+    return shaka.util.Platform.userAgentContains_('SOPOpenBrowser');
+  }
+
   /**
    * 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.3.9",
+  "version": "4.3.11",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -14,6 +14,7 @@
     "@babel/core": "^7.17.5",
     "@babel/polyfill": "^7.12.1",
     "@babel/preset-env": "^7.16.11",
+    "@joeyparrish/karma-babel-preprocessor": "^8.2.0",
     "@teppeis/clutz": "^1.0.29-4c95e12.v20190929",
     "awesomplete": "^1.1.5",
     "babel-plugin-istanbul": "^6.1.1",
@@ -38,7 +39,6 @@
     "js-yaml": "^4.1.0",
     "jsdoc": "github:joeyparrish/jsdoc#2ca85bb6",
     "karma": "^6.3.16",
-    "karma-babel-preprocessor": "^8.0.2",
     "karma-coverage": "^2.2.0",
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-ajax": "^0.1.13",

package/test/hls/hls_parser_unit.js

@@ -4113,19 +4113,11 @@ describe('HlsParser', () => {
     expect(videoSegments2[2].endTime).toBe(10);
   });
 
-  // Issue #1875
-  it('ignores audio groups on audio-only content', async () => {
-    // NOTE: To reproduce the original issue accurately, the two audio playlist
-    // URIs must differ.  When the issue occurred, the audio-only variant would
-    // be detected as a video stream and combined with the audio group, leading
-    // the player to buffer "video" that was really audio, resulting in
-    // audio-only playback to the exclusion of any other streams.  Since the
-    // root cause of that was the mis-detection, this repro case does not need
-    // to include any audio+video variants.
+  it('allow audio groups on audio-only content', async () => {
     const master = [
       '#EXTM3U\n',
-      '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud",LANG="en",URI="audio1"\n',
-      '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud",LANG="eo",URI="audio2"\n',
+      '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud",LANGUAGE="en",URI="audio1"\n',
+      '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud",LANGUAGE="eo",URI="audio2"\n',
       '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="mp4a",AUDIO="aud"\n',
       'audio3\n',
     ].join('');
@@ -4143,7 +4135,14 @@ describe('HlsParser', () => {
       manifest.anyTimeline();
       manifest.addPartialVariant((variant) => {
         variant.bandwidth = 200;
-        variant.language = 'und';
+        variant.language = 'en';
+        variant.addPartialStream(ContentType.AUDIO, (stream) => {
+          stream.mime('audio/mp4', 'mp4a');
+        });
+      });
+      manifest.addPartialVariant((variant) => {
+        variant.bandwidth = 200;
+        variant.language = 'eo';
         variant.addPartialStream(ContentType.AUDIO, (stream) => {
           stream.mime('audio/mp4', 'mp4a');
         });
@@ -4161,7 +4160,7 @@ describe('HlsParser', () => {
 
     const actual = await parser.start('test:/master', playerInterface);
     await loadAllStreamsFor(actual);
-    expect(actual.variants.length).toBe(1);
+    expect(actual.variants.length).toBe(2);
     expect(actual).toEqual(manifest);
   });
 

package/test/player_integration.js

@@ -575,7 +575,10 @@ describe('Player', () => {
       await waiter.timeoutAfter(20).waitUntilPlayheadReaches(video, 5);
 
       // Seek the video, and see if it can continue playing from that point.
-      video.currentTime = 20;
+      // If this is a multiple of 10, it tends to flake on Tizen with stall
+      // detection disabled.  So use 25.
+      video.currentTime = 25;
+
       // Expect that we can then reach the end of the video.
       await waiter.timeoutAfter(40).waitForEnd(video);
     });

package/test/test/util/ui_utils.js

@@ -169,7 +169,11 @@ shaka.test.UiUtils = class {
     const video = /** @type {!HTMLVideoElement} */(document.createElement(
         'video'));
 
-    video.muted = true;
+    // Tizen has issues with audio-only playbacks on muted video elements.
+    // Don't mute Tizen.
+    if (!shaka.util.Platform.isTizen()) {
+      video.muted = true;
+    }
     video.width = 600;
     video.height = 400;
 

package/ui/externs/ui.js

@@ -147,8 +147,8 @@ shaka.extern.UIVolumeBarColors;
  *   ROLE means that only the role of the item is shown.
  *   LANGUAGE_ROLE means both language and role are shown, or just language if
  *   there is no role.
- *   LABEL means the non-standard DASH "label" attribute or the HLS "NAME"
- *   attribute are shown.
+ *   LABEL means the non-standard DASH "label" attribute or the standard DASH
+ *   "Label" element or the HLS "NAME" attribute are shown.
  *   Defaults to LANGUAGE.
  * @property {number} fadeDelay
  *   The delay (in seconds) before fading out the controls once the user stops

package/ui/seek_bar.js

@@ -59,7 +59,13 @@ shaka.ui.SeekBar = class extends shaka.ui.RangeElement {
      * @private {shaka.util.Timer}
      */
     this.seekTimer_ = new shaka.util.Timer(() => {
-      this.video.currentTime = this.getValue();
+      let newCurrentTime = this.getValue();
+      if (!this.player.isLive()) {
+        if (newCurrentTime == this.video.duration) {
+          newCurrentTime -= 0.001;
+        }
+      }
+      this.video.currentTime = newCurrentTime;
     });