shaka-player 3.3.0 → 3.3.1

package/test/util/cmcd_manager_unit.js

@@ -33,13 +33,19 @@ describe('CmcdManager', () => {
   describe('Query serialization', () => {
     it('produces correctly serialized data', () => {
       const query = CmcdManager.toQuery(data);
-      const result = 'CMCD=br%3D52317%2Cbs%2Ccid%3D%22xyz%22%2C' +
-                     'com.test-exists%2Ccom.test-hello%3D%22world%22%2C' +
-                     'com.test-testing%3D1234%2Ccom.test-token%3Ds%2C' +
-                     'd%3D6067%2Cmtp%3D10000%2C' +
-                     'nor%3D%22..%252Ftesting%252F3.m4v%22%2C' +
-                     'nrr%3D%220-99%22%2C' +
-                     'sid%3D%22c936730c-031e-4a73-976f-92bc34039c60%22';
+      const result = 'br=52317,bs,cid="xyz",com.test-exists,' +
+                     'com.test-hello="world",com.test-testing=1234,' +
+                     'com.test-token=s,d=6067,mtp=10000,' +
+                     'nor="..%2Ftesting%2F3.m4v",nrr="0-99",' +
+                     'sid="c936730c-031e-4a73-976f-92bc34039c60"';
+      expect(query).toBe(result);
+    });
+
+    it('escapes reserve character in string values', () => {
+      const query = CmcdManager.toQuery({
+        'com.test-escape': 'Double "Quotes"',
+      });
+      const result = 'com.test-escape="Double \\"Quotes\\""';
       expect(query).toBe(result);
     });
   });
@@ -77,12 +83,20 @@ describe('CmcdManager', () => {
           {start: 35, end: 40},
         ],
       }),
-      getManifest: () => /** @type {shaka.extern.Manifest} */({
-        variants: [
-          {video: {bandwidth: 50000}},
-          {video: {bandwidth: 5000000}},
-        ],
-      }),
+      getVariantTracks: () => /** @type {Array.<shaka.extern.Track>} */([
+        {
+          type: 'variant',
+          bandwidth: 50000,
+          videoBandwidth: 40000,
+          audioBandWidth: 10000,
+        },
+        {
+          type: 'variant',
+          bandwidth: 5000000,
+          videoBandwidth: 4000000,
+          audioBandWidth: 1000000,
+        },
+      ]),
       getPlaybackRate: () => 1,
       getCurrentTime: () => 10,
     };
@@ -169,7 +183,7 @@ describe('CmcdManager', () => {
         const uri = 'https://test.com/test.mpd?CMCD=bl%3D21200%2Cbr%3D5234%2Ccid%3D%22' +
           'testing%22%2Cd%3D3330%2Cmtp%3D10000%2Cot%3Dv%2Csf%3Dd%2C' +
           'sid%3D%222ed2d1cd-970b-48f2-bfb3-50a79e87cfa3%22%2Cst%3Dv%2Csu%2C' +
-          'tb%3D5000';
+          'tb%3D4000';
         expect(r.uris[0]).toBe(uri);
       });
 
@@ -206,7 +220,7 @@ describe('CmcdManager', () => {
         cmcdManager.applySegmentData(r, segmentInfo);
         expect(r.headers).toEqual({
           'testing': '1234',
-          'CMCD-Object': 'br=5234,d=3330,ot=v,tb=5000',
+          'CMCD-Object': 'br=5234,d=3330,ot=v,tb=4000',
           'CMCD-Request': 'bl=21200,mtp=10000,su',
           'CMCD-Session': 'cid="testing",sf=d,' +
                           'sid="2ed2d1cd-970b-48f2-bfb3-50a79e87cfa3",st=v',

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/third_party/closure-uri/uri.js

@@ -808,6 +808,27 @@ goog.Uri.QueryData.prototype.add = function(key, value) {
   return this;
 };
 
+/**
+ * Sets a key value pair and removes all other keys with the same value.
+ *
+ * @param {string} key Name.
+ * @param {string} value Value.
+ * @return {!goog.Uri.QueryData} Instance of this object.
+ */
+ goog.Uri.QueryData.prototype.set = function(key, value) {
+  this.ensureKeyMapInitialized_();
+  // Invalidate the cache.
+  this.encodedQuery_ = null;
+
+  if (!this.keyMap_.hasOwnProperty(key)) {
+    this.add(key, value);
+  } else {
+    this.keyMap_[key] = [value];
+  }
+
+  return this;
+};
+
 
 /**
  * @return {string} Encoded query string.

package/ui/text_selection.js

@@ -66,6 +66,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;