shaka-player 3.2.0 → 3.2.4

package/test/text/ui_text_displayer_unit.js

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.UiUtils');
 goog.require('shaka.test.Util');
 goog.require('shaka.text.Cue');
 goog.require('shaka.text.UITextDisplayer');
@@ -51,8 +50,7 @@ describe('UITextDisplayer', () => {
       /** @type {!HTMLElement} */ (document.createElement('div'));
     videoContainer.style.height = `${videoContainerHeight}px`;
     document.body.appendChild(videoContainer);
-    video = shaka.test.UiUtils.createVideoElement();
-    videoContainer.appendChild(video);
+    video = new shaka.test.FakeVideo();
   });
 
   beforeEach(() => {
@@ -86,20 +84,16 @@ describe('UITextDisplayer', () => {
     // Wait until updateCaptions_() gets called.
     await shaka.test.Util.delay(0.5);
 
-    const textContainer =
-        videoContainer.querySelector('.shaka-text-container');
-    const captions =
-        textContainer.querySelector('span:not(.shaka-text-wrapper)');
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+    const captions = textContainer.querySelector('div');
     const cssObj = parseCssText(captions.style.cssText);
 
     const expectCssObj = {
       'color': 'green',
-      'background-color': 'black',
       'direction': 'ltr',
       'font-size': '10px',
       'font-style': 'normal',
       'font-weight': 400,
-      'line-height': 2,
       'text-align': 'center',
     };
 
@@ -116,6 +110,8 @@ describe('UITextDisplayer', () => {
     }
 
     expect(cssObj).toEqual(jasmine.objectContaining(expectCssObj));
+    expect(parseCssText(textContainer.querySelector('span').style.cssText))
+        .toEqual(jasmine.objectContaining({'background-color': 'black'}));
   });
 
   it('correctly displays styles for nested cues', async () => {
@@ -139,15 +135,13 @@ describe('UITextDisplayer', () => {
     await shaka.test.Util.delay(0.5);
 
     // Verify styles applied to the nested cues.
-    const textContainer =
-        videoContainer.querySelector('.shaka-text-container');
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
     const captions =
         textContainer.querySelector('span:not(.shaka-text-wrapper)');
     const cssObj = parseCssText(captions.style.cssText);
 
     const expectCssObj = {
       'color': 'green',
-      'background-color': 'black',
       'font-size': '10px',
       'font-style': 'normal',
       'font-weight': 400,
@@ -167,6 +161,8 @@ describe('UITextDisplayer', () => {
     }
 
     expect(cssObj).toEqual(jasmine.objectContaining(expectCssObj));
+    expect(parseCssText(captions.querySelector('span').style.cssText))
+        .toEqual(jasmine.objectContaining({'background-color': 'black'}));
   });
 
   it('correctly displays styles for cellResolution units', async () => {
@@ -193,10 +189,8 @@ describe('UITextDisplayer', () => {
     // style.
     const expectedLinePadding = '11.25px';
 
-    const textContainer =
-        videoContainer.querySelector('.shaka-text-container');
-    const captions =
-        textContainer.querySelector('span:not(.shaka-text-wrapper)');
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+    const captions = textContainer.querySelector('div');
     const cssObj = parseCssText(captions.style.cssText);
     expect(cssObj).toEqual(
         jasmine.objectContaining({
@@ -224,10 +218,8 @@ describe('UITextDisplayer', () => {
     // videoContainerHeight=450px and tts:fontSize="90%" on the default style.
     const expectedFontSize = '27px';
 
-    const textContainer =
-        videoContainer.querySelector('.shaka-text-container');
-    const captions =
-        textContainer.querySelector('span:not(.shaka-text-wrapper)');
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+    const captions = textContainer.querySelector('div');
     const cssObj = parseCssText(captions.style.cssText);
     expect(cssObj).toEqual(
         jasmine.objectContaining({'font-size': expectedFontSize}));
@@ -320,4 +312,85 @@ describe('UITextDisplayer', () => {
     // duplicates.
     expect(captions.length).toBe(3);
   });
+
+  it('hides currently displayed cue when removed', async () => {
+    const cue = new shaka.text.Cue(0, 50, 'One');
+    textDisplayer.setTextVisibility(true);
+    textDisplayer.append([cue]);
+    video.currentTime = 10;
+    await shaka.test.Util.delay(0.5);
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+
+    let cueElements = textContainer.querySelectorAll('div');
+    expect(cueElements.length).toBe(1);
+    expect(cueElements[0].textContent).toBe('One');
+
+    textDisplayer.remove(0, 100);
+
+    cueElements = textContainer.querySelectorAll('div');
+    expect(cueElements.length).toBe(0);
+  });
+
+  it('hides and shows nested cues at appropriate times', async () => {
+    const parentCue1 = new shaka.text.Cue(0, 100, '');
+    const cue1 = new shaka.text.Cue(0, 50, 'One');
+    parentCue1.nestedCues.push(cue1);
+    const cue2 = new shaka.text.Cue(25, 75, 'Two');
+    parentCue1.nestedCues.push(cue2);
+    const cue3 = new shaka.text.Cue(50, 100, 'Three');
+    parentCue1.nestedCues.push(cue3);
+
+    const parentCue2 = new shaka.text.Cue(90, 190, '');
+    const cue4 = new shaka.text.Cue(90, 130, 'Four');
+    parentCue2.nestedCues.push(cue4);
+
+    textDisplayer.setTextVisibility(true);
+    textDisplayer.append([parentCue1, parentCue2]);
+
+    video.currentTime = 10;
+    await shaka.test.Util.delay(0.5);
+    /** @type {Element} */
+    const textContainer = videoContainer.querySelector('.shaka-text-container');
+    let parentCueElements = textContainer.querySelectorAll('div');
+
+    expect(parentCueElements.length).toBe(1);
+    expect(parentCueElements[0].textContent).toBe('One');
+
+    video.currentTime = 35;
+    await shaka.test.Util.delay(0.5);
+    parentCueElements = textContainer.querySelectorAll('div');
+    expect(parentCueElements.length).toBe(1);
+    expect(parentCueElements[0].textContent).toBe('OneTwo');
+
+    video.currentTime = 60;
+    await shaka.test.Util.delay(0.5);
+    parentCueElements = textContainer.querySelectorAll('div');
+    expect(parentCueElements.length).toBe(1);
+    expect(parentCueElements[0].textContent).toBe('TwoThree');
+
+    video.currentTime = 85;
+    await shaka.test.Util.delay(0.5);
+    parentCueElements = textContainer.querySelectorAll('div');
+    expect(parentCueElements.length).toBe(1);
+    expect(parentCueElements[0].textContent).toBe('Three');
+
+    video.currentTime = 95;
+    await shaka.test.Util.delay(0.5);
+    parentCueElements = textContainer.querySelectorAll('div');
+    expect(parentCueElements.length).toBe(2);
+    expect(parentCueElements[0].textContent).toBe('Three');
+    expect(parentCueElements[1].textContent).toBe('Four');
+
+    video.currentTime = 105;
+    await shaka.test.Util.delay(0.5);
+    parentCueElements = textContainer.querySelectorAll('div');
+    expect(parentCueElements.length).toBe(1);
+    expect(parentCueElements[0].textContent).toBe('Four');
+
+    video.currentTime = 150;
+    await shaka.test.Util.delay(0.5);
+    parentCueElements = textContainer.querySelectorAll('div');
+    expect(parentCueElements.length).toBe(1);
+    expect(parentCueElements[0].textContent).toBe('');
+  });
 });

package/test/text/vtt_text_parser_unit.js

@@ -924,6 +924,18 @@ describe('VttTextParser', () => {
             payload: '<c.lime><b>Parse fail 2</c></b>',
             nestedCues: [],
           },
+          {
+            startTime: 100,
+            endTime: 110,
+            payload: '<c.lime>forward slash 1/2 in text</c>',
+            nestedCues: [],
+          },
+          {
+            startTime: 110,
+            endTime: 120,
+            payload: '<c.lime>less or more < > in text</c>',
+            nestedCues: [],
+          },
         ],
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000\n' +
@@ -939,7 +951,11 @@ describe('VttTextParser', () => {
         '00:01:20.000 --> 00:01:30.000\n' +
         '<b><c.lime>Parse fail 1</b></c>\n\n' +
         '00:01:30.000 --> 00:01:40.000\n' +
-        '<c.lime><b>Parse fail 2</c></b>',
+        '<c.lime><b>Parse fail 2</c></b>\n\n' +
+        '00:01:40.000 --> 00:01:50.000\n' +
+        '<c.lime>forward slash 1/2 in text</c>\n\n' +
+        '00:01:50.000 --> 00:02:00.000\n' +
+        '<c.lime>less or more < > in text</c>',
         {periodStart: 0, segmentStart: 0, segmentEnd: 0});
   });
 

package/test/text/web_vtt_generator_unit.js

@@ -9,7 +9,7 @@ goog.require('shaka.text.WebVttGenerator');
 
 describe('WebVttGenerator', () => {
   it('supports no cues', () => {
-    verifyHelper([], 'WEBVTT\n\n');
+    verifyHelper([], [], 'WEBVTT\n\n');
   });
 
   it('convert cues to WebVTT', () => {
@@ -26,6 +26,8 @@ describe('WebVttGenerator', () => {
     const shakaCue5 = new shaka.text.Cue(53, 54, 'Test5');
     shakaCue5.textAlign = shaka.text.Cue.textAlign.END;
 
+    const adCuePoints = [];
+
     verifyHelper(
         [
           shakaCue1,
@@ -34,6 +36,7 @@ describe('WebVttGenerator', () => {
           shakaCue4,
           shakaCue5,
         ],
+        adCuePoints,
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000 align:left vertical:lr\n' +
         'Test\n\n' +
@@ -68,19 +71,71 @@ describe('WebVttGenerator', () => {
     nestedCue4.textDecoration.push(shaka.text.Cue.textDecoration.UNDERLINE);
 
     shakaCue.nestedCues = [nestedCue1, nestedCue2, nestedCue3, nestedCue4];
+
+    const adCuePoints = [];
+
     verifyHelper(
         [shakaCue],
+        adCuePoints,
         'WEBVTT\n\n' +
         '00:00:10.000 --> 00:00:20.000 align:middle\n' +
         '<i><u>Test1</u></i><b><i>Test2</i></b>Test3<u>Test4</u>\n\n');
   });
 
+  it('computes the time with ad cue points', () => {
+    const shakaCue1 = new shaka.text.Cue(20, 30, 'Test');
+    shakaCue1.textAlign = shaka.text.Cue.textAlign.LEFT;
+    shakaCue1.writingMode = shaka.text.Cue.writingMode.VERTICAL_LEFT_TO_RIGHT;
+    const shakaCue2 = new shaka.text.Cue(40, 50, 'Test2');
+    shakaCue2.textAlign = shaka.text.Cue.textAlign.RIGHT;
+    shakaCue2.writingMode = shaka.text.Cue.writingMode.VERTICAL_RIGHT_TO_LEFT;
+    const shakaCue3 = new shaka.text.Cue(50, 51, 'Test3');
+    shakaCue3.textAlign = shaka.text.Cue.textAlign.CENTER;
+    const shakaCue4 = new shaka.text.Cue(52, 53, 'Test4');
+    shakaCue4.textAlign = shaka.text.Cue.textAlign.START;
+    const shakaCue5 = new shaka.text.Cue(53, 54, 'Test5');
+    shakaCue5.textAlign = shaka.text.Cue.textAlign.END;
+
+    const adCuePoints = [
+      {
+        start: 0,
+        end: 10,
+      },
+      {
+        start: 35,
+        end: 45,
+      },
+    ];
+
+    verifyHelper(
+        [
+          shakaCue1,
+          shakaCue2,
+          shakaCue3,
+          shakaCue4,
+          shakaCue5,
+        ],
+        adCuePoints,
+        'WEBVTT\n\n' +
+        '00:00:30.000 --> 00:00:40.000 align:left vertical:lr\n' +
+        'Test\n\n' +
+        '00:01:00.000 --> 00:01:10.000 align:right vertical:rl\n' +
+        'Test2\n\n' +
+        '00:01:10.000 --> 00:01:11.000 align:middle\n' +
+        'Test3\n\n' +
+        '00:01:12.000 --> 00:01:13.000 align:start\n' +
+        'Test4\n\n' +
+        '00:01:13.000 --> 00:01:14.000 align:end\n' +
+        'Test5\n\n');
+  });
+
   /**
    * @param {!Array} cues
+   * @param {!Array} adCuePoints
    * @param {string} text
    */
-  function verifyHelper(cues, text) {
-    const result = shaka.text.WebVttGenerator.convert(cues);
+  function verifyHelper(cues, adCuePoints, text) {
+    const result = shaka.text.WebVttGenerator.convert(cues, adCuePoints);
     expect(text).toBe(result);
   }
 });

package/test/ui/localization_unit.js

@@ -198,7 +198,7 @@ describe('Localization', () => {
       localization.changeLocale([ELVISH_WOODLAND]);
 
       expect(events.length).toBe(1);
-      expect(events[0].locales).toEqual([ELVISH_WOODLAND]);
+      expect(events[0]['locales']).toEqual([ELVISH_WOODLAND]);
     });
 
 
@@ -214,23 +214,23 @@ describe('Localization', () => {
       localization.changeLocale([ELVISH_WOODLAND, DWARFISH_NORTH]);
 
       expect(events.length).toBe(1);
-      expect(events[0].locales).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
+      expect(events[0]['locales']).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
 
       // We should see an event telling us that dwarfish is still missing.
       localization.insert(ELVISH_WOODLAND, new Map());
       localization.changeLocale([ELVISH_WOODLAND, DWARFISH_NORTH]);
 
       expect(events.length).toBe(2);
-      expect(events[0].locales).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
-      expect(events[1].locales).toEqual([DWARFISH_NORTH]);
+      expect(events[0]['locales']).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
+      expect(events[1]['locales']).toEqual([DWARFISH_NORTH]);
 
       // There should be no more events now that we added the last language.
       localization.insert(DWARFISH_NORTH, new Map());
       localization.changeLocale([ELVISH_WOODLAND, DWARFISH_NORTH]);
 
       expect(events.length).toBe(2);
-      expect(events[0].locales).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
-      expect(events[1].locales).toEqual([DWARFISH_NORTH]);
+      expect(events[0]['locales']).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
+      expect(events[1]['locales']).toEqual([DWARFISH_NORTH]);
     });
   });
 
@@ -373,8 +373,8 @@ describe('Localization', () => {
           // it was in the fallback (HALFLING) but not our preferred language
           // (EVLISH).
           expect(events.length).toBe(1);
-          expect(events[0].locales).toEqual([ELVISH_WOODLAND]);
-          expect(events[0].missing).toEqual(['hello']);
+          expect(events[0]['locales']).toEqual([ELVISH_WOODLAND]);
+          expect(events[0]['missing']).toEqual(['hello']);
         });
 
     it('fires when key/value is missing from preferred but found in base',
@@ -400,8 +400,8 @@ describe('Localization', () => {
           // because it was in the base (ELVISH) but not our preferred language
           // (EVLISH_WOODLAND).
           expect(events.length).toBe(1);
-          expect(events[0].locales).toEqual([ELVISH_WOODLAND]);
-          expect(events[0].missing).toEqual(['Best Wishes']);
+          expect(events[0]['locales']).toEqual([ELVISH_WOODLAND]);
+          expect(events[0]['missing']).toEqual(['Best Wishes']);
         });
 
     it('fires when key/value is missing from preferred but found in sibling',
@@ -427,8 +427,8 @@ describe('Localization', () => {
           // understand" because it was in a sibling locale (HALFLING_SHIRE)
           // but not our preferred language (HALFLING_COMMON).
           expect(events.length).toBe(1);
-          expect(events[0].locales).toEqual([HALFLING_COMMON]);
-          expect(events[0].missing).toEqual(['Do you understand']);
+          expect(events[0]['locales']).toEqual([HALFLING_COMMON]);
+          expect(events[0]['missing']).toEqual(['Do you understand']);
         });
 
     it('fires when key/value is missing from some preferred languages',
@@ -454,8 +454,9 @@ describe('Localization', () => {
 
           // There should have no missing localization events.
           expect(events.length).toBe(1);
-          expect(events[0].locales).toEqual([ELVISH_WOODLAND, DWARFISH_NORTH]);
-          expect(events[0].missing).toEqual(['may your forge burn bright']);
+          expect(events[0]['locales']).toEqual(
+              [ELVISH_WOODLAND, DWARFISH_NORTH]);
+          expect(events[0]['missing']).toEqual(['may your forge burn bright']);
         });
   });
 

package/test/ui/text_displayer_layout_unit.js

@@ -34,11 +34,8 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
    */
   let beforeScreenshot;
 
-  // Legacy Edge seems to have inconsistent font kerning.  A one-pixel offset in
-  // the position of one character appears about 60% of the time, requiring us
-  // to have this change tolerance in our tests.  So far, all past bugs in our
-  // implementation that we have tests for would exceed this threshold by a lot.
-  const threshold = 160;  // px
+  // A minimum similarity score for screenshots, between 0 and 1.
+  const minSimilarity = 0.95;
 
   const originalCast = window.chrome && window.chrome.cast;
 
@@ -141,7 +138,9 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
         cue.region.id = '1';
         // Position the cue *explicitly* at the bottom of the screen.
         cue.region.viewportAnchorX = 0;  // %
-        cue.region.viewportAnchorY = 100;  // %
+        cue.region.viewportAnchorY = 90;  // %
+        cue.region.width = 100;  // %
+        cue.region.height = 10;  // %
         textDisplayer.append([cue]);
 
         await checkScreenshot('ui', 'cue-with-controls');
@@ -194,6 +193,7 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
 
         // The video must be played a little now, after the cues were appended,
         // but before the screenshot.
+        video.playbackRate = 1;
         video.play();
         await waiter.failOnTimeout(false).timeoutAfter(5)
             .waitForMovement(video);
@@ -201,10 +201,13 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
 
         // Seek to a time when cues should be showing.
         video.currentTime = time;
+        // Get into a playing state, but without movement.
+        video.playbackRate = 0;
+        video.play();
 
         // Add a short delay to ensure that the system has caught up and that
         // native text displayers have been updated by the browser.
-        await Util.shortDelay();
+        await Util.delay(0.1);
       };
     });
 
@@ -314,6 +317,16 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
       await checkScreenshot(prefix, 'nested-cues-with-linebreak');
     });
 
+    // Regression test for #3600
+    it('cue positioning', async () => {
+      const cue = new shaka.text.Cue(0, 1, 'Text');
+      cue.line = 10;
+      cue.lineInterpretation = shaka.text.Cue.lineInterpretation.PERCENTAGE;
+      textDisplayer.append([cue]);
+
+      await checkScreenshot(prefix, 'cue-position');
+    });
+
     // Regression test for #2157 and #2584
     it('region positioning', async () => {
       const nestedCue = new shaka.text.Cue(
@@ -463,6 +476,6 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
     return Util.checkScreenshot(
         /* element= */ videoContainer,
         prefix + '-' + baseName,
-        threshold);
+        minSimilarity);
   }
 });

package/test/util/mp4_box_parsers_unit.js

@@ -149,4 +149,32 @@ describe('Mp4BoxParsers', () => {
     expect(defaultSampleDuration).toBe(expectedDefaultSampleDuration);
     expect(baseMediaDecodeTime).toBe(expectedBaseMediaDecodeTime);
   });
+
+  /**
+   * Test on parsing an incomplete TKHD V1 box, since the parser doesn't
+   * parse the other fields
+   *
+   * Explanation on the Uint8Array:
+   * [
+   * <creation_time, 8 bytes>,
+   * <modification_time, 8 bytes>,
+   * <track_id, 4 bytes>
+   * ]
+   *
+   * Time is a 32B integer expressed in seconds since Jan 1, 1904, 0000 UTC
+   *
+   */
+  it('parses TKHD v1 box', () => {
+    const tkhdBox = new Uint8Array([
+      0x00, 0x00, 0x00, 0x00, 0xDC, 0xBF, 0x0F, 0xD7, // Creation time
+      0x00, 0x00, 0x00, 0x00, 0xDC, 0xBF, 0x0F, 0xD7, // Modification time
+      0x00, 0x00, 0x00, 0x01, // Track ID
+      // Remaining fields are not processed in parseTKHD()
+    ]);
+    const reader = new shaka.util.DataViewReader(
+        tkhdBox, shaka.util.DataViewReader.Endianness.BIG_ENDIAN);
+    const parsedTkhd = shaka.util.Mp4BoxParsers
+        .parseTKHD(reader, /* version= */ 1);
+    expect(parsedTkhd.trackId).toBe(1);
+  });
 });

package/test/util/stream_utils_unit.js

@@ -488,7 +488,23 @@ describe('StreamUtils', () => {
       });
 
       await StreamUtils.getDecodingInfosForVariants(manifest.variants,
-          /* usePersistentLicenses= */false);
+          /* usePersistentLicenses= */false, /* srcEquals= */ false);
+      expect(manifest.variants.length).toBeTruthy();
+      expect(manifest.variants[0].decodingInfos.length).toBe(1);
+      expect(manifest.variants[0].decodingInfos[0].supported).toBeTruthy();
+    });
+
+    it('for srcEquals content', async () => {
+      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+        manifest.addVariant(0, (variant) => {
+          variant.addVideo(1, (stream) => {
+            stream.mime('video/mp4', 'avc1.4d400d');
+          });
+        });
+      });
+
+      await StreamUtils.getDecodingInfosForVariants(manifest.variants,
+          /* usePersistentLicenses= */false, /* srcEquals= */ true);
       expect(manifest.variants.length).toBeTruthy();
       expect(manifest.variants[0].decodingInfos.length).toBe(1);
       expect(manifest.variants[0].decodingInfos[0].supported).toBeTruthy();
@@ -517,10 +533,51 @@ describe('StreamUtils', () => {
       });
 
       await StreamUtils.getDecodingInfosForVariants(manifest.variants,
-          /* usePersistentLicenses= */false);
+          /* usePersistentLicenses= */false, /* srcEquals= */ false);
       expect(manifest.variants.length).toBe(1);
       expect(manifest.variants[0].decodingInfos.length).toBe(0);
     });
+
+    it('includes transferFunction in config when hdr', async () => {
+      const originalDecodingInfo = navigator.mediaCapabilities.decodingInfo;
+
+      try {
+        navigator.mediaCapabilities.decodingInfo =
+            shaka.test.Util.spyFunc(decodingInfoSpy);
+
+        manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+          manifest.addVariant(0, (variant) => {
+            variant.addVideo(0, (stream) => {
+              stream.mime('video/mp4', 'avc1.640028');
+              stream.hdr = 'SDR';
+            });
+          });
+          manifest.addVariant(1, (variant) => {
+            variant.addVideo(1, (stream) => {
+              stream.mime('video/mp4', 'hvc1.2.4.L150.90');
+              stream.hdr = 'PQ';
+            });
+          });
+          manifest.addVariant(2, (variant) => {
+            variant.addVideo(2, (stream) => {
+              stream.mime('video/mp4', 'hvc1.2.4.L153.B0');
+              stream.hdr = 'HLG';
+            });
+          });
+        });
+
+        await StreamUtils.getDecodingInfosForVariants(manifest.variants,
+            /* usePersistentLicenses= */ false, /* srcEquals= */ false);
+        expect(decodingInfoSpy.calls.argsFor(0)[0].video.transferFunction)
+            .toBe('srgb');
+        expect(decodingInfoSpy.calls.argsFor(1)[0].video.transferFunction)
+            .toBe('pq');
+        expect(decodingInfoSpy.calls.argsFor(2)[0].video.transferFunction)
+            .toBe('hlg');
+      } finally {
+        navigator.mediaCapabilities.decodingInfo = originalDecodingInfo;
+      }
+    });
   });
 
   describe('filterManifest', () => {
@@ -820,7 +877,7 @@ describe('StreamUtils', () => {
       });
 
       await StreamUtils.getDecodingInfosForVariants(manifest.variants,
-          /* usePersistentLicenses= */false);
+          /* usePersistentLicenses= */false, /* srcEquals= */ false);
 
       shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest,
           /* preferredVideoCodecs= */[],

package/ui/cast_button.js

@@ -101,9 +101,8 @@ shaka.ui.CastButton = class extends shaka.ui.Element {
       } catch (error) {
         this.castButton_.disabled = false;
         if (error.code != shaka.util.Error.Code.CAST_CANCELED_BY_USER) {
-          this.controls.dispatchEvent(new shaka.util.FakeEvent('error', {
-            detail: error,
-          }));
+          this.controls.dispatchEvent(new shaka.util.FakeEvent(
+              'error', (new Map()).set('detail', error)));
         }
       }
     }

package/ui/controls.js

@@ -198,6 +198,10 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
    * @export
    */
   async destroy() {
+    if (document.pictureInPictureElement == this.localVideo_) {
+      await document.exitPictureInPicture();
+    }
+
     if (this.eventManager_) {
       this.eventManager_.release();
       this.eventManager_ = null;
@@ -249,6 +253,9 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
 
     this.localization_ = null;
     this.pressedKeys_.clear();
+
+    // FakeEventTarget implements IReleasable
+    super.release();
   }
 
 
@@ -569,9 +576,8 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
           }
         }
       } catch (error) {
-        this.dispatchEvent(new shaka.util.FakeEvent('error', {
-          detail: error,
-        }));
+        this.dispatchEvent(new shaka.util.FakeEvent(
+            'error', (new Map()).set('detail', error)));
       }
     }
   }
@@ -1158,9 +1164,8 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
   /** @private */
   onCastStatusChange_() {
     const isCasting = this.castProxy_.isCasting();
-    this.dispatchEvent(new shaka.util.FakeEvent('caststatuschanged', {
-      newStatus: isCasting,
-    }));
+    this.dispatchEvent(new shaka.util.FakeEvent(
+        'caststatuschanged', (new Map()).set('newStatus', isCasting)));
 
     if (isCasting) {
       this.controlsContainer_.setAttribute('casting', 'true');

package/ui/less/buttons.less

@@ -75,10 +75,6 @@
 .shaka-current-time {
   font-size: 14px;
   color: rgb(255, 255, 255);
-
-  /* Make the time element the right size for the text, instead of defaulting
-   * to the same size as the rest of the controls. */
-  height: auto;
   cursor: pointer;
 
   &[disabled] {