shaka-player 3.2.4 → 3.2.7

package/test/util/iterables_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.Iterables');
-
 describe('Iterables', () => {
   const Iterables = shaka.util.Iterables;
 
@@ -67,66 +65,4 @@ describe('Iterables', () => {
       expect(Iterables.filter(input, (x) => x < 0)).toEqual([]);
     });
   });
-
-  describe('enumerate', () => {
-    function enumerate(it) {
-      return Array.from(Iterables.enumerate(it));
-    }
-
-    it('works with no items', () => {
-      expect(enumerate([])).toEqual([]);
-    });
-
-    it('works with one item', () => {
-      expect(enumerate([999]))
-          .toEqual([{i: 0, item: 999, prev: undefined, next: undefined}]);
-    });
-
-    it('works with special values', () => {
-      expect(enumerate([[]]))
-          .toEqual([{i: 0, item: [], prev: undefined, next: undefined}]);
-      expect(enumerate([0]))
-          .toEqual([{i: 0, item: 0, prev: undefined, next: undefined}]);
-      expect(enumerate([null]))
-          .toEqual([{i: 0, item: null, prev: undefined, next: undefined}]);
-      expect(enumerate([undefined]))
-          .toEqual([{i: 0, item: undefined, prev: undefined, next: undefined}]);
-    });
-
-    it('works with two items', () => {
-      expect(enumerate([888, 999]))
-          .toEqual([
-            {i: 0, item: 888, prev: undefined, next: 999},
-            {i: 1, item: 999, prev: 888, next: undefined},
-          ]);
-    });
-
-    it('works with three items', () => {
-      expect(enumerate([777, 888, 999]))
-          .toEqual([
-            {i: 0, item: 777, prev: undefined, next: 888},
-            {i: 1, item: 888, prev: 777, next: 999},
-            {i: 2, item: 999, prev: 888, next: undefined},
-          ]);
-    });
-
-    it('keeps references', () => {
-      const expected = [
-        {a: 'x'},
-        {b: 'y'},
-        {c: 'z'},
-      ];
-      const actual = enumerate(expected);
-
-      expect(actual[0].item).toBe(expected[0]);
-      expect(actual[0].next).toBe(expected[1]);
-
-      expect(actual[1].prev).toBe(expected[0]);
-      expect(actual[1].item).toBe(expected[1]);
-      expect(actual[1].next).toBe(expected[2]);
-
-      expect(actual[2].prev).toBe(expected[1]);
-      expect(actual[2].item).toBe(expected[2]);
-    });
-  });
 });

package/test/util/language_utils_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.LanguageUtils');
-goog.require('shaka.util.ManifestParserUtils');
-
 describe('LanguageUtils', () => {
   const LanguageUtils = shaka.util.LanguageUtils;
 

package/test/util/manifest_parser_utils_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.ManifestParserUtils');
-
 describe('ManifestParserUtils', () => {
   const ManifestParserUtils = shaka.util.ManifestParserUtils;
 

package/test/util/mime_utils_unit.js

@@ -0,0 +1,54 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+describe('MimeUtils', () => {
+  const getNormalizedCodec = (codecs) =>
+    shaka.util.MimeUtils.getNormalizedCodec(codecs);
+
+  it('normalizes codecs', () => {
+    expect(getNormalizedCodec('mp4a.66')).toBe('aac');
+    expect(getNormalizedCodec('mp4a.67')).toBe('aac');
+    expect(getNormalizedCodec('mp4a.68')).toBe('aac');
+
+    expect(getNormalizedCodec('mp3')).toBe('mp3');
+    expect(getNormalizedCodec('mp4a.69')).toBe('mp3');
+    expect(getNormalizedCodec('mp4a.6B')).toBe('mp3');
+    expect(getNormalizedCodec('mp4a.6b')).toBe('mp3');
+
+    expect(getNormalizedCodec('mp4a.40.2')).toBe('aac');
+    expect(getNormalizedCodec('mp4a.40.02')).toBe('aac');
+    expect(getNormalizedCodec('mp4a.40.5')).toBe('aac');
+    expect(getNormalizedCodec('mp4a.40.05')).toBe('aac');
+    expect(getNormalizedCodec('mp4a.40.29')).toBe('aac');
+    expect(getNormalizedCodec('mp4a.40.42')).toBe('aac');
+
+    expect(getNormalizedCodec('ac-3')).toBe('ac-3');
+    expect(getNormalizedCodec('mp4a.a5')).toBe('ac-3');
+    expect(getNormalizedCodec('mp4a.A5')).toBe('ac-3');
+
+    expect(getNormalizedCodec('ec-3')).toBe('ec-3');
+    expect(getNormalizedCodec('mp4a.a6')).toBe('ec-3');
+    expect(getNormalizedCodec('mp4a.A6')).toBe('ec-3');
+
+    expect(getNormalizedCodec('dtsc')).toBe('dtsc');
+    expect(getNormalizedCodec('mp4a.a9')).toBe('dtsc');
+
+    expect(getNormalizedCodec('dtsx')).toBe('dtsx');
+    expect(getNormalizedCodec('mp4a.b2')).toBe('dtsx');
+
+    expect(getNormalizedCodec('vp8')).toBe('vp8');
+    expect(getNormalizedCodec('vp8.0')).toBe('vp8');
+
+    expect(getNormalizedCodec('avc1')).toBe('avc');
+    expect(getNormalizedCodec('avc3')).toBe('avc');
+
+    expect(getNormalizedCodec('hvc1')).toBe('hevc');
+    expect(getNormalizedCodec('hev1')).toBe('hevc');
+
+    expect(getNormalizedCodec('dvh1.05')).toBe('dovi');
+    expect(getNormalizedCodec('dvhe.05')).toBe('dovi');
+  });
+});

package/test/util/mp4_box_parsers_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.asserts');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Mp4BoxParsers');
-goog.require('shaka.util.Mp4Parser');
-
 describe('Mp4BoxParsers', () => {
   const videoInitSegmentUri = '/base/test/test/assets/sintel-video-init.mp4';
   const videoSegmentUri = '/base/test/test/assets/sintel-video-segment.mp4';

package/test/util/mp4_parser_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.Mp4Parser');
-
 describe('Mp4Parser', () => {
   const Util = shaka.test.Util;
 

package/test/util/multi_map_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.MultiMap');
-
 describe('MultiMap', () => {
   /** @type {shaka.util.MultiMap<number>} */
   let map;

package/test/util/object_utils_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.ObjectUtils');
-
 describe('ObjectUtils', () => {
   const ObjectUtils = shaka.util.ObjectUtils;
 

package/test/util/periods_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.util.ManifestParserUtils');
-goog.require('shaka.util.PeriodCombiner');
-
 describe('PeriodCombiner', () => {
   // These test cases don't really read well as "it" statements.  Phrasing them
   // that way would make the names very long, so here we break with that
@@ -477,7 +473,7 @@ describe('PeriodCombiner', () => {
     a3.originalId = 'a3';
     a3.bandwidth = 97065;
     a3.roles = ['role1', 'role2'];
-    a2.codecs = 'mp4a.40.2';
+    a3.codecs = 'mp4a.40.2';
 
     // a4 has a different label from a3, and should not
     // be filtered out.
@@ -500,14 +496,24 @@ describe('PeriodCombiner', () => {
     const t1 = makeTextStream('en');
     t1.originalId = 't1';
     t1.roles = ['role1'];
+    t1.bandwidth = 1158;
 
     const t2 = makeTextStream('en');
     t2.originalId = 't2';
     t2.roles = ['role1', 'role2'];
+    t2.bandwidth = 1172;
 
     const t3 = makeTextStream('en');
     t3.originalId = 't3';
     t3.roles = ['role1'];
+    t3.bandwidth = 1158;
+
+    // t4 has a different bandwidth from t3, and should not
+    // be filtered out.
+    const t4 = makeTextStream('en');
+    t4.originalId = 't4';
+    t4.roles = ['role1'];
+    t4.bandwidth = 1186;
 
     // i1 and i3 are duplicates.
     const i1 = makeImageStream(240);
@@ -539,6 +545,7 @@ describe('PeriodCombiner', () => {
           t1,
           t2,
           t3,
+          t4,
         ],
         imageStreams: [
           i1,
@@ -565,7 +572,7 @@ describe('PeriodCombiner', () => {
     }
 
     const textStreams = combiner.getTextStreams();
-    expect(textStreams.length).toBe(2);
+    expect(textStreams.length).toBe(3);
 
     // t3 should've been filtered out
     const textIds = textStreams.map((t) => t.originalId);
@@ -989,6 +996,85 @@ describe('PeriodCombiner', () => {
     expect(audio2.originalId).toBe('2,4');
   });
 
+  it('Matches streams with related codecs', async () => {
+    const stream1 = makeVideoStream(1080);
+    stream1.originalId = '1';
+    stream1.bandwidth = 120000;
+    stream1.codecs = 'hvc1.1.4.L126.B0';
+
+    const stream2 = makeVideoStream(1080);
+    stream2.originalId = '2';
+    stream2.bandwidth = 120000;
+    stream2.codecs = 'hev1.2.4.L123.B0';
+
+    const stream3 = makeVideoStream(1080);
+    stream3.originalId = '3';
+    stream3.bandwidth = 120000;
+    stream3.codecs = 'dvhe.05.01';
+
+    const stream4 = makeVideoStream(1080);
+    stream4.originalId = '4';
+    stream4.bandwidth = 120000;
+    stream4.codecs = 'dvh1.05.01';
+
+    const stream5 = makeVideoStream(1080);
+    stream5.originalId = '5';
+    stream5.bandwidth = 120000;
+    stream5.codecs = 'avc1.42001f';
+
+    const stream6 = makeVideoStream(1080);
+    stream6.originalId = '6';
+    stream6.bandwidth = 120000;
+    stream6.codecs = 'avc3.42001f';
+
+    const stream7 = makeVideoStream(1080);
+    stream7.originalId = '7';
+    stream7.bandwidth = 120000;
+    stream7.codecs = 'vp09.00.10.08';
+
+    const stream8 = makeVideoStream(1080);
+    stream8.originalId = '8';
+    stream8.bandwidth = 120000;
+    stream8.codecs = 'vp09.01.20.08.01';
+
+    /** @type {!Array.<shaka.util.PeriodCombiner.Period>} */
+    const periods = [
+      {
+        id: '0',
+        videoStreams: [
+          stream1, stream3, stream5, stream7,
+        ],
+        audioStreams: [],
+        textStreams: [],
+        imageStreams: [],
+      },
+      {
+        id: '1',
+        videoStreams: [
+          stream2, stream4, stream6, stream8,
+        ],
+        audioStreams: [],
+        textStreams: [],
+        imageStreams: [],
+      },
+    ];
+
+    await combiner.combinePeriods(periods, /* isDynamic= */ true);
+    const variants = combiner.getVariants();
+    expect(variants.length).toBe(4);
+    // We can use the originalId field to see what each track is composed of.
+    const video1 = variants[0].video;
+    expect(video1.originalId).toBe('1,2');
+
+    const video2 = variants[1].video;
+    expect(video2.originalId).toBe('3,4');
+
+    const video3 = variants[2].video;
+    expect(video3.originalId).toBe('5,6');
+
+    const video4 = variants[3].video;
+    expect(video4.originalId).toBe('7,8');
+  });
 
   it('Matches streams with most roles in common', async () => {
     const makeAudioStreamWithRoles = (roles) => {
@@ -1059,7 +1145,7 @@ describe('PeriodCombiner', () => {
   it('The number of variants stays stable after many periods ' +
       'when going between similar content and varying ads', async () => {
     // This test is based on the content from
-    // https://github.com/google/shaka-player/issues/2716
+    // https://github.com/shaka-project/shaka-player/issues/2716
     // that used to cause our period flattening logic to keep
     // creating new variants for every new period added.
     // It's ok to create a few additional varinats/streams,

package/test/util/pssh_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.Pssh');
-goog.require('shaka.util.Uint8ArrayUtils');
-
 describe('Pssh', () => {
   const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
 

package/test/util/state_history_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.StateHistory');
-
 describe('StateHistory', () => {
   const oldDateNow = Date.now;
 

package/test/util/stream_utils_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.FakeDrmEngine');
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.StreamUtils');
-
 describe('StreamUtils', () => {
   const StreamUtils = shaka.util.StreamUtils;
 
@@ -184,7 +179,7 @@ describe('StreamUtils', () => {
     });
 
     it('chooses only one role, even if none is preferred', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/949
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/949
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addTextStream(0, (stream) => {
           stream.language = 'en';
@@ -223,7 +218,7 @@ describe('StreamUtils', () => {
     });
 
     it('chooses only one role, even if all are primary', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/949
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/949
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addTextStream(0, (stream) => {
           stream.language = 'en';
@@ -269,7 +264,7 @@ describe('StreamUtils', () => {
     });
 
     it('chooses only one language, even if all are primary', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/918
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/918
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addTextStream(0, (stream) => {
           stream.language = 'en';

package/test/util/string_utils_unit.js

@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.ManifestParserUtils');
-goog.require('shaka.util.StringUtils');
-
 describe('StringUtils', () => {
   const StringUtils = shaka.util.StringUtils;
 

package/test/util/text_parser_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.TextParser');
-
 describe('TextParser', () => {
   const TextParser = shaka.util.TextParser;
 

package/test/util/xml_utils_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.asserts');
-goog.require('shaka.util.XmlUtils');
-
-
 describe('XmlUtils', () => {
   // A number that cannot be represented as a Javascript number.
   const HUGE_NUMBER_STRING = new Array(500).join('7');

package/ui/less/ad_controls.less

@@ -78,11 +78,11 @@
 
   /* This math is determining how far the button is from the right edge.
    * Ad panel's parent is centered and @bottom-controls-width wide, so
-   * 100 - @bottom-controls-width = margins from both sides of the container.
+   * 100% - @bottom-controls-width = margins from both sides of the container.
    * That divided by 2 is margin on one side, so we take that, and move the
    * button from its normal position to the right by that percentage.
    */
-  right: (100 - @bottom-controls-width) / 2 * -1;
+  right: calc((100% - @bottom-controls-width) / 2 * -1);
   display: flex;
   flex-direction: row;
   margin: 0;
@@ -90,18 +90,18 @@
 
 .shaka-skip-ad-button {
   padding: 5px 15px;
-  background: rgba(0, 0, 0, 0.7);
+  background: rgba(0 0 0 / 70%);
   border: none;
 
   &:disabled {
-    background: rgba(0, 0, 0, 0.3);
+    background: rgba(0 0 0 / 30%);
   }
 
   cursor: pointer;
 }
 
 .shaka-skip-ad-counter {
-  padding: 5px 5px;
-  background: rgba(0, 0, 0, 0.7);
+  padding: 5px;
+  background: rgba(0 0 0 / 70%);
   margin: 0;
 }

package/ui/less/buttons.less

@@ -26,7 +26,7 @@
    *
    * Based on tips from https://stackoverflow.com/a/12925343 */
   box-sizing: border-box;
-  padding: @play-button-size-percentage / 2;
+  padding: calc(@play-button-size-percentage / 2);
   width: 0;
   height: 0;
 
@@ -38,7 +38,7 @@
   border-radius: 50%;
 
   /* A small drop shadow below the button. */
-  box-shadow: rgba(0, 0, 0, 0.1) 0 0 20px 0;
+  box-shadow: rgba(0 0 0 / 10%) 0 0 20px 0;
 
   /* No border. */
   border: none;
@@ -51,7 +51,7 @@
   background-position: center center;
 
   /* A background color behind the play arrow. */
-  background-color: rgba(255, 255, 255, 0.9);
+  background-color: rgba(255 255 255 / 90%);
 
   .show-when-controls-shown();
 
@@ -60,11 +60,11 @@
    * deployed separately from the compiled CSS.
    * Note that these URIs should relative to ui/controls.less, not this file. */
   &[icon="play"] {
-    background-image: data-uri('images/play_arrow.svg');
+    background-image: data-uri("images/play_arrow.svg");
   }
 
   &[icon="pause"] {
-    background-image: data-uri('images/pause.svg');
+    background-image: data-uri("images/pause.svg");
   }
 }
 
@@ -74,7 +74,7 @@
  */
 .shaka-current-time {
   font-size: 14px;
-  color: rgb(255, 255, 255);
+  color: white;
   cursor: pointer;
 
   &[disabled] {

package/ui/less/containers.less

@@ -6,8 +6,6 @@
 
 /* All of the top-level containers into which various visible features go. */
 
-@transparent: rgba(0, 0, 0, 0);
-
 /* A container for the entire video + controls combo.  This is the auto-setup
  * div which we populate. */
 .shaka-video-container {
@@ -19,13 +17,13 @@
 
   /* Set a special font for material design icons. */
   .material-icons-round {
-    font-family: 'Material Icons Round';
+    font-family: "Material Icons Round";
     font-size: 24px;
   }
 
   /* Set the fonts for all other content. */
   * {
-    font-family: Roboto-Regular, Roboto, sans-serif;
+    font-family: Roboto-Regular, Roboto, sans-serif, TengwarTelcontar;
   }
 }
 
@@ -203,7 +201,7 @@
   .show-when-controls-shown();
 
   /* A black gradient at the bottom, behind the controls, but only so high. */
-  background: linear-gradient(to top, rgba(0, 0, 0, 1) 0, @transparent 15%);
+  background: linear-gradient(to top, black 0, transparent 15%);
 }
 
 .shaka-text-container {
@@ -231,7 +229,7 @@
   /* These are defaults which are overridden by JS or cue styles. */
   font-size: 20px;
   line-height: 1.4;  // relative to font size.
-  color: rgb(255, 255, 255);
+  color: white;
 
   span.shaka-text-wrapper {
     display: inline;
@@ -265,8 +263,8 @@
 
 .shaka-spinner {
   /* This uses the same trickery as the big play button define
-  the spinner's width and height. See .shaka-play-button
-  for the detailed explanation. */
+   * the spinner's width and height. See .shaka-play-button
+   * for the detailed explanation. */
 
   /* For the padding thing to work, spinner div needs to be an
   overlay-parent and spinner svg - an overlay child. */
@@ -274,11 +272,11 @@
 
   margin: 0;
   box-sizing: border-box;
-  padding: @spinner-size-percentage / 2;
+  padding: calc(@spinner-size-percentage / 2);
   width: 0;
   height: 0;
 
   /* Add a bit of a white shadow to keep our black spinner visible
-  on a black background. */
-  filter: drop-shadow(0 0 2px rgba(255, 255, 255, 0.5));
+   * on a black background. */
+  filter: drop-shadow(0 0 2px rgba(255 255 255 / 50%));
 }

package/ui/less/overflow_menu.less

@@ -18,7 +18,7 @@
 
   /* Styles for the menu itself. */
   background: white;
-  box-shadow: 0 1px 9px 0 rgba(0, 0, 0, 0.4);
+  box-shadow: 0 1px 9px 0 rgba(0 0 0 / 40%);
   border-radius: 2px;
   max-height: 250px;
   min-width: 180px;
@@ -52,7 +52,7 @@
 
     /* When hovered, the button's background is highlighted. */
     &:hover {
-      background: rgb(224, 224, 224);
+      background: rgb(224 224 224);
     }
 
     /* The button is clickable, showing cursor pointer */
@@ -64,7 +64,7 @@
     }
 
     .shaka-keyboard-navigation &:focus {
-      background: rgb(224, 224, 224);
+      background: rgb(224 224 224);
     }
   }
 
@@ -109,7 +109,7 @@
  * language, the currently-selected resolution, etc. */
 .shaka-current-selection-span {
   /* This is dimmer than the other span, which is the name of the submenu. */
-  color: rgba(0, 0, 0, 0.54);
+  color: rgba(0 0 0 / 54%);
 }
 
 /* The submenus have somewhat different margins inside them. */

package/ui/less/range_elements.less

@@ -39,7 +39,7 @@
   .overlay-parent();
 
   /* Vertical margins to occupy the same space as the thumb. */
-  margin: (@thumb-size - @track-height)/2 6px;
+  margin: calc((@thumb-size - @track-height) / 2) 6px;
 
   /* Smaller height to contain the background for the virtual track. */
   height: @track-height;
@@ -57,6 +57,11 @@
   /* The track should fill the range element. */
   width: 100%;
 
+  /* Since range elements are special input elements, they must reflect user
+   * interaction, so when the user hovers over the range element, the cursor
+   * must be a pointer. */
+  cursor: pointer;
+
   /* The track should be tall enough to contain the thumb without clipping it.
    * It is very tricky to make the thumb show outside the track on IE 11, and
    * it is incompatible with our background gradients. */
@@ -104,7 +109,7 @@
 
   /* Position the top of the range element so that it is centered on the
    * container. Note that the container is actually smaller than the thumb. */
-  top: (@track-height - @thumb-size) / 2;
+  top: calc((@track-height - @thumb-size) / 2);
 
   /* Make sure clicking at the very top of the bar still takes effect and is not
    * confused with clicking the video to play/pause it. */