shaka-player 3.2.19 → 3.2.21

package/lib/text/vtt_text_parser.js

@@ -369,8 +369,7 @@ shaka.text.VttTextParser = class {
     end += timeOffset;
 
     // Get the payload.
-    const payload = VttTextParser.htmlUnescape_(
-        text.slice(1).join('\n').trim());
+    const payload = text.slice(1).join('\n').trim();
 
     let cue = null;
     if (styles.has('global')) {
@@ -427,7 +426,7 @@ shaka.text.VttTextParser = class {
         const childNode = childNodes[0];
         if (childNode.nodeType == Node.TEXT_NODE ||
             childNode.nodeType == Node.CDATA_SECTION_NODE) {
-          rootCue.payload = payload;
+          rootCue.payload = VttTextParser.htmlUnescape_(payload);
           return;
         }
       }
@@ -438,7 +437,7 @@ shaka.text.VttTextParser = class {
       rootCue.nestedCues = cues;
     } else {
       shaka.log.warning('The cue\'s markup could not be parsed: ', payload);
-      rootCue.payload = payload;
+      rootCue.payload = VttTextParser.htmlUnescape_(payload);
     }
   }
 
@@ -682,7 +681,7 @@ shaka.text.VttTextParser = class {
         }
         if (text.length > 0) {
           const textCue = nestedCue.clone();
-          textCue.payload = text;
+          textCue.payload = VttTextParser.htmlUnescape_(text);
           cues.push(textCue);
         }
         isFirst = false;

package/lib/util/manifest_parser_utils.js

@@ -185,8 +185,7 @@ shaka.util.ManifestParserUtils.AUDIO_CODEC_REGEXPS_ = [
   /^mp4a/,
   /^[ae]c-3$/,
   /^ac-4$/,
-  /^dts[cx]$/, // DTS Surround Sound
-  /^[du]dts$/, // DTS Surround Sound
+  /^dts[cex]$/, // DTS Digital Surround (dtsc), DTS Express (dtse), DTS:X (dtsx)
 ];
 
 

package/lib/util/mime_utils.js

@@ -50,7 +50,7 @@ shaka.util.MimeUtils = class {
         return shaka.media.Transmuxer.convertTsCodecs(
             contentType, fullMimeType);
       }
-    } else if (contentType == ContentType.AUDIO) {
+    } else if (mimeType != 'video/mp2t' && contentType == ContentType.AUDIO) {
       // video/mp2t is the correct mime type for TS audio, so only replace the
       // word "video" with "audio" for non-TS audio content.
       return fullMimeType.replace('video', 'audio');
@@ -194,6 +194,17 @@ shaka.util.MimeUtils = class {
     return value;
   }
 
+  /**
+   * Checks if the given MIME type is HLS MIME type.
+   *
+   * @param {string} mimeType
+   * @return {boolean}
+   */
+  static isHlsType(mimeType) {
+    return mimeType === 'application/x-mpegurl' ||
+        mimeType === 'application/vnd.apple.mpegurl';
+  }
+
   /**
    * Get the base and profile of a codec string. Where [0] will be the codec
    * base and [1] will be the profile.

package/lib/util/stream_utils.js

@@ -703,26 +703,38 @@ shaka.util.StreamUtils = class {
         }
 
         if (audio) {
-          if (!keySystemConfig.audio) {
+          // See: https://github.com/shaka-project/shaka-player/issues/4659
+          if (info.audioRobustness != '') {
+            if (!keySystemConfig.audio) {
+              // KeySystemTrackConfiguration
+              keySystemConfig.audio = {
+                robustness: info.audioRobustness,
+              };
+            } else {
+              keySystemConfig.audio.robustness =
+                  keySystemConfig.audio.robustness || info.audioRobustness;
+            }
+          } else if (!keySystemConfig.audio) {
             // KeySystemTrackConfiguration
-            keySystemConfig.audio = {
-              robustness: info.audioRobustness,
-            };
-          } else {
-            keySystemConfig.audio.robustness =
-                keySystemConfig.audio.robustness || info.audioRobustness;
+            keySystemConfig.audio = {};
           }
         }
 
         if (video) {
-          if (!keySystemConfig.video) {
+          // See: https://github.com/shaka-project/shaka-player/issues/4659
+          if (info.videoRobustness != '') {
+            if (!keySystemConfig.video) {
+              // KeySystemTrackConfiguration
+              keySystemConfig.video = {
+                robustness: info.videoRobustness,
+              };
+            } else {
+              keySystemConfig.video.robustness =
+                  keySystemConfig.video.robustness || info.videoRobustness;
+            }
+          } else if (!keySystemConfig.video) {
             // KeySystemTrackConfiguration
-            keySystemConfig.video = {
-              robustness: info.videoRobustness,
-            };
-          } else {
-            keySystemConfig.video.robustness =
-                keySystemConfig.video.robustness || info.videoRobustness;
+            keySystemConfig.video = {};
           }
         }
       }
@@ -809,7 +821,7 @@ shaka.util.StreamUtils = class {
       const video = variant.video;
       if (audio && currentVariant && currentVariant.audio) {
         if (!StreamUtils.areStreamsCompatible_(audio, currentVariant.audio)) {
-          shaka.log.debug('Droping variant - not compatible with active audio',
+          shaka.log.debug('Dropping variant - not compatible with active audio',
               'active audio',
               StreamUtils.getStreamSummaryString_(currentVariant.audio),
               'variant.audio',
@@ -820,7 +832,7 @@ shaka.util.StreamUtils = class {
 
       if (video && currentVariant && currentVariant.video) {
         if (!StreamUtils.areStreamsCompatible_(video, currentVariant.video)) {
-          shaka.log.debug('Droping variant - not compatible with active video',
+          shaka.log.debug('Dropping variant - not compatible with active video',
               'active video',
               StreamUtils.getStreamSummaryString_(currentVariant.video),
               'variant.video',

package/maintained-branches.md

@@ -2,10 +2,9 @@
 
 We are currently maintaining the following branches of Shaka Player:
 
- - v4.1 (latest)
- - v4.0 (previous)
- - v3.3 (LTS until April 30, 2023)
- - v3.2 (in use by the Cast Application Framework)
+ - v4.3 (latest, also in use by the Cast Application Framework)
+ - v4.2 (previous)
+ - No active LTS branches at this time
 
 Other branches are no longer receiving bug fixes, and we recommend you upgrade
 to a maintained branch.  For details on upgrading, please see our

package/package.json

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

package/test/media/content_workarounds_unit.js

@@ -0,0 +1,43 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+describe('ContentWorkarounds', () => {
+  const encryptionBoxes = {
+    'encv': ['hev1', 'hvc1', 'avc1', 'avc3'],
+    'enca': ['ac-3', 'ec-3', 'mp4a'],
+  };
+  for (const encryptionBox of Object.keys(encryptionBoxes)) {
+    for (const box of encryptionBoxes[encryptionBox]) {
+      it(`adds ${encryptionBox} box for ${box}`, () => {
+        const boxType = [];
+        for (const char of box) {
+          boxType.push(char.charCodeAt(0));
+        }
+        const unencrypted = new Uint8Array([
+          0x00, 0x00, 0x00, 0x20, // size
+          0x73, 0x74, 0x73, 0x64, // stsd
+          0x01,                   // version
+          0x12, 0x34, 0x56,       // flags
+          0x00, 0x00, 0x00, 0x01, // count
+          0x00, 0x00, 0x00, 0x10, // size
+          ...boxType,             // box type
+          0x01,                   // version
+          0x12, 0x34, 0x56,       // flags
+          0x00, 0x11, 0x22, 0x33, // payload
+        ]);
+
+        const faked =
+            shaka.media.ContentWorkarounds.fakeEncryption(unencrypted);
+        const spy = jasmine.createSpy('boxCallback');
+        new shaka.util.Mp4Parser()
+            .fullBox('stsd', shaka.util.Mp4Parser.sampleDescription)
+            .box(encryptionBox, /** @type {!Function} */ (spy))
+            .parse(faked);
+        expect(spy).toHaveBeenCalled();
+      });
+    }
+  }
+});

package/test/media/drm_engine_integration.js

@@ -74,19 +74,6 @@ describe('DrmEngine', () => {
     onEventSpy = jasmine.createSpy('onEvent');
 
     networkingEngine = new shaka.net.NetworkingEngine();
-    networkingEngine.registerRequestFilter((type, request) => {
-      if (type != shaka.net.NetworkingEngine.RequestType.LICENSE) {
-        return;
-      }
-
-      request.headers['X-AxDRM-Message'] = [
-        'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5X2lk',
-        'IjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc2FnZSI6e',
-        'yJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIjoiNmU1YTFkMj',
-        'YtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflOPv9qHnu3ZWJNZ12j',
-        'gkqTabmwXbDWk_47tLNE',
-      ].join('');
-    });
 
     const playerInterface = {
       netEngine: networkingEngine,
@@ -99,22 +86,22 @@ describe('DrmEngine', () => {
     drmEngine = new shaka.media.DrmEngine(playerInterface);
     const config = shaka.util.PlayerConfiguration.createDefault().drm;
     config.servers['com.widevine.alpha'] =
-        'https://drm-widevine-licensing.axtest.net/AcquireLicense';
+        'https://cwip-shaka-proxy.appspot.com/specific_key?blodJidXR9eARuql0dNLWg=GX8m9XLIZNIzizrl0RTqnA';
     config.servers['com.microsoft.playready'] =
-        'https://drm-playready-licensing.axtest.net/AcquireLicense';
+        'https://test.playready.microsoft.com/service/rightsmanager.asmx?cfg=(kid:6e5a1d26-2757-47d7-8046-eaa5d1d34b5a,contentkey:GX8m9XLIZNIzizrl0RTqnA==,sl:150)';
     drmEngine.configure(config);
 
     manifest = shaka.test.ManifestGenerator.generate((manifest) => {
       manifest.addVariant(0, (variant) => {
         variant.addVideo(1, (stream) => {
           stream.encrypted = true;
-          stream.addDrmInfo('com.widevine.alpha');
           stream.addDrmInfo('com.microsoft.playready');
+          stream.addDrmInfo('com.widevine.alpha');
         });
         variant.addAudio(2, (stream) => {
           stream.encrypted = true;
-          stream.addDrmInfo('com.widevine.alpha');
           stream.addDrmInfo('com.microsoft.playready');
+          stream.addDrmInfo('com.widevine.alpha');
         });
       });
     });

package/test/media/streaming_engine_unit.js

@@ -3275,7 +3275,12 @@ describe('StreamingEngine', () => {
       netEngine.request.and.callFake((requestType, request) => {
         const buffer = new ArrayBuffer(0);
         /** @type {shaka.extern.Response} */
-        const response = {uri: request.uris[0], data: buffer, headers: {}};
+        const response = {
+          uri: request.uris[0],
+          originalUri: request.uris[0],
+          data: buffer,
+          headers: {},
+        };
         return shaka.util.AbortableOperation.completed(response);
       });
 

package/test/net/networking_engine_unit.js

@@ -1226,6 +1226,11 @@ describe('NetworkingEngine', /** @suppress {accessControls} */ () => {
 
   /** @return {shaka.extern.Response} */
   function createResponse() {
-    return {uri: '', data: new ArrayBuffer(5), headers: {}};
+    return {
+      uri: '',
+      originalUri: '',
+      data: new ArrayBuffer(5),
+      headers: {},
+    };
   }
 });  // describe('NetworkingEngine')

package/test/player_integration.js

@@ -336,6 +336,45 @@ describe('Player', () => {
       player.setTextTrackVisibility(true);
       expect(getTracksActive()).toEqual([false, true]);
     });
+
+    // https://github.com/shaka-project/shaka-player/issues/4821
+    it('loads a single text stream', async () => {
+      player.configure({preferredTextLanguage: 'en'});
+      await player.load('test:sintel_no_text_compiled');
+
+      // Add preferred language text track.
+      const locationUri = new goog.Uri(location.href);
+      const partialUri = new goog.Uri('/base/test/test/assets/text-clip.vtt');
+      const absoluteUri = locationUri.resolve(partialUri);
+      await player.addTextTrackAsync(
+          absoluteUri.toString(), 'en', 'subtitles', 'text/vtt');
+
+      // Add alternate language text track.
+      // Two text tracks with same timings but different text
+      // are necessary for test.
+      const partialUri2 =
+      new goog.Uri('/base/test/test/assets/text-clip-alt.vtt');
+      const absoluteUri2 = locationUri.resolve(partialUri2);
+      await player.addTextTrackAsync(
+          absoluteUri2.toString(), 'fr', 'subtitles', 'text/vtt');
+
+      const textTracks = player.getTextTracks();
+      expect(textTracks.length).toBe(2);
+      expect(textTracks[0].language).toBe('en');
+      expect(textTracks[1].language).toBe('fr');
+
+      // Enable text visibilty and immediately change language.
+      // Only one set of cues should be active.
+      // Cues should be of the selected language track.
+      player.setTextTrackVisibility(true);
+      player.selectTextLanguage('fr');
+      video.currentTime = 5;
+      video.play();
+      await waiter.waitForMovementOrFailOnTimeout(video, 10);
+
+      expect(video.textTracks[0].activeCues.length).toBe(1);
+      expect(player.getTextTracks()[1].active).toBe(true);
+    });
   });  // describe('setTextTrackVisibility')
 
   describe('plays', () => {

package/test/player_unit.js

@@ -370,6 +370,60 @@ describe('Player', () => {
         expect(streamingEngine.unloadTextStream).not.toHaveBeenCalled();
       });
     });
+
+    describe('when config.streaming.preferNativeHls is set to true', () => {
+      beforeEach(() => {
+        shaka.media.ManifestParser.registerParserByMime(
+            'application/x-mpegurl',
+            () => new shaka.test.FakeManifestParser(manifest));
+      });
+
+      afterEach(() => {
+        shaka.media.ManifestParser.unregisterParserByMime(
+            'application/x-mpegurl');
+        video.canPlayType.calls.reset();
+      });
+
+      it('only applies to HLS streams', async () => {
+        video.canPlayType.and.returnValue('maybe');
+        spyOn(shaka.util.Platform, 'anyMediaElement').and.returnValue(video);
+        spyOn(shaka.util.Platform, 'supportsMediaSource').and.returnValue(true);
+        spyOn(shaka.util.Platform, 'isApple').and.returnValue(false);
+        // Make sure player.load() resolves for src=
+        spyOn(shaka.util.MediaReadyState, 'waitForReadyState').and.callFake(
+            (mediaElement, readyState, eventManager, callback) => {
+              callback();
+            });
+
+        player.configure({
+          streaming: {
+            preferNativeHls: true,
+            useNativeHlsOnSafari: false,
+          },
+        });
+
+        await player.load(fakeManifestUri, undefined, 'application/x-mpegurl');
+
+        expect(player.getLoadMode()).toBe(shaka.Player.LoadMode.SRC_EQUALS);
+      });
+
+      it('does not apply to non-HLS streams', async () => {
+        video.canPlayType.and.returnValue('maybe');
+        spyOn(shaka.util.Platform, 'supportsMediaSource').and.returnValue(true);
+        spyOn(shaka.util.Platform, 'isApple').and.returnValue(false);
+
+        player.configure({
+          streaming: {
+            preferNativeHls: true,
+            useNativeHlsOnSafari: false,
+          },
+        });
+
+        await player.load(fakeManifestUri, 0, fakeMimeType);
+
+        expect(player.getLoadMode()).toBe(shaka.Player.LoadMode.MEDIA_SOURCE);
+      });
+    });
   });  // describe('load/unload')
 
   describe('getConfiguration', () => {

package/test/polyfill/media_capabilities_unit.js

@@ -5,7 +5,6 @@
  */
 
 describe('MediaCapabilities', () => {
-  const Util = shaka.test.Util;
   const originalCast = window['cast'];
   const originalVendor = navigator.vendor;
   const originalUserAgent = navigator.userAgent;
@@ -68,7 +67,6 @@ describe('MediaCapabilities', () => {
         width: 512,
       },
     };
-    shaka.polyfill.MediaCapabilities.memoizedMediaKeySystemAccessRequests_ = {};
 
     mockCanDisplayType = jasmine.createSpy('canDisplayType');
     mockCanDisplayType.and.returnValue(false);
@@ -168,30 +166,29 @@ describe('MediaCapabilities', () => {
           expect(result.keySystemAccess).toEqual(mockResult);
         });
 
-    it('throws when the cast namespace is not available', async () => {
-      // Temporarily remove window.cast to trigger error. It's restored after
-      // every test.
-      delete window['cast'];
+    it('falls back to isTypeSupported() when cast namespace is not available',
+        async () => {
+          // Temporarily remove window.cast to trigger error. It's restored
+          // after every test.
+          delete window['cast'];
 
-      const isChromecastSpy =
-          spyOn(shaka['util']['Platform'],
-              'isChromecast').and.returnValue(true);
-      const expected = Util.jasmineError(new shaka.util.Error(
-          shaka.util.Error.Severity.CRITICAL,
-          shaka.util.Error.Category.CAST,
-          shaka.util.Error.Code.CAST_API_UNAVAILABLE));
-      const isTypeSupportedSpy =
-          spyOn(window['MediaSource'], 'isTypeSupported').and.returnValue(true);
+          const isChromecastSpy =
+              spyOn(shaka['util']['Platform'],
+                  'isChromecast').and.returnValue(true);
+          const isTypeSupportedSpy =
+              spyOn(window['MediaSource'], 'isTypeSupported')
+                  .and.returnValue(true);
 
-      shaka.polyfill.MediaCapabilities.install();
-      await expectAsync(
-          navigator.mediaCapabilities.decodingInfo(mockDecodingConfig))
-          .toBeRejectedWith(expected);
+          shaka.polyfill.MediaCapabilities.install();
+          await navigator.mediaCapabilities.decodingInfo(mockDecodingConfig);
 
-      expect(isTypeSupportedSpy).not.toHaveBeenCalled();
-      // 1 (during install()) + 1 (for video config check).
-      expect(isChromecastSpy).toHaveBeenCalledTimes(2);
-    });
+          expect(mockCanDisplayType).not.toHaveBeenCalled();
+          // 1 (during install()) + 1 (for video config check).
+          expect(isChromecastSpy).toHaveBeenCalledTimes(2);
+          // 1 (fallback in canCastDisplayType()) +
+          // 1 (mockDecodingConfig.audio).
+          expect(isTypeSupportedSpy).toHaveBeenCalledTimes(2);
+        });
 
     it('falls back to isTypeSupported() when canDisplayType() missing',
         async () => {

package/test/test/assets/text-clip-alt.vtt

@@ -0,0 +1,63 @@
+WEBVTT
+
+00:04.000 --> 00:07.300
+Journal de bord du capitaine.
+Date stellaire 41636.9.
+
+00:07.500 --> 00:11.800
+Comme nous le craignions, l'épave
+du cargo Odin de la Fédération,
+
+00:12.100 --> 00:16.400
+percuté par un astéroïde,
+ne révèle aucun signe de vie.
+
+00:16.700 --> 00:19.000
+Mais trois nacelles
+de sauvetage manquaient,
+
+00:19.300 --> 00:21.900
+laissant supposer
+qu'il y aurait des survivants.
+
+00:22.700 --> 00:27.700
+- Mise sur orbite Angel One, paré.
+- Quel genre d'endroit, Data ?
+
+00:28.200 --> 00:31.600
+Planète de Classe-M.
+Faune et flore à base de carbone.
+
+00:31.900 --> 00:34.300
+Population éparse
+et forme de vie intelligente.
+
+00:34.600 --> 00:38.400
+Développement technique équivalent
+au milieu du 20ème siècle terrien.
+
+00:38.800 --> 00:41.000
+C'est presque un retour aux sources.
+
+00:41.300 --> 00:43.600
+Si jamais des survivants
+ont pu aller si loin,
+
+00:43.800 --> 00:49.000
+c'était la planète la plus proche.
+La distance qui nous a pris 2 jours
+
+00:49.500 --> 00:52.400
+aurait pris 5 mois aux nacelles
+de sauvetage du Odin.
+
+00:52.600 --> 00:54.700
+Cinq mois, six jours, onze heures,
+deux min...
+
+00:54.900 --> 00:58.400
+- Merci, Data.
+- ..et 57 secondes.
+
+00:58.600 --> 01:01.300
+Signal audio provenant d'Angel One.

package/test/test/util/fake_drm_engine.js

@@ -74,6 +74,9 @@ shaka.test.FakeDrmEngine = class {
     /** @type {!jasmine.Spy} */
     this.supportsVariant = jasmine.createSpy('supportsVariant');
     this.supportsVariant.and.returnValue(true);
+
+    /** @type {!jasmine.Spy} */
+    this.setSrcEquals = jasmine.createSpy('setSrcEquals');
   }
 
   /**

package/test/test/util/simple_fakes.js

@@ -225,6 +225,9 @@ shaka.test.FakeVideo = class {
 
     /** @type {!jasmine.Spy} */
     this.dispatchEvent = jasmine.createSpy('dispatchEvent');
+
+    /** @type {!jasmine.Spy} */
+    this.canPlayType = jasmine.createSpy('canPlayType');
   }
 };
 

package/test/test/util/test_scheme.js

@@ -431,6 +431,7 @@ const widevineDrmServers = {
 
 /** @type {AVMetadataType} */
 const axinomMultiDrmVideoSegment = {
+  // Taken from Axinom's v6 test vector.
   initSegmentUri: '/base/test/test/assets/multidrm-video-init.mp4',
   mdhdOffset: 0x1d1,
   segmentUri: '/base/test/test/assets/multidrm-video-segment.mp4',
@@ -445,6 +446,7 @@ const axinomMultiDrmVideoSegment = {
 
 /** @type {AVMetadataType} */
 const axinomMultiDrmAudioSegment = {
+  // Taken from Axinom's v6 test vector.
   initSegmentUri: '/base/test/test/assets/multidrm-audio-init.mp4',
   mdhdOffset: 0x192,
   segmentUri: '/base/test/test/assets/multidrm-audio-segment.mp4',
@@ -459,20 +461,15 @@ const axinomMultiDrmAudioSegment = {
 
 /** @type {!Object.<string, string>} */
 const axinomDrmServers = {
+  // NOTE: These are not Axinom's actual servers.  These are test servers for
+  // Widevine and PlayReady that let us specify the known key IDs and keys for
+  // Axinom's v6 test vectors.  Axinom's own servers started returning 403
+  // errors for these older test vectors, and we were forced to switch to
+  // something stable and independent.
   'com.widevine.alpha':
-      'https://drm-widevine-licensing.axtest.net/AcquireLicense',
+      'https://cwip-shaka-proxy.appspot.com/specific_key?blodJidXR9eARuql0dNLWg=GX8m9XLIZNIzizrl0RTqnA',
   'com.microsoft.playready':
-      'https://drm-playready-licensing.axtest.net/AcquireLicense',
-};
-
-/** @type {!Object.<string, string>} */
-const axinomDrmHeaders = {
-  'X-AxDRM-Message':
-      'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ2ZXJzaW9uIjoxLCJjb21fa2V5' +
-      'X2lkIjoiNjllNTQwODgtZTllMC00NTMwLThjMWEtMWViNmRjZDBkMTRlIiwibWVzc' +
-      '2FnZSI6eyJ0eXBlIjoiZW50aXRsZW1lbnRfbWVzc2FnZSIsImtleXMiOlt7ImlkIj' +
-      'oiNmU1YTFkMjYtMjc1Ny00N2Q3LTgwNDYtZWFhNWQxZDM0YjVhIn1dfX0.yF7PflO' +
-      'Pv9qHnu3ZWJNZ12jgkqTabmwXbDWk_47tLNE',
+      'https://test.playready.microsoft.com/service/rightsmanager.asmx?cfg=(kid:6e5a1d26-2757-47d7-8046-eaa5d1d34b5a,contentkey:GX8m9XLIZNIzizrl0RTqnA==,sl:150)',
 };
 
 /** @type {TextMetadataType} */
@@ -568,7 +565,6 @@ shaka.test.TestScheme.DATA = {
     audio: axinomMultiDrmAudioSegment,
     text: vttSegment,
     licenseServers: axinomDrmServers,
-    licenseRequestHeaders: axinomDrmHeaders,
     duration: 30,
   },
 
@@ -580,7 +576,6 @@ shaka.test.TestScheme.DATA = {
       initData: undefined,
     }),
     licenseServers: axinomDrmServers,
-    licenseRequestHeaders: axinomDrmHeaders,
     duration: 30,
   },
 

package/test/text/mp4_vtt_parser_unit.js

@@ -170,6 +170,14 @@ describe('Mp4VttParser', () => {
     verifyHelper(cues, result);
   });
 
+  it('handles empty media segments', () => {
+    const parser = new shaka.text.Mp4VttParser();
+    parser.parseInit(vttInitSegment);
+    const time = {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0};
+    const result = parser.parseMedia(new Uint8Array(0), time);
+    verifyHelper([], result);
+  });
+
   it('rejects init segment with no vtt', () => {
     const error = shaka.test.Util.jasmineError(new shaka.util.Error(
         shaka.util.Error.Severity.CRITICAL,

package/test/text/vtt_text_parser_unit.js

@@ -776,11 +776,35 @@ describe('VttTextParser', () => {
   it('support escaped html payload', () => {
     verifyHelper(
         [
-          {startTime: 20.1, endTime: 40.505, payload: '"Test & 1"\u{a0}'},
+          {
+            startTime: 20.1,
+            endTime: 40.505,
+            payload: '"Test & 1"\u{a0}',
+          },
+          {
+            startTime: 41,
+            endTime: 42,
+            payload: '',
+            nestedCues: [
+              {
+                startTime: 41,
+                endTime: 42,
+                payload: 'Test',
+                fontStyle: Cue.fontStyle.ITALIC,
+              },
+              {
+                startTime: 41,
+                endTime: 42,
+                payload: '&',
+              },
+            ],
+          },
         ],
         'WEBVTT\n\n' +
         '00:00:20.100 --> 00:00:40.505\n' +
-        '"Test & 1" ',
+        '"Test & 1" \n\n' +
+        '00:00:41.000 --> 00:00:42.000\n' +
+        '<i>Test</i>&amp;',
         {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });