shaka-player 3.2.2 → 3.2.3

package/test/util/stream_utils_unit.js

@@ -16,14 +16,14 @@ describe('StreamUtils', () => {
   /** @type {!jasmine.Spy} */
   let decodingInfoSpy;
 
-  const originalDecodingInfo = window.shakaMediaCapabilities.decodingInfo;
+  const originalDecodingInfo = navigator.mediaCapabilities.decodingInfo;
 
   beforeEach(() => {
     decodingInfoSpy = jasmine.createSpy('decodingInfo');
   });
 
   afterEach(() => {
-    window.shakaMediaCapabilities.decodingInfo = originalDecodingInfo;
+    navigator.mediaCapabilities.decodingInfo = originalDecodingInfo;
   });
 
   describe('filterStreamsByLanguageAndRole', () => {
@@ -511,7 +511,7 @@ describe('StreamUtils', () => {
     });
 
     it('handles decodingInfo exception', async () => {
-      window.shakaMediaCapabilities.decodingInfo =
+      navigator.mediaCapabilities.decodingInfo =
           shaka.test.Util.spyFunc(decodingInfoSpy);
       // If decodingInfo() fails, setDecodingInfo should finish without throwing
       // an exception, and the variant should have no decodingInfo result.
@@ -539,38 +539,44 @@ describe('StreamUtils', () => {
     });
 
     it('includes transferFunction in config when hdr', async () => {
-      window.shakaMediaCapabilities.decodingInfo =
-          shaka.test.Util.spyFunc(decodingInfoSpy);
+      const originalDecodingInfo = navigator.mediaCapabilities.decodingInfo;
 
-      manifest = shaka.test.ManifestGenerator.generate((manifest) => {
-        manifest.addVariant(0, (variant) => {
-          variant.addVideo(0, (stream) => {
-            stream.mime('video/mp4', 'avc1.640028');
-            stream.hdr = 'SDR';
+      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(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';
+          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');
+        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;
+      }
     });
   });
 
@@ -861,7 +867,7 @@ describe('StreamUtils', () => {
           });
         });
       });
-      window.shakaMediaCapabilities.decodingInfo =
+      navigator.mediaCapabilities.decodingInfo =
           shaka.test.Util.spyFunc(decodingInfoSpy);
       decodingInfoSpy.and.callFake((config) => {
         const res = config.video.contentType.includes('notsmooth') ?

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] {

package/ui/text_selection.js

@@ -64,6 +64,7 @@ shaka.ui.TextSelection = class extends shaka.ui.SettingsMenu {
 
     this.eventManager.listen(this.player, 'texttrackvisibility', () => {
       this.onCaptionStateChange_();
+      this.updateTextLanguages_();
     });
 
     this.eventManager.listen(this.player, 'textchanged', () => {

package/externs/media_capabilities.js

@@ -1,16 +0,0 @@
-/*! @license
- * Shaka Player
- * Copyright 2016 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Externs for Shaka MediaCapabilities which were missing in the
- * Closure compiler.
- *
- * @externs
- */
-
-
-/** @type {MediaCapabilities} */
-window.shakaMediaCapabilities;