shaka-player 4.8.8 → 4.8.9

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/player.js

@@ -7239,7 +7239,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.9' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/package.json

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