shaka-player 4.1.2 → 4.1.3

package/test/text/ui_text_displayer_unit.js

@@ -50,6 +50,7 @@ describe('UITextDisplayer', () => {
   });
 
   beforeEach(() => {
+    video.currentTime = 0;
     textDisplayer = new shaka.text.UITextDisplayer(video, videoContainer);
   });
 
@@ -396,4 +397,68 @@ describe('UITextDisplayer', () => {
     expect(parentCueElements.length).toBe(1);
     expect(parentCueElements[0].textContent).toBe('');
   });
+
+  it('creates separate elements for cue regions', () => {
+    const cueRegion = new shaka.text.CueRegion();
+    cueRegion.id = 'regionId';
+    cueRegion.height = 80;
+    cueRegion.heightUnits = shaka.text.CueRegion.units.PERCENTAGE;
+    cueRegion.width = 80;
+    cueRegion.widthUnits = shaka.text.CueRegion.units.PERCENTAGE;
+    cueRegion.viewportAnchorX = 10;
+    cueRegion.viewportAnchorY = 10;
+    cueRegion.viewportAnchorUnits = shaka.text.CueRegion.units.PERCENTAGE;
+
+    // These all attach to the same region, but only one region element should
+    // be created.
+    const cues = [
+      new shaka.text.Cue(0, 100, ''),
+      new shaka.text.Cue(0, 100, ''),
+      new shaka.text.Cue(0, 100, ''),
+    ];
+    for (const cue of cues) {
+      cue.displayAlign = shaka.text.Cue.displayAlign.CENTER;
+      cue.region = cueRegion;
+    }
+
+    textDisplayer.setTextVisibility(true);
+    textDisplayer.append(cues);
+    updateCaptions();
+
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+    const allRegionElements = textContainer.querySelectorAll(
+        '.shaka-text-region');
+
+    // Verify that the nested cues are all attached to a single region element.
+    expect(allRegionElements.length).toBe(1);
+    const regionElement = allRegionElements[0];
+    const children = Array.from(regionElement.childNodes).filter(
+        (e) => e.nodeType == Node.ELEMENT_NODE);
+    expect(children.length).toBe(3);
+
+    // Verify styles applied to the region element.
+    const regionCssObj = parseCssText(regionElement.style.cssText);
+    const expectRegionCssObj = {
+      'position': 'absolute',
+      'height': '80%',
+      'width': '80%',
+      'top': '10%',
+      'left': '10%',
+      'display': 'flex',
+      'flex-direction': 'column',
+      'align-items': 'center',
+      'justify-content': 'center',
+    };
+    expect(regionCssObj).toEqual(jasmine.objectContaining(expectRegionCssObj));
+
+    for (const caption of children) {
+      // Verify that styles applied to the nested cues _DO NOT_ include region
+      // placement.
+      const cueCssObj = parseCssText(caption.style.cssText);
+      expect(Object.keys(cueCssObj)).not.toContain('height');
+      expect(Object.keys(cueCssObj)).not.toContain('width');
+      expect(Object.keys(cueCssObj)).not.toContain('top');
+      expect(Object.keys(cueCssObj)).not.toContain('left');
+    }
+  });
 });

package/test/util/string_utils_unit.js

@@ -5,6 +5,29 @@
  */
 
 describe('StringUtils', () => {
+  describe('with TextDecoder', () => {
+    if (window.TextDecoder) {
+      defineStringUtilTests();
+    }
+  });
+
+  describe('without TextDecoder', () => {
+    let originalTextDecoder;
+
+    beforeAll(() => {
+      originalTextDecoder = window.TextDecoder;
+      window['TextDecoder'] = null;
+    });
+
+    afterAll(() => {
+      window.TextDecoder = originalTextDecoder;
+    });
+
+    defineStringUtilTests();
+  });
+});
+
+function defineStringUtilTests() {
   const StringUtils = shaka.util.StringUtils;
 
   it('parses fromUTF8', () => {
@@ -16,19 +39,34 @@ describe('StringUtils', () => {
   });
 
   it('won\'t break if given cut-off UTF8 character', () => {
-    // This array contains the first half of a 2-byte UTF8 character, stranded
-    // at the very end of the string.
-    const arr1 = [0x53, 0x61, 0x6e, 0x20, 0x4a, 0x6f, 0x73, 0x81];
+    const arr1 = [0x53, 0x61, 0x6e, 0x20, 0x4a, 0x6f, 0x73, 0xc3, 0xa9];
     expect(StringUtils.fromUTF8(new Uint8Array(arr1)))
+        .toBe('San Jos\u00E9');
+
+    // This array contains the first half of a 2-byte UTF8 character
+    // (0xc3 0xa9 = é).  The half-character is stranded at the very end of the
+    // string.
+    const arr = [0x53, 0x61, 0x6e, 0x20, 0x4a, 0x6f, 0x73, 0xc3];
+    expect(StringUtils.fromUTF8(new Uint8Array(arr)))
         .toBe('San Jos\uFFFD');
+  });
 
-    // For reasons I don't know, it seems like 0xE9 cannot be the start of a
-    // UTF8 character.  Perhaps it is a reserved number?
-    const arr2 = [0x4a, 0x6f, 0x73, 0xE9, 0x33, 0x33, 0x20, 0x53, 0x61, 0x6e];
-    expect(StringUtils.fromUTF8(new Uint8Array(arr2)))
+  it('won\'t break if given an invalid UTF-8 sequence', () => {
+    // 0xe9 0x33 0x33 is an invalid UTF-8 sequence.
+    const arr = [0x4a, 0x6f, 0x73, 0xE9, 0x33, 0x33, 0x20, 0x53, 0x61, 0x6e];
+    expect(StringUtils.fromUTF8(new Uint8Array(arr)))
         .toBe('Jos\uFFFD33 San');
   });
 
+  it('can handle an 8-byte character', () => {
+    // This is the UTF-8 encoding of the US flag emoji.
+    // It decodes into two Unicode codepoints, which becomes 4 JavaScript
+    // UTF-16 characters.
+    const arr = [0xf0, 0x9f, 0x87, 0xba, 0xf0, 0x9f, 0x87, 0xb8];
+    expect(StringUtils.fromUTF8(new Uint8Array(arr)))
+        .toBe('\uD83C\uDDFA\uD83C\uDDF8');
+  });
+
   it('strips the BOM in fromUTF8', () => {
     // This is 4 Unicode characters, the last will be split into a surrogate
     // pair.
@@ -125,4 +163,4 @@ describe('StringUtils', () => {
     expect(StringUtils.fromUTF16(buffer, true).length)
         .toBe(buffer.byteLength / 2);
   });
-});
+}

package/ui/text_selection.js

@@ -111,11 +111,11 @@ shaka.ui.TextSelection = class extends shaka.ui.SettingsMenu {
   onCaptionStateChange_() {
     if (this.player.isTextTrackVisible()) {
       this.icon.textContent =
-          shaka.ui.Enums.MaterialDesignIcons.CLOSED_CAPTIONS_OFF;
+          shaka.ui.Enums.MaterialDesignIcons.CLOSED_CAPTIONS;
       this.button.ariaPressed = 'true';
     } else {
       this.icon.textContent =
-          shaka.ui.Enums.MaterialDesignIcons.CLOSED_CAPTIONS;
+          shaka.ui.Enums.MaterialDesignIcons.CLOSED_CAPTIONS_OFF;
       this.button.ariaPressed = 'false';
     }