shaka-player 4.8.8 → 4.8.10

package/lib/cea/cea608_data_channel.js

@@ -642,6 +642,15 @@ shaka.cea.Cea608DataChannel = class {
     // b1 -> |P|0|0|1|X|X|X|X|
     return (b1 & 0x70) === 0x10;
   }
+
+  /**
+   * Checks if the data contains a XDS control code.
+   * @param {number} b1 Byte 1.
+   * @return {boolean}
+   */
+  static isXdsControlCode(b1) {
+    return b1 >= 0x01 && b1 <= 0x0F;
+  }
 };
 
 /**

package/lib/cea/cea_decoder.js

@@ -307,16 +307,20 @@ shaka.cea.CeaDecoder = class {
     ccPacket.ccData1 &= 0x7f;
     ccPacket.ccData2 &= 0x7f;
 
+    // Ignore XDS
+    if (shaka.cea.Cea608DataChannel.isXdsControlCode(ccPacket.ccData1)) {
+      return null;
+    }
+
     // Check for empty captions and skip them.
     if (!ccPacket.ccData1 && !ccPacket.ccData2) {
       return null;
     }
 
-    this.streams_.add(selectedMode);
-
     // Process the clean CC data pair.
     let parsedClosedCaption = null;
     if (shaka.cea.Cea608DataChannel.isControlCode(ccPacket.ccData1)) {
+      this.streams_.add(selectedMode);
       parsedClosedCaption = selectedStream.handleControlCode(ccPacket);
     } else {
       // Handle as a Basic North American Character.

package/lib/media/manifest_filterer.js

@@ -41,27 +41,23 @@ shaka.media.ManifestFilterer = class {
   }
 
   /**
-   * Filters a manifest, removing unplayable streams/variants.
+   * Filters a manifest, removing unplayable streams/variants and  choosing
+   * the codecs.
    *
    * @param {?shaka.extern.Manifest} manifest
    * @return {!Promise.<boolean>} tracksChanged
    */
   async filterManifest(manifest) {
-    await this.filterManifestWithStreamUtils_(manifest);
-    return this.filterManifestWithRestrictions(manifest);
-  }
-
-  /**
-   * Filters a manifest, removing unplayable streams/variants.
-   *
-   * @param {?shaka.extern.Manifest} manifest
-   * @private
-   */
-  async filterManifestWithStreamUtils_(manifest) {
     goog.asserts.assert(manifest, 'Manifest should exist!');
     await shaka.util.StreamUtils.filterManifest(this.drmEngine_, manifest,
         this.config_.drm.preferredKeySystems);
+    shaka.util.StreamUtils.chooseCodecsAndFilterManifest(
+        manifest,
+        this.config_.preferredVideoCodecs,
+        this.config_.preferredAudioCodecs,
+        this.config_.preferredDecodingAttributes);
     this.checkPlayableVariants_(manifest);
+    return this.filterManifestWithRestrictions(manifest);
   }
 
 

package/lib/media/preload_manager.js

@@ -553,7 +553,9 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
 
     const tracksChangedInitial = this.manifestFilterer_.applyRestrictions(
         this.manifest_);
-    if (tracksChangedInitial) {
+    const tracksChangedBefore = await this.manifestFilterer_.filterManifest(
+        this.manifest_);
+    if (tracksChangedInitial || tracksChangedBefore) {
       const event = this.makeEvent_(
           shaka.util.FakeEvent.EventName.TracksChanged);
       await Promise.resolve();
@@ -568,7 +570,6 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
 
     // Now that we have drm information, filter the manifest (again) so that
     // we can ensure we only use variants with the selected key system.
-    // const tracksChanged =
     const tracksChangedAfter = await this.manifestFilterer_.filterManifest(
         this.manifest_);
     if (tracksChangedAfter) {
@@ -630,14 +631,6 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
               this.config_.preferredVideoLabel,
               this.config_.mediaSource.codecSwitchingStrategy,
               this.config_.manifest.dash.enableAudioGroups);
-
-      // If the content is multi-codec and the browser can play more than one of
-      // them, choose codecs now before we initialize streaming.
-      shaka.util.StreamUtils.chooseCodecsAndFilterManifest(
-          this.manifest_,
-          this.config_.preferredVideoCodecs,
-          this.config_.preferredAudioCodecs,
-          this.config_.preferredDecodingAttributes);
     }
 
     // Make the ABR manager.

package/lib/net/networking_engine.js

@@ -146,6 +146,19 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
     delete shaka.net.NetworkingEngine.schemes_[scheme];
   }
 
+  /**
+   * Copies all of the filters from this networking engine into another.
+   * @param {!shaka.net.NetworkingEngine} other
+   */
+  copyFiltersInto(other) {
+    for (const filter of this.requestFilters_) {
+      other.requestFilters_.add(filter);
+    }
+    for (const filter of this.responseFilters_) {
+      other.responseFilters_.add(filter);
+    }
+  }
+
   /**
    * Registers a new request filter.  All filters are applied in the order they
    * are registered.

package/lib/player.js

@@ -1968,6 +1968,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // Sadly, as the network engine creation code must be replaceable by tests,
     // it cannot be made and use the utilities defined in this function.
     const networkingEngine = this.createNetworkingEngine(getPreloadManager);
+    this.networkingEngine_.copyFiltersInto(networkingEngine);
 
     /** @return {!shaka.media.DrmEngine} */
     const createDrmEngine = () => {
@@ -2265,7 +2266,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     const setupPlayhead = (startTime) => {
       this.playhead_ = this.createPlayhead(startTime);
       this.playheadObservers_ =
-          this.createPlayheadObserversForMSE_(startTimeOfLoad);
+          this.createPlayheadObserversForMSE_(startTime);
 
       // We need to start the buffer management code near the end because it
       // will set the initial buffering state and that depends on other
@@ -3080,16 +3081,16 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * Create the observers for MSE playback. These observers are responsible for
    * notifying the app and player of specific events during MSE playback.
    *
-   * @param {number} startTimeOfLoad
+   * @param {number} startTime
    * @return {!shaka.media.PlayheadObserverManager}
    * @private
    */
-  createPlayheadObserversForMSE_(startTimeOfLoad) {
+  createPlayheadObserversForMSE_(startTime) {
     goog.asserts.assert(this.manifest_, 'Must have manifest');
     goog.asserts.assert(this.regionTimeline_, 'Must have region timeline');
     goog.asserts.assert(this.video_, 'Must have video element');
 
-    const startsPastZero = this.isLive() || startTimeOfLoad > 0;
+    const startsPastZero = this.isLive() || startTime > 0;
 
     // Create the region observer. This will allow us to notify the app when we
     // move in and out of timeline regions.
@@ -7239,7 +7240,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.8.8' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.8.10' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/util/object_utils.js

@@ -41,8 +41,7 @@ shaka.util.ObjectUtils = class {
 
           // This covers Uint8Array and friends, even without a TypedArray
           // base-class constructor.
-          const isTypedArray =
-              val.buffer && val.buffer.constructor == ArrayBuffer;
+          const isTypedArray = val.buffer instanceof ArrayBuffer;
           if (isTypedArray) {
             return val;
           }

package/package.json

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

package/ui/audio_language_selection.js

@@ -46,6 +46,10 @@ shaka.ui.AudioLanguageSelection = class extends shaka.ui.SettingsMenu {
         });
 
 
+    this.eventManager.listen(this.player, 'loading', () => {
+      this.onTracksChanged_();
+    });
+
     this.eventManager.listen(this.player, 'trackschanged', () => {
       this.onTracksChanged_();
     });

package/ui/resolution_selection.js

@@ -50,6 +50,10 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
         });
 
 
+    this.eventManager.listen(this.player, 'loading', () => {
+      this.updateResolutionSelection_();
+    });
+
     this.eventManager.listen(this.player, 'variantchanged', () => {
       this.updateResolutionSelection_();
     });

package/ui/text_selection.js

@@ -64,6 +64,10 @@ shaka.ui.TextSelection = class extends shaka.ui.SettingsMenu {
           this.updateTextLanguages_();
         });
 
+    this.eventManager.listen(this.player, 'loading', () => {
+      this.onTracksChanged_();
+    });
+
     this.eventManager.listen(this.player, 'texttrackvisibility', () => {
       this.onCaptionStateChange_();
       this.updateTextLanguages_();