shaka-player 4.2.13 → 4.2.14

package/externs/shaka/manifest.js

@@ -321,7 +321,8 @@ shaka.extern.FetchCryptoKeysFunction;
  *   tilesLayout: (string|undefined),
  *   matchedStreams:
  *      (!Array.<shaka.extern.Stream>|!Array.<shaka.extern.StreamDB>|
- *      undefined)
+ *      undefined),
+ *   external: boolean
  * }}
  *
  * @description
@@ -434,6 +435,9 @@ shaka.extern.FetchCryptoKeysFunction;
  * @property {(!Array.<shaka.extern.Stream>|!Array.<shaka.extern.StreamDB>|
  *   undefined)} matchedStreams
  *   The streams in all periods which match the stream. Used for Dash.
+ * @property {boolean} external
+ *   Indicate if the stream was added externally.
+ *   Eg: external text tracks.
  *
  * @exportDoc
  */

package/externs/shaka/offline.js

@@ -132,7 +132,8 @@ shaka.extern.ManifestDB;
  *   audioSamplingRate: ?number,
  *   spatialAudio: boolean,
  *   closedCaptions: Map.<string, string>,
- *   tilesLayout: (string|undefined)
+ *   tilesLayout: (string|undefined),
+ *   external: boolean
  * }}
  *
  * @property {number} id
@@ -193,6 +194,9 @@ shaka.extern.ManifestDB;
  *   The value is a grid-item-dimension consisting of two positive decimal
  *   integers in the format: column-x-row ('4x3'). It describes the arrangement
  *   of Images in a Grid. The minimum valid LAYOUT is '1x1'.
+ * @property {boolean} external
+ *   Indicate if the stream was added externally.
+ *   Eg: external text tracks.
  */
 shaka.extern.StreamDB;
 

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/dash/dash_parser.js

@@ -1337,6 +1337,7 @@ shaka.dash.DashParser = class {
         hdr,
         tilesLayout,
         matchedStreams: [],
+        external: false,
       };
     }
 

package/lib/hls/hls_parser.js

@@ -1757,6 +1757,7 @@ shaka.hls.HlsParser = class {
       closedCaptions,
       hdr: undefined,
       tilesLayout: undefined,
+      external: false,
     };
 
     return {

package/lib/media/media_source_engine.js

@@ -354,7 +354,7 @@ shaka.media.MediaSourceEngine = class {
       let mimeType = shaka.util.MimeUtils.getFullType(
           stream.mimeType, stream.codecs);
       if (contentType == ContentType.TEXT) {
-        this.reinitText(mimeType, sequenceMode);
+        this.reinitText(mimeType, sequenceMode, stream.external);
       } else {
         if ((forceTransmuxTS || !MediaSource.isTypeSupported(mimeType)) &&
             shaka.media.Transmuxer.isSupported(mimeType, contentType)) {
@@ -383,13 +383,14 @@ shaka.media.MediaSourceEngine = class {
    * Reinitialize the TextEngine for a new text type.
    * @param {string} mimeType
    * @param {boolean} sequenceMode
+   * @param {boolean} external
    */
-  reinitText(mimeType, sequenceMode) {
+  reinitText(mimeType, sequenceMode, external) {
     if (!this.textEngine_) {
       this.textEngine_ = new shaka.text.TextEngine(this.textDisplayer_);
     }
     this.textEngine_.initParser(mimeType, sequenceMode,
-        this.segmentRelativeVttTiming_);
+        external || this.segmentRelativeVttTiming_);
   }
 
   /**
@@ -564,7 +565,7 @@ shaka.media.MediaSourceEngine = class {
       // the video stream, so textEngine may not have been initialized.
       if (!this.textEngine_) {
         this.reinitText(shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE,
-            this.sequenceMode_);
+            this.sequenceMode_, /* external= */ false);
       }
 
       if (transmuxedData.metadata) {
@@ -593,7 +594,7 @@ shaka.media.MediaSourceEngine = class {
     } else if (hasClosedCaptions) {
       if (!this.textEngine_) {
         this.reinitText(shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE,
-            this.sequenceMode_);
+            this.sequenceMode_, /* external= */ false);
       }
       // If it is the init segment for closed captions, initialize the closed
       // caption parser.

package/lib/media/streaming_engine.js

@@ -240,7 +240,7 @@ shaka.media.StreamingEngine = class {
     const mimeType = shaka.util.MimeUtils.getFullType(
         stream.mimeType, stream.codecs);
     this.playerInterface_.mediaSourceEngine.reinitText(
-        mimeType, this.manifest_.sequenceMode);
+        mimeType, this.manifest_.sequenceMode, stream.external);
 
     const textDisplayer =
         this.playerInterface_.mediaSourceEngine.getTextDisplayer();
@@ -447,7 +447,7 @@ shaka.media.StreamingEngine = class {
       const fullMimeType = shaka.util.MimeUtils.getFullType(
           stream.mimeType, stream.codecs);
       this.playerInterface_.mediaSourceEngine.reinitText(
-          fullMimeType, this.manifest_.sequenceMode);
+          fullMimeType, this.manifest_.sequenceMode, stream.external);
     }
 
     // Releases the segmentIndex of the old stream.

package/lib/offline/indexeddb/v1_storage_cell.js

@@ -176,6 +176,7 @@ shaka.offline.indexeddb.V1StorageCell = class
       spatialAudio: false,
       closedCaptions: null,
       tilesLayout: undefined,
+      external: false,
     };
   }
 

package/lib/offline/indexeddb/v2_storage_cell.js

@@ -125,6 +125,7 @@ shaka.offline.indexeddb.V2StorageCell = class
       spatialAudio: false,
       closedCaptions: null,
       tilesLayout: undefined,
+      external: false,
     };
   }
 

package/lib/offline/manifest_converter.js

@@ -202,6 +202,7 @@ shaka.offline.ManifestConverter = class {
       spatialAudio: streamDB.spatialAudio,
       closedCaptions: streamDB.closedCaptions,
       tilesLayout: streamDB.tilesLayout,
+      external: streamDB.external,
     };
 
     return stream;

package/lib/offline/storage.js

@@ -1324,6 +1324,7 @@ shaka.offline.Storage = class {
       spatialAudio: stream.spatialAudio,
       closedCaptions: stream.closedCaptions,
       tilesLayout: stream.tilesLayout,
+      external: stream.external,
     };
 
     const startTime =

package/lib/player.js

@@ -2233,6 +2233,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         audioSamplingRate: null,
         spatialAudio: false,
         closedCaptions: null,
+        external: false,
       },
       bandwidth: 100,
       allowedByApplication: true,
@@ -4627,6 +4628,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       audioSamplingRate: null,
       spatialAudio: false,
       closedCaptions: null,
+      external: true,
     };
 
     const fullMimeType = shaka.util.MimeUtils.getFullType(
@@ -5057,6 +5059,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
               audioSamplingRate: null,
               spatialAudio: false,
               closedCaptions: null,
+              external: false,
             };
             manifest.textStreams.push(textStream);
             closedCaptionsSet.add(id);
@@ -6631,7 +6634,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v4.2.13-uncompiled';
+shaka.Player.version = 'v4.2.14-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/util/periods.js

@@ -1491,6 +1491,7 @@ shaka.util.PeriodCombiner = class {
       audioSamplingRate: null,
       spatialAudio: false,
       closedCaptions: null,
+      external: false,
     };
   }
 
@@ -1527,6 +1528,7 @@ shaka.util.PeriodCombiner = class {
       audioSamplingRate: null,
       spatialAudio: false,
       closedCaptions: null,
+      external: false,
     };
   }
 

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.2.13",
+  "version": "4.2.14",
   "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/media/adaptation_set_unit.js

@@ -218,6 +218,7 @@ describe('AdaptationSet', () => {
       forced: false,
       trickModeVideo: null,
       type: '',
+      external: false,
     };
   }
 });

package/test/media/media_source_engine_unit.js

@@ -1258,7 +1258,7 @@ describe('MediaSourceEngine', () => {
     });
 
     it('destroys text engines', async () => {
-      mediaSourceEngine.reinitText('text/vtt', false);
+      mediaSourceEngine.reinitText('text/vtt', false, false);
 
       await mediaSourceEngine.destroy();
       expect(mockTextEngine).toBeTruthy();

package/test/offline/manifest_convert_unit.js

@@ -316,6 +316,7 @@ describe('ManifestConverter', () => {
       audioSamplingRate: null,
       spatialAudio: false,
       closedCaptions: null,
+      external: false,
     };
 
     return streamDB;
@@ -389,6 +390,7 @@ describe('ManifestConverter', () => {
       spatialAudio: false,
       closedCaptions: null,
       tilesLayout: undefined,
+      external: false,
     };
   }
 
@@ -438,6 +440,7 @@ describe('ManifestConverter', () => {
       spatialAudio: false,
       closedCaptions: null,
       tilesLayout: undefined,
+      external: false,
     };
   }
 
@@ -486,6 +489,7 @@ describe('ManifestConverter', () => {
       spatialAudio: false,
       closedCaptions: null,
       tilesLayout: undefined,
+      external: false,
     };
   }
 
@@ -531,6 +535,7 @@ describe('ManifestConverter', () => {
       spatialAudio: streamDb.spatialAudio,
       closedCaptions: streamDb.closedCaptions,
       tilesLayout: streamDb.tilesLayout,
+      external: streamDb.external,
     };
 
     expect(stream).toEqual(expectedStream);

package/test/player_integration.js

@@ -503,7 +503,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/manifest_generator.js

@@ -544,6 +544,8 @@ shaka.test.ManifestGenerator.Stream = class {
       this.hdr = undefined;
       /** @type {(string|undefined)} */
       this.tilesLayout = undefined;
+      /** @type {boolean} */
+      this.external = false;
     }
 
     /** @type {shaka.extern.Stream} */

package/test/test/util/offline_utils.js

@@ -56,6 +56,7 @@ shaka.test.OfflineUtils = class {
       audioSamplingRate: null,
       spatialAudio: false,
       closedCaptions: null,
+      external: false,
     };
   }
 

package/test/test/util/streaming_engine_util.js

@@ -410,6 +410,7 @@ shaka.test.StreamingEngineUtil = class {
       roles: [],
       forced: false,
       spatialAudio: false,
+      external: false,
     };
   }
 
@@ -447,6 +448,7 @@ shaka.test.StreamingEngineUtil = class {
       roles: [],
       forced: false,
       spatialAudio: false,
+      external: false,
     };
   }
 
@@ -482,6 +484,7 @@ shaka.test.StreamingEngineUtil = class {
       roles: [],
       forced: false,
       spatialAudio: false,
+      external: false,
     };
   }
 };

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;
     });