shaka-player 3.2.15 → 3.2.16

package/test/text/ui_text_displayer_unit.js

@@ -461,4 +461,80 @@ describe('UITextDisplayer', () => {
       expect(Object.keys(cueCssObj)).not.toContain('left');
     }
   });
+
+  it('does not lose second item in a region', () => {
+    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 have identical nested.
+    const cue1 = new shaka.text.Cue(168, 181.84, '');
+    cue1.nestedCues = [
+      new shaka.text.Cue(168, 181.84, ''),
+    ];
+    cue1.region = cueRegion;
+
+    const nested1 = new shaka.text.Cue(168, 170.92, '');
+    nested1.nestedCues = [new shaka.text.Cue(0, 170.92,
+        'Emo look. I mean listen.')];
+
+    const nested2 = new shaka.text.Cue(172, 174.84, '');
+    nested2.nestedCues = [new shaka.text.Cue(172, 174.84,
+        'You have to learn to listen.')];
+
+    const nested3 = new shaka.text.Cue(175.84, 177.64, '');
+    nested3.nestedCues = [new shaka.text.Cue(175.84, 177.64,
+        'This is not some game.')];
+
+    const nested4 = new shaka.text.Cue(177.68, 181.84, '');
+    nested4.nestedCues = [new shaka.text.Cue(177.68, 181.84,
+        'You - I mean we - we could easily die out here.')];
+
+    cue1.nestedCues[0].nestedCues = [nested1, nested2, nested3, nested4];
+
+    video.currentTime = 170;
+    textDisplayer.setTextVisibility(true);
+    textDisplayer.append([cue1]);
+    updateCaptions();
+
+    /** @type {Element} */
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+    let captions = textContainer.querySelectorAll('div');
+    expect(captions.length).toBe(1);
+    let allRegionElements = textContainer.querySelectorAll(
+        '.shaka-text-region');
+    // Verify that the nested cues are all attached to a single region element.
+    expect(allRegionElements.length).toBe(1);
+
+    // Advance time to where there is none to show
+    video.currentTime = 171;
+    updateCaptions();
+
+    allRegionElements = textContainer.querySelectorAll(
+        '.shaka-text-region');
+    expect(allRegionElements.length).toBe(1);
+
+    // Advance time to where there is something to show
+    video.currentTime = 173;
+    updateCaptions();
+
+    allRegionElements = textContainer.querySelectorAll(
+        '.shaka-text-region');
+    expect(allRegionElements.length).toBe(1);
+
+    captions = textContainer.querySelectorAll('div');
+
+    expect(captions.length).toBe(1);
+    expect(captions[0].textContent).toBe('You have to learn to listen.');
+
+    allRegionElements = textContainer.querySelectorAll(
+        '.shaka-text-region');
+    expect(allRegionElements.length).toBe(1);
+  });
 });

package/test/ui/text_displayer_layout_unit.js

@@ -444,6 +444,20 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
 
       await checkScreenshot(prefix, 'deeply-nested-cues');
     });
+
+    // Regression test for #4567, in which "end" line alignment for VTT was
+    // inverted.
+    it('line alignment', async () => {
+      const cue = new shaka.text.Cue(0, 1, 'Captain\'s log, stardate 41636.9');
+
+      cue.line = 70;
+      cue.lineInterpretation = shaka.text.Cue.lineInterpretation.PERCENTAGE;
+      cue.lineAlign = shaka.text.Cue.lineAlign.END;
+
+      textDisplayer.append([cue]);
+
+      await checkScreenshot(prefix, 'line-alignment');
+    });
   }
 
   /** @param {!HTMLElement} element */

package/test/util/stream_utils_unit.js

@@ -701,6 +701,24 @@ describe('StreamUtils', () => {
 
       expect(manifest.variants.length).toBe(1);
     });
+
+    it('supports legacy AVC1 codec', async () => {
+      if (!MediaSource.isTypeSupported('video/mp4; codecs="avc1.42001e"')) {
+        pending('Codec avc1.42001e is not supported by the platform.');
+      }
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        manifest.addVariant(0, (variant) => {
+          variant.addVideo(1, (stream) => {
+            stream.mime('video/mp4', 'avc1.66.30');
+          });
+        });
+      });
+
+      await shaka.util.StreamUtils.filterManifest(
+          fakeDrmEngine, /* currentVariant= */ null, manifest);
+
+      expect(manifest.variants.length).toBe(1);
+    });
   });
 
   describe('chooseCodecsAndFilterManifest', () => {

package/test/util/xml_utils_unit.js

@@ -425,10 +425,15 @@ describe('XmlUtils', () => {
     });
 
     it('returns null on XML that embeds SVG', () => {
+      // Some platforms, such as Xbox One, don't recognize elements as SVG
+      // based on namespace alone.  So the SVG element below needs to be a real
+      // SVG element.
       const xmlString = [
         '<?xml version="1.0"?>',
         '<Root>',
-        '  <Child xmlns="http://www.w3.org/2000/svg"></Child>',
+        '  <svg viewBox="0 0 100 100">',
+        '    <rect x="0" y="0" width="100" height"100" />',
+        '  </svg>',
         '</Root>',
       ].join('\n');
       const doc = XmlUtils.parseXmlString(xmlString, 'Root');

package/ui/controls.js

@@ -1138,7 +1138,7 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
       // The controls are hidden, so show them.
       this.onMouseMove_(event);
       // Stop this event from becoming a click event.
-      event.preventDefault();
+      event.cancelable && event.preventDefault();
     }
   }