shaka-player 4.3.10 → 4.4.0

package/lib/util/xml_utils.js

@@ -321,6 +321,19 @@ shaka.util.XmlUtils = class {
   }
 
 
+  /**
+   * Parses a boolean.
+   * @param {string} booleanString The boolean string.
+   * @return {boolean} The boolean
+   */
+  static parseBoolean(booleanString) {
+    if (!booleanString) {
+      return false;
+    }
+    return booleanString.toLowerCase() === 'true';
+  }
+
+
   /**
    * Evaluate a division expressed as a string.
    * @param {string} exprString
@@ -404,15 +417,15 @@ shaka.util.XmlUtils = class {
 
 
   /**
-   * Parse some UTF8 data and return the resulting root element if
-   * it was valid XML.
+   * Parse some data (auto-detecting the encoding) and return the resulting
+   * root element if it was valid XML.
    * @param {BufferSource} data
    * @param {string} expectedRootElemName
    * @return {Element}
    */
   static parseXml(data, expectedRootElemName) {
     try {
-      const string = shaka.util.StringUtils.fromUTF8(data);
+      const string = shaka.util.StringUtils.fromBytesAutoDetect(data);
       return shaka.util.XmlUtils.parseXmlString(string, expectedRootElemName);
     } catch (exception) {
       shaka.log.error('parseXmlString threw!', exception);

package/maintained-branches.md

@@ -2,8 +2,8 @@
 
 We are currently maintaining the following branches of Shaka Player:
 
- - v4.3 (latest, also in use by the Cast Application Framework)
- - v4.2 (previous)
+ - v4.4 (latest)
+ - v4.3 (previous, also in use by the Cast Application Framework)
  - No active LTS branches at this time
 
 Other branches are no longer receiving bug fixes, and we recommend you upgrade

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.3.10",
+  "version": "4.4.0",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -21,6 +21,7 @@
     "cajon": "^0.4.4",
     "clean-package": "^2.2.0",
     "code-prettify": "^0.1.0",
+    "codem-isoboxer": "^0.3.7",
     "color-themes-for-google-code-prettify": "^2.0.4",
     "core-js": "^3.21.1",
     "dialog-polyfill": "^0.5.6",
@@ -68,6 +69,7 @@
     "demoDeps": [
       "awesomplete/awesomplete.css",
       "awesomplete/awesomplete.min.js",
+      "codem-isoboxer/dist/iso_boxer.min.js",
       "dialog-polyfill/dialog-polyfill.css",
       "dialog-polyfill/dist/dialog-polyfill.js",
       "eme-encryption-scheme-polyfill/index.js",

package/roadmap.md

@@ -8,23 +8,38 @@ CHANGELOG.md.
 The goals of future milestones are fluid until we begin that development cycle,
 so the exact milestone for future features is not pre-determined.
 
-Priority features up next:
- - HLS improvements
-   https://github.com/shaka-project/shaka-player/projects/6
-
 Candidate features for future release cycles:
  - Preload API
    https://github.com/shaka-project/shaka-player/issues/880
  - Official TypeScript defs, generated from source
    https://github.com/shaka-project/shaka-player/issues/1030
- - Codec-switching
-   https://github.com/shaka-project/shaka-player/issues/1528
  - Background fetch for offline storage
    https://github.com/shaka-project/shaka-player/issues/879
  - Smaller, more modular binary
 
+v4.5 - 2023 Q4 or 2024 Q1
+ - Built-in transmuxer support for muxed content streams (audio+video)
+ - Built-in transmuxer support for H265 streams
+ - Remove optional mux.js dependency
+ - Codec switching
+   https://github.com/shaka-project/shaka-player/issues/1528
+
 =====
 
+v4.4 - 2023 Q3
+ - Built-in transmuxer for common cases, no mux.js required:
+   - Raw AAC, AC3, or EC3 to MP4 container
+   - AAC, AC3, EC3, MP3, or H264 in TS to MP4 container
+   - MP3-in-TS to raw MP3
+ - Ads API improvements
+ - CEA parser for TS
+ - HLS support for non-sequence mode (as we had in v3)
+ - Partial support for large timestamps
+ - UI support for thumbnails on seek
+ - Microsoft SmoothStreaming support
+ - Segment prefetch
+ - Low latency improvements
+
 v4.3 - 2022 Q4
  - Support ID3 tags in mp4
    https://github.com/shaka-project/shaka-player/issues/3351

package/shaka-player.uncompiled.js

@@ -17,6 +17,7 @@ goog.require('shaka.cast.CastProxy');
 goog.require('shaka.cast.CastReceiver');
 goog.require('shaka.dash.DashParser');
 goog.require('shaka.hls.HlsParser');
+goog.require('shaka.mss.MssParser');
 goog.require('shaka.log');
 goog.require('shaka.media.AdaptationSetCriteria');
 goog.require('shaka.media.InitSegmentReference');
@@ -61,6 +62,23 @@ goog.require('shaka.text.SsaTextParser');
 goog.require('shaka.text.TtmlTextParser');
 goog.require('shaka.text.VttTextParser');
 goog.require('shaka.text.WebVttGenerator');
+goog.require('shaka.cea.CeaDecoder');
+goog.require('shaka.cea.Mp4CeaParser');
+goog.require('shaka.cea.TsCeaParser');
+goog.require('shaka.transmuxer.AacTransmuxer');
+goog.require('shaka.transmuxer.Ac3');
+goog.require('shaka.transmuxer.Ac3Transmuxer');
+goog.require('shaka.transmuxer.ADTS');
+goog.require('shaka.transmuxer.Ec3');
+goog.require('shaka.transmuxer.Ec3Transmuxer');
+goog.require('shaka.transmuxer.H264');
+goog.require('shaka.transmuxer.Mp3Transmuxer');
+goog.require('shaka.transmuxer.MpegAudio');
+goog.require('shaka.transmuxer.MpegTsTransmuxer');
+goog.require('shaka.transmuxer.TransmuxerEngine');
+goog.require('shaka.transmuxer.MssTransmuxer');
+goog.require('shaka.transmuxer.MuxjsTransmuxer');
+goog.require('shaka.transmuxer.TsTransmuxer');
 goog.require('shaka.ui.Controls');
 goog.require('shaka.ui.PlayButton');
 goog.require('shaka.ui.SettingsMenu');

package/test/abr/simple_abr_manager_unit.js

@@ -158,7 +158,7 @@ describe('SimpleAbrManager', () => {
       // and variant 5 - for bandwidth = 6e5
       const expectedVariant = (bandwidth == 6e5) ? variants[5] : variants[2];
 
-      expect(switchCallback).toHaveBeenCalledWith(expectedVariant);
+      expect(switchCallback).toHaveBeenCalledWith(expectedVariant, false, 0);
     });
   }
 
@@ -205,7 +205,7 @@ describe('SimpleAbrManager', () => {
     // Expect variants 4 to be chosen
     const expectedVariant = variants[3];
 
-    expect(switchCallback).toHaveBeenCalledWith(expectedVariant);
+    expect(switchCallback).toHaveBeenCalledWith(expectedVariant, false, 0);
   });
 
   it('does not call switchCallback() if not enabled', () => {
@@ -283,7 +283,35 @@ describe('SimpleAbrManager', () => {
 
     // The second parameter is missing to indicate that the buffer should not be
     // cleared.
-    expect(switchCallback).toHaveBeenCalledWith(jasmine.any(Object));
+    expect(switchCallback).toHaveBeenCalledWith(jasmine.any(Object), false, 0);
+  });
+
+  it('does clear the buffer on upgrade with safemargin to 4', () => {
+    // Simulate some segments being downloaded at a high rate, to trigger an
+    // upgrade.
+    const bandwidth = 5e5;
+    const bytesPerSecond = sufficientBWMultiplier * bandwidth / 8.0;
+
+    // Set the clear buffer to true and the safe margin to 4.
+    config.clearBufferSwitch = true;
+    config.safeMarginSwitch = 4;
+    abrManager.configure(config);
+
+    abrManager.setVariants(variants);
+    abrManager.chooseVariant();
+
+    abrManager.segmentDownloaded(1000, bytesPerSecond);
+    abrManager.segmentDownloaded(1000, bytesPerSecond);
+
+    abrManager.enable();
+
+    // Make another call to segmentDownloaded(). switchCallback() will be
+    // called to upgrade.
+    abrManager.segmentDownloaded(1000, bytesPerSecond);
+
+    // The second parameter is missing to indicate that the buffer should not be
+    // cleared.
+    expect(switchCallback).toHaveBeenCalledWith(jasmine.any(Object), true, 4);
   });
 
   it('does not clear the buffer on downgrade', () => {
@@ -310,7 +338,7 @@ describe('SimpleAbrManager', () => {
 
     // The second parameter is missing to indicate that the buffer should not be
     // cleared.
-    expect(switchCallback).toHaveBeenCalledWith(jasmine.any(Object));
+    expect(switchCallback).toHaveBeenCalledWith(jasmine.any(Object), false, 0);
   });
 
   it('will respect restrictions', () => {

package/test/ads/ad_manager_unit.js

@@ -13,6 +13,8 @@ describe('Ad manager', () => {
   let adManager;
   /** @type {!HTMLElement} */
   let adContainer;
+  /** @type {google.ima.AdsRenderingSettings} */
+  let adsRenderingSettings;
 
   beforeEach(() => {
     window['google'] = null;
@@ -21,6 +23,9 @@ describe('Ad manager', () => {
     adManager = player.getAdManager();
     expect(adManager instanceof shaka.ads.AdManager).toBe(true);
 
+    const config = shaka.util.PlayerConfiguration.createDefault().ads;
+    adManager.configure(config);
+
     adContainer =
       /** @type {!HTMLElement} */ (document.createElement('div'));
   });
@@ -32,7 +37,7 @@ describe('Ad manager', () => {
           shaka.util.Error.Code.CS_IMA_SDK_MISSING);
 
       expect(() => adManager.initClientSide(
-          adContainer, mockVideo)).toThrow(error);
+          adContainer, mockVideo, adsRenderingSettings)).toThrow(error);
     });
 
     it('doesn\'t request ads until CS is initialized', () => {
@@ -83,6 +88,10 @@ describe('Ad manager', () => {
           requestAds(imaRequest) {
             numAdsRequested += 1;
           }
+
+          contentComplete() {
+            // Nothing
+          }
         };
         window['google'].ima.AdsLoader = mockAdsLoader;
 
@@ -97,6 +106,10 @@ describe('Ad manager', () => {
               /** @type {!google.ima.AdsManager} */ (this);
             }
 
+            destroy() {
+              // Nothing
+            }
+
             getCuePoints() {
               return [];
             }
@@ -135,7 +148,7 @@ describe('Ad manager', () => {
       });
 
       // Set up the ad manager.
-      adManager.initClientSide(adContainer, mockVideo);
+      adManager.initClientSide(adContainer, mockVideo, adsRenderingSettings);
       goog.asserts.assert(loadEvent != null, 'loadEvent exists');
       mockAdsLoaderInstance.dispatchEvent(/** @type {!Event} */ (loadEvent));
       expect(loaded).toBe(true);
@@ -196,11 +209,14 @@ describe('Ad manager', () => {
     window['google'].ima = {};
     window['google'].ima.AdsLoader = {};
     window['google'].ima.dai = {};
+    window['google'].ima.AdsRenderingSettings = class {};
     window['google'].ima.AdsRequest = class {};
     window['google'].ima.dai.api = {};
     window['google'].ima.dai.api.StreamRequest = class {};
     window['google'].ima.settings = {};
     window['google'].ima.settings.setLocale = (locale) => {};
+    // eslint-disable-next-line max-len
+    window['google'].ima.settings.setDisableCustomPlaybackForIOS10Plus = (disable) => {};
     window['google'].ima.AdsManagerLoadedEvent = {};
     window['google'].ima.AdsManagerLoadedEvent.Type = {
       ADS_MANAGER_LOADED: 'ADS_MANAGER_LOADED',

package/test/cast/cast_utils_unit.js

@@ -8,6 +8,9 @@ describe('CastUtils', () => {
   const CastUtils = shaka.cast.CastUtils;
   const FakeEvent = shaka.util.FakeEvent;
 
+  /** @type {shaka.extern.Stream} */
+  const fakeStream = shaka.test.StreamingEngineUtil.createMockVideoStream(1);
+
   it('includes every Player member', () => {
     const ignoredMembers = [
       'constructor',  // JavaScript added field
@@ -22,6 +25,7 @@ describe('CastUtils', () => {
       'getManifest', // Too large to proxy
       'getManifestParserFactory',  // Would not serialize.
       'setVideoContainer',
+      'getActiveSessionsMetadata',
 
       // Test helper methods (not @export'd)
       'createDrmEngine',
@@ -29,6 +33,7 @@ describe('CastUtils', () => {
       'createPlayhead',
       'createMediaSourceEngine',
       'createStreamingEngine',
+      'disableStream',
     ];
 
     const castMembers = CastUtils.PlayerVoidMethods
@@ -221,11 +226,11 @@ describe('CastUtils', () => {
         await mediaSourceEngine.init(initObject, false);
         const data = await shaka.test.Util.fetch(initSegmentUrl);
         await mediaSourceEngine.appendBuffer(
-            ContentType.VIDEO, data, null, null,
+            ContentType.VIDEO, data, null, fakeStream,
             /* hasClosedCaptions= */ false);
         const data2 = await shaka.test.Util.fetch(videoSegmentUrl);
         await mediaSourceEngine.appendBuffer(
-            ContentType.VIDEO, data2, null, null,
+            ContentType.VIDEO, data2, null, fakeStream,
             /* hasClosedCaptions= */ false);
       });
 

package/test/cea/cea608_memory_unit.js

@@ -31,6 +31,9 @@ describe('Cea608Memory', () => {
     const caption = memory.forceEmit(startTime, endTime);
 
     const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
+    topLevelCue.line = 6.25;
+    topLevelCue.lineInterpretation =
+        shaka.text.Cue.lineInterpretation.PERCENTAGE;
     topLevelCue.nestedCues = [
       CeaUtils.createDefaultCue(startTime, endTime, text),
     ];
@@ -79,6 +82,9 @@ describe('Cea608Memory', () => {
     }
 
     const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
+    topLevelCue.line = 6.25;
+    topLevelCue.lineInterpretation =
+        shaka.text.Cue.lineInterpretation.PERCENTAGE;
     topLevelCue.nestedCues = [
       CeaUtils.createDefaultCue(startTime, endTime, expectedText),
     ];
@@ -113,6 +119,9 @@ describe('Cea608Memory', () => {
     }
 
     const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
+    topLevelCue.line = 6.25;
+    topLevelCue.lineInterpretation =
+        shaka.text.Cue.lineInterpretation.PERCENTAGE;
     topLevelCue.nestedCues = [
       CeaUtils.createStyledCue(startTime, endTime,
           expectedText, /* underline= */ true,
@@ -164,6 +173,9 @@ describe('Cea608Memory', () => {
     // ...
     // So we expect that test\n\ntest is emitted
     const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
+    topLevelCue.line = 37.5;
+    topLevelCue.lineInterpretation =
+        shaka.text.Cue.lineInterpretation.PERCENTAGE;
     topLevelCue.nestedCues = [
       CeaUtils.createDefaultCue(startTime, endTime, text),
       CeaUtils.createLineBreakCue(startTime, endTime),
@@ -205,6 +217,9 @@ describe('Cea608Memory', () => {
     memory.eraseChar(); // Erase the last 't' from 'testt'
 
     const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
+    topLevelCue.line = 6.25;
+    topLevelCue.lineInterpretation =
+        shaka.text.Cue.lineInterpretation.PERCENTAGE;
     topLevelCue.nestedCues = [
       CeaUtils.createDefaultCue(startTime, endTime, expectedText),
     ];
@@ -276,6 +291,9 @@ describe('Cea608Memory', () => {
 
       // Expected text is 's\nt\nt\ne'
       const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
+      topLevelCue.line = 31.25;
+      topLevelCue.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [
         CeaUtils.createDefaultCue(startTime, endTime, 's'),
         CeaUtils.createLineBreakCue(startTime, endTime),
@@ -320,6 +338,9 @@ describe('Cea608Memory', () => {
 
       // Expected text is 't\ne\ns\nt'
       const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
+      topLevelCue.line = 31.25;
+      topLevelCue.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [
         CeaUtils.createDefaultCue(startTime, endTime, 't'),
         CeaUtils.createLineBreakCue(startTime, endTime),
@@ -364,6 +385,9 @@ describe('Cea608Memory', () => {
 
       // Expected text is 't\ne\ns\nt'
       const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
+      topLevelCue.line = 31.25;
+      topLevelCue.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [
         CeaUtils.createDefaultCue(startTime, endTime, 't'),
         CeaUtils.createLineBreakCue(startTime, endTime),

package/test/cea/cea_decoder_unit.js

@@ -65,6 +65,9 @@ describe('CeaDecoder', () => {
 
       const topLevelCue = new shaka.text.Cue(
           startTimeCaption1, startTimeCaption2, '');
+      topLevelCue.line = 81.25;
+      topLevelCue.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [
         CeaUtils.createStyledCue(
             startTimeCaption1, startTimeCaption2, expectedText,
@@ -110,6 +113,9 @@ describe('CeaDecoder', () => {
       // Since there are three style changes, there should be three nested cues.
       const topLevelCue = new shaka.text.Cue(
           startTimeCaption1, startTimeCaption2, '');
+      topLevelCue.line = 6.25;
+      topLevelCue.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
 
       topLevelCue.nestedCues = [
         CeaUtils.createDefaultCue(
@@ -160,6 +166,9 @@ describe('CeaDecoder', () => {
       // A single nested cue containing yellow, italicized text.
       const topLevelCue = new shaka.text.Cue(startTimeCaption1,
           startTimeCaption2, '');
+      topLevelCue.line = 12.5;
+      topLevelCue.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [
         CeaUtils.createStyledCue(
             startTimeCaption1, startTimeCaption2, expectedText,
@@ -199,6 +208,9 @@ describe('CeaDecoder', () => {
 
       const topLevelCue = new shaka.text.Cue(startTimeCaption1,
           startTimeCaption2, '');
+      topLevelCue.line = 6.25;
+      topLevelCue.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [
         CeaUtils.createDefaultCue(
             startTimeCaption1, startTimeCaption2, expectedText),
@@ -231,6 +243,9 @@ describe('CeaDecoder', () => {
 
       const topLevelCue = new shaka.text.Cue(startTimeCaption1,
           startTimeCaption2, '');
+      topLevelCue.line = 6.25;
+      topLevelCue.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [
         CeaUtils.createDefaultCue(
             startTimeCaption1, startTimeCaption2, expectedText),
@@ -300,6 +315,9 @@ describe('CeaDecoder', () => {
       // Top level cue corresponding to the first closed caption.
       const topLevelCue1 = new shaka.text.Cue(
           /* startTime= */ time1, /* endTime= */ time2, '');
+      topLevelCue1.line = 93.75;
+      topLevelCue1.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue1.nestedCues = [
         CeaUtils.createDefaultCue(
             /* startTime= */ time1, /* endTime= */ time2, /* payload= */ '1.'),
@@ -308,6 +326,9 @@ describe('CeaDecoder', () => {
       // Top level cue corresponding to the second closed caption.
       const topLevelCue2 = new shaka.text.Cue(
           /* startTime= */ time2, /* endTime= */ time3, '');
+      topLevelCue2.line = 93.75;
+      topLevelCue2.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue2.nestedCues = [
         CeaUtils.createDefaultCue(
             /* startTime= */ time2, /* endTime= */ time3, /* payload= */ '1.'),
@@ -322,6 +343,9 @@ describe('CeaDecoder', () => {
       // Top level cue corresponding to the third closed caption.
       const topLevelCue3 = new shaka.text.Cue(
           /* startTime= */ time3, /* endTime= */ time4, '');
+      topLevelCue3.line = 93.75;
+      topLevelCue3.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue3.nestedCues = [
         CeaUtils.createDefaultCue(
             /* startTime= */ time3, /* endTime= */ time4, /* payload= */ '2.'),
@@ -336,6 +360,9 @@ describe('CeaDecoder', () => {
       // Top level cue corresponding to the fourth closed caption.
       const topLevelCue4 = new shaka.text.Cue(
           /* startTime= */ time4, /* endTime= */ time5, '');
+      topLevelCue4.line = 93.75;
+      topLevelCue4.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue4.nestedCues = [
         CeaUtils.createDefaultCue(
             /* startTime= */ time4, /* endTime= */ time5, /* payload= */ '3.'),
@@ -406,6 +433,9 @@ describe('CeaDecoder', () => {
       // Top level cue corresponding to the first closed caption.
       const topLevelCue1 = new shaka.text.Cue(/* startTime= */ 1,
           /* endTime= */ 2, '');
+      topLevelCue1.line = 93.75;
+      topLevelCue1.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue1.nestedCues = [
         CeaUtils.createDefaultCue(
             /* startTime= */ 1, /* endTime= */ 2, /* payload= */ '1.'),
@@ -414,6 +444,9 @@ describe('CeaDecoder', () => {
       // Top level cue corresponding to the second closed caption.
       const topLevelCue2 = new shaka.text.Cue(/* startTime= */ 2,
           /* endTime= */ 3, '');
+      topLevelCue2.line = 25;
+      topLevelCue2.lineInterpretation =
+          shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue2.nestedCues = [
         CeaUtils.createDefaultCue(
             /* startTime= */ 2, /* endTime= */ 3, /* payload= */ '1.'),

package/test/dash/dash_parser_content_protection_unit.js

@@ -795,7 +795,37 @@ describe('DashParser ContentProtection', () => {
       expect(actual).toBe('');
     });
 
-    it('no ms:laurl node', () => {
+    it('valid dashif:Laurl node', () => {
+      const input = {
+        init: null,
+        keyId: null,
+        schemeUri: '',
+        node: strToXml([
+          '<test xmlns:dashif="https://dashif.org/CPS">',
+          '  <dashif:Laurl>www.example.com</dashif:Laurl>',
+          '</test>',
+        ].join('\n')),
+      };
+      const actual = ContentProtection.getWidevineLicenseUrl(input);
+      expect(actual).toBe('www.example.com');
+    });
+
+    it('dashif:Laurl without license url', () => {
+      const input = {
+        init: null,
+        keyId: null,
+        schemeUri: '',
+        node: strToXml([
+          '<test xmlns:dashif="https://dashif.org/CPS">',
+          '  <dashif:Laurl></dashif:Laurl>',
+          '</test>',
+        ].join('\n')),
+      };
+      const actual = ContentProtection.getWidevineLicenseUrl(input);
+      expect(actual).toBe('');
+    });
+
+    it('no ms:laurl node or dashif:Laurl node', () => {
       const input = {
         init: null,
         keyId: null,
@@ -839,7 +869,37 @@ describe('DashParser ContentProtection', () => {
       expect(actual).toBe('');
     });
 
-    it('no clearkey:Laurl node', () => {
+    it('valid dashif:Laurl node', () => {
+      const input = {
+        init: null,
+        keyId: null,
+        schemeUri: '',
+        node: strToXml([
+          '<test xmlns:dashif="https://dashif.org/CPS">',
+          '  <dashif:Laurl>www.example.com</dashif:Laurl>',
+          '</test>',
+        ].join('\n')),
+      };
+      const actual = ContentProtection.getClearKeyLicenseUrl(input);
+      expect(actual).toBe('www.example.com');
+    });
+
+    it('dashif:Laurl without license url', () => {
+      const input = {
+        init: null,
+        keyId: null,
+        schemeUri: '',
+        node: strToXml([
+          '<test xmlns:dashif="https://dashif.org/CPS">',
+          '  <dashif:Laurl></dashif:Laurl>',
+          '</test>',
+        ].join('\n')),
+      };
+      const actual = ContentProtection.getClearKeyLicenseUrl(input);
+      expect(actual).toBe('');
+    });
+
+    it('no clearkey:Laurl or dashif:Laurl node', () => {
       const input = {
         init: null,
         keyId: null,
@@ -892,7 +952,37 @@ describe('DashParser ContentProtection', () => {
       expect(actual).toBe('www.example.com');
     });
 
-    it('no mspro', () => {
+    it('valid dashif:Laurl node', () => {
+      const input = {
+        init: null,
+        keyId: null,
+        schemeUri: '',
+        node: strToXml([
+          '<test xmlns:dashif="https://dashif.org/CPS">',
+          '  <dashif:Laurl>www.example.com</dashif:Laurl>',
+          '</test>',
+        ].join('\n')),
+      };
+      const actual = ContentProtection.getPlayReadyLicenseUrl(input);
+      expect(actual).toBe('www.example.com');
+    });
+
+    it('dashif:Laurl without license url', () => {
+      const input = {
+        init: null,
+        keyId: null,
+        schemeUri: '',
+        node: strToXml([
+          '<test xmlns:dashif="https://dashif.org/CPS">',
+          '  <dashif:Laurl></dashif:Laurl>',
+          '</test>',
+        ].join('\n')),
+      };
+      const actual = ContentProtection.getPlayReadyLicenseUrl(input);
+      expect(actual).toBe('');
+    });
+
+    it('no mspro or dashif:Laurl node', () => {
       const input = {
         init: null,
         keyId: null,