shaka-player 4.3.11 → 4.3.12

package/docs/tutorials/faq.md

@@ -153,7 +153,7 @@ In other environments, for example Electron, it is appropriate.
 In those cases, before Shaka Player loads a manifest, you can register the
 existing http plugin for `file://` requests:
 ```js
-shaka.net.NetworkingEngine.registerScheme('file', shaka.net.HttpXHRPlugin);
+shaka.net.NetworkingEngine.registerScheme('file', shaka.net.HttpXHRPlugin.parse);
 ```
 
 <hr>

package/lib/player.js

@@ -2651,16 +2651,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return;
     }
 
-    this.selectAudioLanguage(preferredAudioLanguage);
-
     const preferredVariantRole = this.config_.preferredVariantRole;
-
-    // If the user has not selected a role preference, the previous match is
-    // selected.
-    if (preferredVariantRole == '') {
-      return;
-    }
-
     this.selectAudioLanguage(preferredAudioLanguage, preferredVariantRole);
   }
 
@@ -2671,7 +2662,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    */
   setupPreferredTextOnSrc_() {
     const preferredTextLanguage = this.config_.preferredTextLanguage;
-    const preferForcedSubs = this.config_.preferForcedSubs;
 
     // If the user has not selected a preference, the browser preference is
     // left.
@@ -2679,16 +2669,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return;
     }
 
-    this.selectTextLanguage(preferredTextLanguage, '', preferForcedSubs);
-
+    const preferForcedSubs = this.config_.preferForcedSubs;
     const preferredTextRole = this.config_.preferredTextRole;
 
-    // If the user has not selected a role preference, the previous match is
-    // selected.
-    if (preferredTextRole == '') {
-      return;
-    }
-
     this.selectTextLanguage(preferredTextLanguage, preferredTextRole,
         preferForcedSubs);
   }
@@ -4141,8 +4124,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @export
    */
   selectAudioLanguage(language, role, channelsCount = 0) {
-    const LanguageUtils = shaka.util.LanguageUtils;
-
     if (this.manifest_ && this.playhead_) {
       this.currentAdaptationSetCriteria_ =
           new shaka.media.PreferenceBasedCriteria(language, role || '',
@@ -4180,33 +4161,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // If we haven't switched yet, just use ABR to find a new track.
       this.chooseVariantAndSwitch_();
     } else if (this.video_ && this.video_.audioTracks) {
-      const audioTracks = Array.from(this.video_.audioTracks);
-      const selectedLanguage = LanguageUtils.normalize(language);
-
-      let languageMatch = null;
-      let languageAndRoleMatch = null;
-
-      for (const audioTrack of audioTracks) {
-        const track = shaka.util.StreamUtils.html5AudioTrackToTrack(audioTrack);
-
-        if (LanguageUtils.normalize(track.language) == selectedLanguage) {
-          languageMatch = audioTrack;
-
-          if (role) {
-            if (track.roles.includes(role)) {
-              languageAndRoleMatch = audioTrack;
-            }
-          } else {  // no role
-            if (track.roles.length == 0) {
-              languageAndRoleMatch = audioTrack;
-            }
-          }
-        }
-      }
-      if (languageAndRoleMatch) {
-        this.switchHtml5Track_(languageAndRoleMatch);
-      } else if (languageMatch) {
-        this.switchHtml5Track_(languageMatch);
+      const track = shaka.util.StreamUtils.filterStreamsByLanguageAndRole(
+          this.getVariantTracks(), language, role || '', false)[0];
+      if (track) {
+        this.selectVariantTrack(track);
       }
     }
   }
@@ -4222,8 +4180,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @export
    */
   selectTextLanguage(language, role, forced = false) {
-    const LanguageUtils = shaka.util.LanguageUtils;
-
     if (this.manifest_ && this.playhead_) {
       this.currentTextLanguage_ = language;
       this.currentTextRole_ = role || '';
@@ -4244,13 +4200,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         }
       }
     } else {
-      const selectedLanguage = LanguageUtils.normalize(language);
-
-      const track = this.getTextTracks().find((t) => {
-        return LanguageUtils.normalize(t.language) == selectedLanguage &&
-          (!role || t.roles.includes(role)) && t.forced == forced;
-      });
-
+      const track = shaka.util.StreamUtils.filterStreamsByLanguageAndRole(
+          this.getTextTracks(), language, role || '', forced)[0];
       if (track) {
         this.selectTextTrack(track);
       }
@@ -7020,7 +6971,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.11-uncompiled';
+shaka.Player.version = 'v4.3.12-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/ttml_text_parser.js

@@ -214,11 +214,12 @@ shaka.text.TtmlTextParser = class {
       }
     }
 
-    const parentIsContent = isContent;
     if (cueNode.nodeName == 'p' || imageElement) {
       isContent = true;
     }
 
+    const parentIsContent = isContent;
+
     const spaceStyle = cueElement.getAttribute('xml:space') ||
         (whitespaceTrim ? 'default' : 'preserve');
 

package/lib/text/ui_text_displayer.js

@@ -481,6 +481,43 @@ shaka.text.UITextDisplayer = class {
     this.currentCuesMap_.set(cue, {cueElement, wrapper, regionElement});
   }
 
+  /**
+   * Compute cue position alignment
+   * See https://www.w3.org/TR/webvtt1/#webvtt-cue-position-alignment
+   *
+   * @param {!shaka.extern.Cue} cue
+   * @private
+   */
+  computeCuePositionAlignment_(cue) {
+    const Cue = shaka.text.Cue;
+    const {direction, positionAlign, textAlign} = cue;
+
+    if (positionAlign !== Cue.positionAlign.AUTO) {
+      // Position align is not AUTO: use it
+      return positionAlign;
+    }
+
+    // Position align is AUTO: use text align to compute its value
+
+    if (textAlign === Cue.textAlign.LEFT ||
+      (textAlign === Cue.textAlign.START &&
+        direction === Cue.direction.HORIZONTAL_LEFT_TO_RIGHT) ||
+      (textAlign === Cue.textAlign.END &&
+        direction === Cue.direction.HORIZONTAL_RIGHT_TO_LEFT)) {
+      return Cue.positionAlign.LEFT;
+    }
+
+    if (textAlign === Cue.textAlign.RIGHT ||
+      (textAlign === Cue.textAlign.START &&
+        direction === Cue.direction.HORIZONTAL_RIGHT_TO_LEFT) ||
+      (textAlign === Cue.textAlign.END &&
+        direction === Cue.direction.HORIZONTAL_LEFT_TO_RIGHT)) {
+      return Cue.positionAlign.RIGHT;
+    }
+
+    return Cue.positionAlign.CENTER;
+  }
+
   /**
    * @param {!HTMLElement} cueElement
    * @param {!shaka.extern.Cue} cue
@@ -617,7 +654,15 @@ shaka.text.UITextDisplayer = class {
     // TODO: Implement line alignment with line number.
     // TODO: Implement lineAlignment of 'CENTER'.
     if (cue.line != null) {
-      if (cue.lineInterpretation == Cue.lineInterpretation.PERCENTAGE) {
+      let lineInterpretation = cue.lineInterpretation;
+      // HACK: the current implementation of UITextDisplayer only handled
+      // PERCENTAGE, as cue.line=0 is zero, we can interpret it as percentage
+      // safely.
+      if (cue.line == 0 &&
+          lineInterpretation == Cue.lineInterpretation.LINE_NUMBER) {
+        lineInterpretation = Cue.lineInterpretation.PERCENTAGE;
+      }
+      if (lineInterpretation == Cue.lineInterpretation.PERCENTAGE) {
         style.position = 'absolute';
         if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
           style.width = '100%';
@@ -658,9 +703,10 @@ shaka.text.UITextDisplayer = class {
 
     // The positionAlign attribute is an alignment for the text container in
     // the dimension of the writing direction.
-    if (cue.positionAlign == Cue.positionAlign.LEFT) {
+    const computedPositionAlign = this.computeCuePositionAlignment_(cue);
+    if (computedPositionAlign == Cue.positionAlign.LEFT) {
       style.cssFloat = 'left';
-    } else if (cue.positionAlign == Cue.positionAlign.RIGHT) {
+    } else if (computedPositionAlign == Cue.positionAlign.RIGHT) {
       style.cssFloat = 'right';
     }
 

package/lib/text/vtt_text_parser.js

@@ -403,8 +403,6 @@ shaka.text.VttTextParser = class {
       cue = new shaka.text.Cue(start, end, '');
     }
 
-    VttTextParser.parseCueStyles(payload, cue, styles);
-
     // Parse optional settings.
     parser.skipWhitespace();
     let word = parser.readWord();
@@ -418,6 +416,8 @@ shaka.text.VttTextParser = class {
       word = parser.readWord();
     }
 
+    VttTextParser.parseCueStyles(payload, cue, styles);
+
     if (id != null) {
       cue.id = id;
     }

package/lib/util/player_configuration.js

@@ -69,8 +69,8 @@ shaka.util.PlayerConfiguration = class {
       advanced: {},    // key is arbitrary key system ID, value is a record type
       delayLicenseRequestUntilPlayed: false,
       initDataTransform: (initData, initDataType, drmInfo) => {
-        const keySystem = drmInfo.keySystem;
-        if (keySystem == 'com.apple.fps.1_0' && initDataType == 'skd') {
+        if (shaka.util.Platform.isMediaKeysPolyfilled() &&
+            initDataType == 'skd') {
           const cert = drmInfo.serverCertificate;
           const contentId =
               shaka.util.FairPlayUtils.defaultGetContentId(initData);

package/lib/util/stream_utils.js

@@ -1442,22 +1442,23 @@ shaka.util.StreamUtils = class {
 
   /**
    * Chooses streams according to the given config.
+   * Works both for Stream and Track types due to their similarities.
    *
-   * @param {!Array.<shaka.extern.Stream>} streams
+   * @param {!Array<!shaka.extern.Stream>|!Array<!shaka.extern.Track>} streams
    * @param {string} preferredLanguage
    * @param {string} preferredRole
    * @param {boolean} preferredForced
-   * @return {!Array.<!shaka.extern.Stream>}
+   * @return {!Array<!shaka.extern.Stream>|!Array<!shaka.extern.Track>}
    */
   static filterStreamsByLanguageAndRole(
       streams, preferredLanguage, preferredRole, preferredForced) {
     const LanguageUtils = shaka.util.LanguageUtils;
 
-    /** @type {!Array.<!shaka.extern.Stream>} */
+    /** @type {!Array<!shaka.extern.Stream>|!Array<!shaka.extern.Track>} */
     let chosen = streams;
 
     // Start with the set of primary streams.
-    /** @type {!Array.<!shaka.extern.Stream>} */
+    /** @type {!Array<!shaka.extern.Stream>|!Array<!shaka.extern.Track>} */
     const primary = streams.filter((stream) => {
       return stream.primary;
     });
@@ -1497,7 +1498,7 @@ shaka.util.StreamUtils = class {
 
     // Now refine the choice based on role preference.
     if (preferredRole) {
-      const roleMatches = shaka.util.StreamUtils.filterTextStreamsByRole_(
+      const roleMatches = shaka.util.StreamUtils.filterStreamsByRole_(
           chosen, preferredRole);
       if (roleMatches.length) {
         return roleMatches;
@@ -1525,20 +1526,21 @@ shaka.util.StreamUtils = class {
     if (!allRoles.length) {
       return chosen;
     }
-    return shaka.util.StreamUtils.filterTextStreamsByRole_(chosen, allRoles[0]);
+    return shaka.util.StreamUtils.filterStreamsByRole_(chosen, allRoles[0]);
   }
 
 
   /**
-   * Filter text Streams by role.
+   * Filter Streams by role.
+   * Works both for Stream and Track types due to their similarities.
    *
-   * @param {!Array.<shaka.extern.Stream>} textStreams
+   * @param {!Array<!shaka.extern.Stream>|!Array<!shaka.extern.Track>} streams
    * @param {string} preferredRole
-   * @return {!Array.<shaka.extern.Stream>}
+   * @return {!Array<!shaka.extern.Stream>|!Array<!shaka.extern.Track>}
    * @private
    */
-  static filterTextStreamsByRole_(textStreams, preferredRole) {
-    return textStreams.filter((stream) => {
+  static filterStreamsByRole_(streams, preferredRole) {
+    return streams.filter((stream) => {
       return stream.roles.includes(preferredRole);
     });
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.3.11",
+  "version": "4.3.12",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -42,7 +42,7 @@
     "karma-coverage": "^2.2.0",
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-ajax": "^0.1.13",
-    "karma-local-wd-launcher": "^1.6.4",
+    "karma-local-wd-launcher": "^1.6.6",
     "karma-opera-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-spec-reporter": "^0.0.34",

package/test/text/ttml_text_parser_unit.js

@@ -1866,9 +1866,8 @@ describe('TtmlTextParser', () => {
             endTime: 60,
             payload: '',
             fontSize: '15px',
-            // Styles from regionStyle should apply only to the nested cue.
-            backgroundColor: '',
-            color: '',
+            backgroundColor: 'transparent',
+            color: 'blue',
             displayAlign: Cue.displayAlign.CENTER,
             textAlign: Cue.textAlign.CENTER,
 
@@ -1970,7 +1969,7 @@ describe('TtmlTextParser', () => {
             startTime: 0,
             endTime: 60,
             payload: '',
-            fontSize: '',
+            fontSize: '16px',
             nestedCues: [
               {
                 startTime: 0,

package/test/text/vtt_text_parser_unit.js

@@ -207,15 +207,30 @@ describe('VttTextParser', () => {
           {
             startTime: 40,
             endTime: 50,
-            payload: 'Test2',
+            payload: '',
             writingMode: Cue.writingMode.VERTICAL_LEFT_TO_RIGHT,
+            nestedCues: [
+              {
+                startTime: 40,
+                endTime: 50,
+                payload: 'Test',
+                writingMode: Cue.writingMode.VERTICAL_LEFT_TO_RIGHT,
+              },
+              {
+                startTime: 40,
+                endTime: 50,
+                payload: '2',
+                fontWeight: Cue.fontWeight.BOLD,
+                writingMode: Cue.writingMode.VERTICAL_LEFT_TO_RIGHT,
+              },
+            ],
           },
         ],
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000 vertical:rl\n' +
         'Test\n\n' +
         '00:00:40.000 --> 00:00:50.000 vertical:lr\n' +
-        'Test2',
+        'Test<b>2</b>',
         {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 

package/test/text/web_vtt_layout_integration.js

@@ -213,7 +213,6 @@ filterDescribe('WebVTT layout', shaka.test.TextLayoutTests.supported, () => {
       await helper.checkScreenshot('line-negative-2');
     });
 
-    // FIXME: UI version is wrong: not positioned by line
     it('line 0', async () => {
       parseAndDisplay([
         'WEBVTT\n',