shaka-player 4.5.0 → 4.6.1

package/lib/util/xml_utils.js

@@ -397,6 +397,11 @@ shaka.util.XmlUtils = class {
       return null;
     }
 
+    // Cobalt browser doesn't support document.createNodeIterator.
+    if (!('createNodeIterator' in document)) {
+      return rootElem;
+    }
+
     // SECURITY: Verify that the document does not contain elements from the
     // HTML or SVG namespaces, which could trigger script execution and XSS.
     const iterator = document.createNodeIterator(

package/maintained-branches.md

@@ -2,8 +2,8 @@
 
 We are currently maintaining the following branches of Shaka Player:
 
- - v4.5 (latest)
- - v4.4 (previous)
+ - v4.6 (latest)
+ - v4.5 (previous)
  - v4.3 (in use by the Cast Application Framework)
  - No active LTS branches at this time
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.5.0",
+  "version": "4.6.1",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

package/roadmap.md

@@ -13,18 +13,28 @@ Candidate features for future release cycles:
    https://github.com/shaka-project/shaka-player/issues/1030
  - Background fetch for offline storage
    https://github.com/shaka-project/shaka-player/issues/879
+ - A method to stitch together clips
+   https://github.com/shaka-project/shaka-player/issues/764
+ - Predict next segment in DASH SegmentTimeline
+   https://github.com/shaka-project/shaka-player/issues/898
  - Smaller, more modular binary
 
-v4.6 - 2024 Q1
- - Content Steering
-   https://github.com/shaka-project/shaka-player/issues/5704
+v5.0 - 2024 Q1
  - Preload API
    https://github.com/shaka-project/shaka-player/issues/880
+ - Common Media Server Data (CMSD)
+   https://github.com/shaka-project/shaka-player/issues/5890
+
+=====
+
+v4.6 - 2023 Q4
+ - Content Steering
+   https://github.com/shaka-project/shaka-player/issues/5704
  - New DASH protocol for Low Latency.
  - ManagedMediaSource
    https://github.com/shaka-project/shaka-player/issues/5271
-
-=====
+ - Add thumbnails support in src=
+ - Remove state engine
 
 v4.5 - 2023 Q4
  - Built-in transmuxer support for muxed content streams (audio+video)

package/shaka-player.uncompiled.js

@@ -50,7 +50,6 @@ goog.require('shaka.polyfill.VTTCue');
 goog.require('shaka.polyfill.VideoPlayPromise');
 goog.require('shaka.polyfill.VideoPlaybackQuality');
 goog.require('shaka.polyfill');
-goog.require('shaka.routing.Walker');
 goog.require('shaka.text.Cue');
 goog.require('shaka.text.LrcTextParser');
 goog.require('shaka.text.Mp4TtmlParser');

package/test/abr/simple_abr_manager_unit.js

@@ -145,14 +145,14 @@ describe('SimpleAbrManager', () => {
       abrManager.setVariants(variants);
       abrManager.chooseVariant();
 
-      abrManager.segmentDownloaded(1000, bytesPerSecond);
-      abrManager.segmentDownloaded(1000, bytesPerSecond);
+      abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+      abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
       abrManager.enable();
 
       // Make another call to segmentDownloaded() so switchCallback() is
       // called.
-      abrManager.segmentDownloaded(1000, bytesPerSecond);
+      abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
       // Expect variants 2 to be chosen for bandwidth = 5e5
       // and variant 5 - for bandwidth = 6e5
@@ -173,12 +173,12 @@ describe('SimpleAbrManager', () => {
     abrManager.chooseVariant();
 
     // 0 duration segment shouldn't cause us to get stuck on the lowest variant
-    abrManager.segmentDownloaded(0, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(0, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     abrManager.enable();
 
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     expect(abrManager.getBandwidthEstimate()).toBeTruthy();
   });
@@ -193,14 +193,14 @@ describe('SimpleAbrManager', () => {
     // bandwidth.
     const bytesPerSecond = sufficientBWMultiplier * bandwidth / 8.0;
 
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     abrManager.enable();
 
     // Make another call to segmentDownloaded() so switchCallback() is
     // called.
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     // Expect variants 4 to be chosen
     const expectedVariant = variants[3];
@@ -216,9 +216,9 @@ describe('SimpleAbrManager', () => {
     abrManager.chooseVariant();
 
     // Don't enable AbrManager.
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
     expect(switchCallback).not.toHaveBeenCalled();
   });
 
@@ -229,12 +229,12 @@ describe('SimpleAbrManager', () => {
     abrManager.setVariants(variants);
     abrManager.chooseVariant();
 
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     abrManager.enable();
 
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
     expect(switchCallback).toHaveBeenCalled();
     switchCallback.calls.reset();
 
@@ -242,23 +242,23 @@ describe('SimpleAbrManager', () => {
     bandwidth = 2e6;
     bytesPerSecond = sufficientBWMultiplier * bandwidth / 8.0;
 
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     // Stay inside switch interval.
     Date.now = () => (config.switchInterval - 2) * 1e3;
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     expect(switchCallback).not.toHaveBeenCalled();
 
     // Move outside switch interval.
     Date.now = () => (config.switchInterval + 2) * 1e3;
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     expect(switchCallback).toHaveBeenCalled();
   });
@@ -272,14 +272,14 @@ describe('SimpleAbrManager', () => {
     abrManager.setVariants(variants);
     abrManager.chooseVariant();
 
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     abrManager.enable();
 
     // Make another call to segmentDownloaded(). switchCallback() will be
     // called to upgrade.
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     // The second parameter is missing to indicate that the buffer should not be
     // cleared.
@@ -300,14 +300,14 @@ describe('SimpleAbrManager', () => {
     abrManager.setVariants(variants);
     abrManager.chooseVariant();
 
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     abrManager.enable();
 
     // Make another call to segmentDownloaded(). switchCallback() will be
     // called to upgrade.
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     // The second parameter is missing to indicate that the buffer should not be
     // cleared.
@@ -327,14 +327,14 @@ describe('SimpleAbrManager', () => {
     abrManager.setVariants(variants);
     abrManager.chooseVariant();
 
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     abrManager.enable();
 
     // Make another call to segmentDownloaded(). switchCallback() will be
     // called to downgrade.
-    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond, true);
 
     // The second parameter is missing to indicate that the buffer should not be
     // cleared.

package/test/ads/ad_manager_unit.js

@@ -16,10 +16,11 @@ describe('Ad manager', () => {
   /** @type {google.ima.AdsRenderingSettings} */
   let adsRenderingSettings;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     window['google'] = null;
     mockVideo = new shaka.test.FakeVideo();
-    player = new shaka.Player(mockVideo);
+    player = new shaka.Player();
+    await player.attach(mockVideo, /* initializeMediaSource= */ false);
     adManager = player.getAdManager();
     expect(adManager instanceof shaka.ads.AdManager).toBe(true);
 

package/test/cast/cast_receiver_integration.js

@@ -65,7 +65,7 @@ filterDescribe('CastReceiver', castReceiverIntegrationSupport, () => {
     support = await shaka.media.DrmEngine.probeSupport();
   });
 
-  beforeEach(() => {
+  beforeEach(async () => {
     mockReceiverApi = createMockReceiverApi();
 
     const mockCanDisplayType = jasmine.createSpy('canDisplayType');
@@ -87,7 +87,8 @@ filterDescribe('CastReceiver', castReceiverIntegrationSupport, () => {
 
     document.body.appendChild(video);
 
-    player = new shaka.Player(video);
+    player = new shaka.Player();
+    await player.attach(video);
     receiver = new CastReceiver(video, player);
 
     toRestore = [];
@@ -320,8 +321,6 @@ filterDescribe('CastReceiver', castReceiverIntegrationSupport, () => {
     // Add wrappers to various methods along player.load to make sure that,
     // at each stage, the cast receiver can form an update message without
     // causing an error.
-    waitForUpdateMessageWrapper(
-        shaka.media.ManifestParser, 'ManifestParser', 'getFactory');
     waitForUpdateMessageWrapper(
         // eslint-disable-next-line no-restricted-syntax
         shaka.test.TestScheme.ManifestParser.prototype, 'ManifestParser',

package/test/cast/cast_utils_unit.js

@@ -21,11 +21,13 @@ describe('CastUtils', () => {
       'getMediaElement',  // Handled specially
       'setMaxHardwareResolution',
       'destroy',  // Should use CastProxy.destroy instead
+      'getAllThumbnails', // Too large to proxy.
       'drmInfo',  // Too large to proxy
       'getManifest', // Too large to proxy
       'getManifestParserFactory',  // Would not serialize.
       'setVideoContainer',
       'getActiveSessionsMetadata',
+      'releaseAllMutexes', // Very specific to the inner workings of the player.
 
       // Test helper methods (not @export'd)
       'createDrmEngine',

package/test/cea/cea_decoder_unit.js

@@ -519,6 +519,13 @@ describe('CeaDecoder', () => {
 
       expect(decoder.reset).toHaveBeenCalledTimes(1);
     });
+
+    it('does not attempt to extract SEI packet that is too short', () => {
+      const badData = new Uint8Array([0xb5]);
+      decoder.extract(badData, 0);
+      const captions = decoder.decode();
+      expect(captions.length).toBe(0);
+    });
   });
 
   describe('decodes CEA-708', () => {

package/test/codec_switching/codec_switching_integration.js

@@ -26,7 +26,8 @@ describe('Codec Switching', () => {
 
   beforeEach(async () => {
     await shaka.test.TestScheme.createManifests(compiledShaka, '_compiled');
-    player = new compiledShaka.Player(video);
+    player = new compiledShaka.Player();
+    await player.attach(video);
 
     // Disable stall detection, which can interfere with playback tests.
     player.configure('streaming.stallEnabled', false);

package/test/dash/dash_parser_integration.js

@@ -31,7 +31,8 @@ describe('DashParser', () => {
 
   beforeEach(async () => {
     await shaka.test.TestScheme.createManifests(compiledShaka, '_compiled');
-    player = new compiledShaka.Player(video);
+    player = new compiledShaka.Player();
+    await player.attach(video);
 
     // Disable stall detection, which can interfere with playback tests.
     player.configure('streaming.stallEnabled', false);

package/test/dash/dash_parser_live_unit.js

@@ -661,25 +661,6 @@ describe('DashParser Live', () => {
     expect(delay).toBe(updateTime);
   });
 
-  it('still updates when @minimumUpdatePeriod is zero', async () => {
-    const lines = [
-      '<SegmentTemplate startNumber="1" media="s$Number$.mp4" duration="2" />',
-    ];
-    // updateTime parameter sets @minimumUpdatePeriod in the manifest.
-    const manifestText = makeSimpleLiveManifestText(lines, /* updateTime= */ 0);
-
-    /** @type {!jasmine.Spy} */
-    const tickAfter = updateTickSpy();
-    Date.now = () => 0;
-
-    fakeNetEngine.setResponseText('dummy://foo', manifestText);
-    await parser.start('dummy://foo', playerInterface);
-
-    expect(tickAfter).toHaveBeenCalledTimes(1);
-    const delay = tickAfter.calls.mostRecent().args[0];
-    expect(delay).toBe(0);
-  });
-
   it('does not update when @minimumUpdatePeriod is missing', async () => {
     const lines = [
       '<SegmentTemplate startNumber="1" media="s$Number$.mp4" duration="2" />',