shaka-player 4.6.13 → 4.6.15

package/test/text/vtt_text_parser_unit.js

@@ -1126,6 +1126,37 @@ describe('VttTextParser', () => {
         {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
+  it('passes text-shadow when multiple classes included', () => {
+    verifyHelper(
+        [
+          {
+            startTime: 20,
+            endTime: 40,
+            payload: '',
+            nestedCues: [
+              {
+                startTime: 20,
+                endTime: 40,
+                payload: 'Test',
+                fontStyle: Cue.fontStyle.ITALIC,
+                textShadow: 'black 5%',
+              },
+            ],
+          },
+        ],
+        'WEBVTT\n\n' +
+        'STYLE\n' +
+        '::cue(.shadow) {\n' +
+        '  text-shadow: black 5%;\n' +
+        '}\n' +
+        '::cue(.italic) {\n' +
+        '  font-style: italic;\n' +
+        '}\n\n' +
+        '00:00:20.000 --> 00:00:40.000\n' +
+        '<c.shadow.italic>Test</c>',
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
+  });
+
   it('supports karaoke style text', () => {
     verifyHelper(
         [

package/test/transmuxer/transmuxer_integration.js

@@ -4,36 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * For unknown reasons, these tests fail in the test labs for Edge on Windows,
- * in ways that do not seem to be unrelated to transmuxers.
- * Practical testing has not found any sign that playback is actually broken in
- * Edge, so these tests are disabled on Edge for the time being.
- * TODO(#5834): Remove this filter once the tests are fixed.
- * @return {boolean}
- */
-function checkNoBrokenEdge() {
-  const chromeVersion = shaka.util.Platform.chromeVersion();
-  if (shaka.util.Platform.isWindows() && shaka.util.Platform.isEdge() &&
-      chromeVersion && chromeVersion <= 122) {
-    // When the tests fail, it's due to the manifest parser failing to find a
-    // factory. Attempt to find a factory first, to avoid filtering the tests
-    // when running in a non-broken Edge environment.
-    const uri = 'fakeuri.m3u8';
-    const mimeType = 'application/x-mpegurl';
-    /* eslint-disable no-restricted-syntax */
-    try {
-      shaka.media.ManifestParser.getFactory(uri, mimeType);
-      return true;
-    } catch (error) {
-      return false;
-    }
-    /* eslint-enable no-restricted-syntax */
-  }
-  return true;
-}
-
-filterDescribe('Transmuxer Player', checkNoBrokenEdge, () => {
+describe('Transmuxer Player', () => {
   const Util = shaka.test.Util;
 
   /** @type {!jasmine.Spy} */
@@ -51,6 +22,23 @@ filterDescribe('Transmuxer Player', checkNoBrokenEdge, () => {
   /** @type {!shaka.test.Waiter} */
   let waiter;
 
+  function isH265Supported() {
+    if (!MediaSource.isTypeSupported('video/mp4; codecs="hvc1.2.4.L123.B0"')) {
+      return false;
+    }
+    // As of Chrome 122, Chrome on Windows is still incorrectly reporting H.265
+    // support.  Revisit this exclusion with a maximum chromeVersion if Chrome
+    // ever fixes it.
+    // We don't have a solid bug link for this issue.  It's unclear if this is
+    // specific to GitHub CI systems, which may be missing some codecs.
+    const chromeVersion = shaka.util.Platform.chromeVersion();
+    if (shaka.util.Platform.isWindows() && chromeVersion) {
+      return false;
+    }
+    // https://bugs.chromium.org/p/chromium/issues/detail?id=1450313
+    return true;
+  }
+
   function isAc3Supported() {
     if (!MediaSource.isTypeSupported('audio/mp4; codecs="ac-3"')) {
       return false;
@@ -64,9 +52,7 @@ filterDescribe('Transmuxer Player', checkNoBrokenEdge, () => {
     // to true, which leads to a failure in GitHub's environment.
     // We must enable this, once it is resolved:
     // https://bugs.chromium.org/p/chromium/issues/detail?id=1450313
-    const chromeVersion = shaka.util.Platform.chromeVersion();
-    if (shaka.util.Platform.isWindows() && shaka.util.Platform.isEdge() &&
-        chromeVersion && chromeVersion <= 122) {
+    if (shaka.util.Platform.isWindows() && shaka.util.Platform.isEdge()) {
       return false;
     }
     return true;
@@ -85,9 +71,7 @@ filterDescribe('Transmuxer Player', checkNoBrokenEdge, () => {
     // to true, which leads to a failure in GitHub's environment.
     // We must enable this, once it is resolved:
     // https://bugs.chromium.org/p/chromium/issues/detail?id=1450313
-    const chromeVersion = shaka.util.Platform.chromeVersion();
-    if (shaka.util.Platform.isWindows() && shaka.util.Platform.isEdge() &&
-        chromeVersion && chromeVersion <= 122) {
+    if (shaka.util.Platform.isWindows() && shaka.util.Platform.isEdge()) {
       return false;
     }
     return true;
@@ -305,15 +289,7 @@ filterDescribe('Transmuxer Player', checkNoBrokenEdge, () => {
     });
 
     it('H.265 in TS', async () => {
-      const chromeVersion = shaka.util.Platform.chromeVersion();
-      if (shaka.util.Platform.isWindows() &&
-          chromeVersion && chromeVersion === 117) {
-        // It appears that Chrome 117 beta in Windows is incorrectly reporting
-        // H.265 in MediaCapabilities
-        pending('Codec H.265 is not supported by the platform.');
-      }
-      const mimeType = 'video/mp4; codecs="hvc1.2.4.L123.B0"';
-      if (!MediaSource.isTypeSupported(mimeType)) {
+      if (!isH265Supported()) {
         pending('Codec H.265 is not supported by the platform.');
       }
       await player.load('/base/test/test/assets/hls-ts-h265/hevc.m3u8');
@@ -351,14 +327,7 @@ filterDescribe('Transmuxer Player', checkNoBrokenEdge, () => {
     });
 
     it('H.265+AAC in TS', async () => {
-      const chromeVersion = shaka.util.Platform.chromeVersion();
-      if (shaka.util.Platform.isWindows() &&
-          chromeVersion && chromeVersion === 117) {
-        // It appears that Chrome 117 beta in Windows is incorrectly reporting
-        // H.265 in MediaCapabilities
-        pending('Codec H.265 is not supported by the platform.');
-      }
-      if (!MediaSource.isTypeSupported('video/mp4; codecs="hvc1.1.6.L93.90"')) {
+      if (!isH265Supported()) {
         pending('Codec H.265 is not supported by the platform.');
       }
       // eslint-disable-next-line max-len

package/test/util/periods_unit.js

@@ -1060,6 +1060,70 @@ describe('PeriodCombiner', () => {
     expect(audio2.originalId).toBe('2,4');
   });
 
+  it('Matches streams with labels', async () => {
+    const stream1 = makeAudioStream('en', /* channels= */ 2);
+    stream1.originalId = '1';
+    stream1.bandwidth = 129597;
+    stream1.codecs = 'mp4a.40.2';
+
+    const stream2 = makeAudioStream('en', /* channels= */ 2);
+    stream2.originalId = '2';
+    stream2.bandwidth = 129637;
+    stream2.codecs = 'mp4a.40.2';
+    stream2.label = 'description';
+
+    const stream3 = makeAudioStream('en', /* channels= */ 2);
+    stream3.originalId = '3';
+    stream3.bandwidth = 131037;
+    stream3.codecs = 'mp4a.40.2';
+
+    const stream4 = makeAudioStream('en', /* channels= */ 2);
+    stream4.originalId = '4';
+    stream4.bandwidth = 131034;
+    stream4.codecs = 'mp4a.40.2';
+    stream4.label = 'description';
+
+    /** @type {!Array.<shaka.extern.Period>} */
+    const periods = [
+      {
+        id: '0',
+        videoStreams: [
+          makeVideoStream(1080),
+        ],
+        audioStreams: [
+          stream1,
+          stream2,
+        ],
+        textStreams: [],
+        imageStreams: [],
+      },
+      {
+        id: '1',
+        videoStreams: [
+          makeVideoStream(1080),
+        ],
+        audioStreams: [
+          stream3,
+          stream4,
+        ],
+        textStreams: [],
+        imageStreams: [],
+      },
+    ];
+
+    await combiner.combinePeriods(periods, /* isDynamic= */ true);
+    const variants = combiner.getVariants();
+    expect(variants.length).toBe(2);
+    // We can use the originalId field to see what each track is composed of.
+    const audio1 = variants[0].audio;
+    expect(audio1.label).toBe(null);
+    expect(audio1.originalId).toBe('1,3');
+
+    const audio2 = variants[1].audio;
+    expect(audio2.label).toBe('description');
+    expect(audio2.originalId).toBe('2,4');
+  });
+
   it('Matches streams with related codecs', async () => {
     const stream1 = makeVideoStream(1080);
     stream1.originalId = '1';

package/ui/less/containers.less

@@ -24,6 +24,7 @@
   /* Set the fonts for all other content. */
   * {
     font-family: Roboto-Regular, Roboto, sans-serif, TengwarTelcontar;
+    -webkit-font-smoothing: antialiased;
   }
 }