shaka-player 4.3.4 → 4.3.6

package/lib/polyfill/media_capabilities.js

@@ -9,7 +9,6 @@ goog.provide('shaka.polyfill.MediaCapabilities');
 goog.require('shaka.log');
 goog.require('shaka.media.Capabilities');
 goog.require('shaka.polyfill');
-goog.require('shaka.util.Error');
 goog.require('shaka.util.Platform');
 
 
@@ -120,6 +119,19 @@ shaka.polyfill.MediaCapabilities = class {
         if (shaka.util.Platform.isChromecast()) {
           isSupported =
               shaka.polyfill.MediaCapabilities.canCastDisplayType_(videoConfig);
+        } else if (shaka.util.Platform.isTizen()) {
+          let extendedType = videoConfig.contentType;
+          if (videoConfig.width && videoConfig.height) {
+            extendedType += `; width=${videoConfig.width}`;
+            extendedType += `; height=${videoConfig.height}`;
+          }
+          if (videoConfig.framerate) {
+            extendedType += `; framerate=${videoConfig.framerate}`;
+          }
+          if (videoConfig.bitrate) {
+            extendedType += `; bitrate=${videoConfig.bitrate}`;
+          }
+          isSupported = Capabilities.isTypeSupported(extendedType);
         } else {
           isSupported = Capabilities.isTypeSupported(videoConfig.contentType);
         }
@@ -230,13 +242,8 @@ shaka.polyfill.MediaCapabilities = class {
    * @private
    */
   static canCastDisplayType_(videoConfig) {
-    if (!(window.cast)) {
-      shaka.log.error('Expected cast namespace to be available!');
-      throw new shaka.util.Error(
-          shaka.util.Error.Severity.CRITICAL,
-          shaka.util.Error.Category.CAST,
-          shaka.util.Error.Code.CAST_API_UNAVAILABLE);
-    } else if (!(cast.__platform__ && cast.__platform__.canDisplayType)) {
+    if (!(window.cast &&
+        cast.__platform__ && cast.__platform__.canDisplayType)) {
       shaka.log.warning('Expected cast APIs to be available! Falling back to ' +
           'shaka.media.Capabilities.isTypeSupported() for type support.');
       return shaka.media.Capabilities.isTypeSupported(videoConfig.contentType);

package/lib/polyfill/mediasource.js

@@ -53,14 +53,19 @@ shaka.polyfill.MediaSource = class {
         // Offsetting the end of the removal range seems to help.
         // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=177884
         shaka.polyfill.MediaSource.patchRemovalRange_();
-      } else {
-        shaka.log.info('Patching Safari 13 MSE bugs.');
+      } else if (safariVersion <= 15) {
+        shaka.log.info('Patching Safari 13 & 14 & 15 MSE bugs.');
         // Safari 13 does not correctly implement abort() on SourceBuffer.
         // Calling abort() before appending a segment causes that segment to be
         // incomplete in the buffer.
         // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=165342
         shaka.polyfill.MediaSource.stubAbort_();
       }
+    } else if (shaka.util.Platform.isEdge()) {
+      shaka.log.info('Rejecting TS container.');
+      // TS content is broken on Edge in general.
+      // See https://github.com/shaka-project/shaka-player/issues/4955
+      shaka.polyfill.MediaSource.rejectContainer_('mp2t');
     } else if (shaka.util.Platform.isTizen2() ||
         shaka.util.Platform.isTizen3() ||
         shaka.util.Platform.isTizen4()) {
@@ -122,6 +127,23 @@ shaka.polyfill.MediaSource = class {
     };
   }
 
+  /**
+   * Patch |MediaSource.isTypeSupported| to always reject |container|. This is
+   * used when we know that we are on a platform that does not work well with
+   * a given container.
+   *
+   * @param {string} container
+   * @private
+   */
+  static rejectContainer_(container) {
+    const isTypeSupported = MediaSource.isTypeSupported;
+
+    MediaSource.isTypeSupported = (mimeType) => {
+      const actualContainer = shaka.util.MimeUtils.getContainerType(mimeType);
+      return actualContainer != container && isTypeSupported(mimeType);
+    };
+  }
+
   /**
    * Patch |MediaSource.isTypeSupported| to always reject |codec|. This is used
    * when we know that we are on a platform that does not work well with a given

package/lib/text/mp4_vtt_parser.js

@@ -97,6 +97,10 @@ shaka.text.Mp4VttParser = class {
    * @export
    */
   parseMedia(data, time) {
+    if (!data.length) {
+      return [];
+    }
+
     if (!this.timescale_) {
       // Missing timescale for VTT content. We should have seen the init
       // segment.

package/lib/text/text_engine.js

@@ -139,6 +139,7 @@ shaka.text.TextEngine = class {
     // into TextEngine and TextDisplayer.
     if (mimeType == shaka.util.MimeUtils.CEA608_CLOSED_CAPTION_MIMETYPE ||
         mimeType == shaka.util.MimeUtils.CEA708_CLOSED_CAPTION_MIMETYPE) {
+      this.parser_ = null;
       return;
     }
 

package/lib/text/ui_text_displayer.js

@@ -474,6 +474,7 @@ shaka.text.UITextDisplayer = class {
       wrapper = shaka.util.Dom.createHTMLElement('span');
       wrapper.classList.add('shaka-text-wrapper');
       wrapper.style.backgroundColor = cue.backgroundColor;
+      wrapper.style.lineHeight = 'normal';
       cueElement.appendChild(wrapper);
     }
 

package/lib/text/vtt_text_parser.js

@@ -391,8 +391,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')) {
@@ -450,7 +449,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;
         }
       }
@@ -461,7 +460,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);
     }
   }
 
@@ -755,7 +754,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

@@ -49,7 +49,7 @@ shaka.util.MimeUtils = class {
 
     if (Transmuxer.isSupported(fullMimeType, contentType)) {
       return shaka.media.Transmuxer.convertCodecs(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');
@@ -193,6 +193,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/periods.js

@@ -671,11 +671,11 @@ shaka.util.PeriodCombiner = class {
     // Also checks if the segmentIndex is still valid after the async
     // operations, to make sure we stop if the active stream has changed.
     if (outputStream.segmentIndex instanceof shaka.media.MetaSegmentIndex) {
-      for (let i = 0; i < streams.length; i++) {
+      for (let i = firstNewPeriodIndex; i < streams.length; i++) {
         const match = streams[i];
-        if (match.segmentIndex && i >= firstNewPeriodIndex) {
-          goog.asserts.assert(match.segmentIndex,
-              'stream should have a segmentIndex.');
+        goog.asserts.assert(match.segmentIndex,
+            'stream should have a segmentIndex.');
+        if (match.segmentIndex) {
           outputStream.segmentIndex.appendSegmentIndex(match.segmentIndex);
         }
       }
@@ -728,7 +728,7 @@ shaka.util.PeriodCombiner = class {
       // in advance.  concat() will add them to the output's MetaSegmentIndex.
     }
 
-    if (!outputStream.matchedStreams) {
+    if (!outputStream.matchedStreams || !outputStream.matchedStreams.length) {
       // This is not a stream we can build output from, but it may become part
       // of another output based on another period's stream.
       return null;

package/lib/util/stream_utils.js

@@ -712,26 +712,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 = {};
           }
         }
       }
@@ -818,7 +830,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',
@@ -829,7 +841,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.3 (latest)
+ - v4.3 (latest, also in use by the Cast Application Framework)
  - v4.2 (previous)
- - v3.3 (LTS until April 30, 2023)
- - v3.2 (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
 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": "4.3.4",
+  "version": "4.3.6",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

package/test/dash/dash_parser_live_unit.js

@@ -194,7 +194,8 @@ describe('DashParser Live', () => {
           template, {updateTime: updateTime, contents: basicLines.join('\n')});
 
       fakeNetEngine.setResponseText('dummy://foo', text);
-      Date.now = () => 0;
+      const baseTime = new Date(2015, 11, 30);
+      Date.now = () => baseTime.getTime();
       const manifest = await parser.start('dummy://foo', playerInterface);
 
       expect(manifest).toBeTruthy();
@@ -211,7 +212,7 @@ describe('DashParser Live', () => {
       // seconds long in all of these cases.  So 11 seconds after the
       // manifest was parsed, the first segment should have fallen out of
       // the availability window.
-      Date.now = () => 11 * 1000;
+      Date.now = () => baseTime.getTime() + (11 * 1000);
       await updateManifest();
       // The first reference should have been evicted.
       expect(stream.segmentIndex.find(0)).toBe(firstPosition + 1);

package/test/hls/hls_parser_unit.js

@@ -987,6 +987,118 @@ describe('HlsParser', () => {
     await testHlsParser(master, media, manifest);
   });
 
+  it('parses discontinuity tags', async () => {
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=2000000,CODECS="avc1"\n',
+      'video\n',
+    ].join('');
+
+    const media = [
+      '#EXTM3U\n',
+      '#EXT-X-VERSION:3\n',
+      '#EXT-X-TARGETDURATION:5\n',
+      '#EXT-X-MEDIA-SEQUENCE:0\n',
+      '#EXTINF:3,\n',
+      'clip0-video-0.ts\n',
+      '#EXTINF:1,\n',
+      'clip0-video-1.ts\n',
+      '#EXT-X-DISCONTINUITY\n',
+      '#EXTINF:2,\n',
+      'clip1-video-1.ts\n',
+      '#EXTINF:3,\n',
+      'clip1-video-2.ts\n',
+      '#EXT-X-DISCONTINUITY\n',
+      '#EXTINF:1,\n',
+      'media-clip2-video-0.ts\n',
+      '#EXTINF:1,\n',
+      'media-clip2-video-1.ts\n',
+      '#EXT-X-DISCONTINUITY\n',
+      '#EXTINF:4,\n',
+      'media-clip3-video-1.ts\n',
+      '#EXT-X-ENDLIST\n',
+    ].join('');
+
+    fakeNetEngine
+        .setResponseText('test:/master', master)
+        .setResponseText('test:/video', media);
+
+    const manifest = await parser.start('test:/master', playerInterface);
+    await manifest.variants[0].video.createSegmentIndex();
+
+    const segmentIndex = manifest.variants[0].video.segmentIndex;
+    const references = [];
+
+    for (let i = 0; i < 7; i++) {
+      references.push(segmentIndex.get(i));
+    }
+
+    expect(references[0].discontinuitySequence).toBe(0);
+    expect(references[1].discontinuitySequence).toBe(0);
+    expect(references[2].discontinuitySequence).toBe(1);
+    expect(references[3].discontinuitySequence).toBe(1);
+    expect(references[4].discontinuitySequence).toBe(2);
+    expect(references[5].discontinuitySequence).toBe(2);
+    expect(references[6].discontinuitySequence).toBe(3);
+  });
+
+  it('sets reference timetampOffset based on discontinuity start time',
+      async () => {
+        const master = [
+          '#EXTM3U\n',
+          '#EXT-X-STREAM-INF:BANDWIDTH=2000000,CODECS="avc1"\n',
+          'video\n',
+        ].join('');
+
+        const media = [
+          '#EXTM3U\n',
+          '#EXT-X-VERSION:3\n',
+          '#EXT-X-TARGETDURATION:5\n',
+          '#EXT-X-MEDIA-SEQUENCE:0\n',
+          '#EXTINF:3,\n',
+          'clip0-video-0.ts\n',
+          '#EXTINF:1,\n',
+          'clip0-video-1.ts\n',
+          '#EXT-X-DISCONTINUITY\n',
+          '#EXTINF:2,\n',
+          'clip1-video-1.ts\n',
+          '#EXTINF:3,\n',
+          'clip1-video-2.ts\n',
+          '#EXT-X-DISCONTINUITY\n',
+          '#EXTINF:1,\n',
+          'media-clip2-video-0.ts\n',
+          '#EXTINF:1,\n',
+          'media-clip2-video-1.ts\n',
+          '#EXT-X-DISCONTINUITY\n',
+          '#EXTINF:4,\n',
+          'media-clip3-video-1.ts\n',
+          '#EXT-X-ENDLIST\n',
+        ].join('');
+
+        fakeNetEngine
+            .setResponseText('test:/master', master)
+            .setResponseText('test:/video', media);
+
+        const manifest = await parser.start('test:/master', playerInterface);
+        await manifest.variants[0].video.createSegmentIndex();
+
+        const segmentIndex = manifest.variants[0].video.segmentIndex;
+        const references = [];
+
+        for (let i = 0; i < 7; i++) {
+          references.push(segmentIndex.get(i));
+        }
+
+        expect(references[0].timestampOffset).toBe(0);
+        expect(references[1].timestampOffset).toBe(0);
+        expect(references[2].timestampOffset).toBe(4);
+        expect(references[3].timestampOffset).toBe(4);
+        expect(references[4].timestampOffset).toBe(9);
+        expect(references[5].timestampOffset).toBe(9);
+        expect(references[6].timestampOffset).toBe(11);
+      },
+  );
+
   it('parses characteristics from audio tags', async () => {
     const master = [
       '#EXTM3U\n',
@@ -2132,6 +2244,50 @@ describe('HlsParser', () => {
     expect(actual).toEqual(manifest);
   });
 
+  it('parses manifest with MP4+WEBVTT streams', async () => {
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="sub1",LANGUAGE="eng",',
+      'CODECS="wvtt",URI="text"\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1",',
+      'RESOLUTION=960x540,FRAME-RATE=60,SUBTITLES="sub1"\n',
+      'video\n',
+    ].join('');
+
+    const media = [
+      '#EXTM3U\n',
+      '#EXT-X-PLAYLIST-TYPE:VOD\n',
+      '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+      '#EXTINF:5,\n',
+      '#EXT-X-BYTERANGE:121090@616\n',
+      'main.mp4',
+    ].join('');
+
+    const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+      manifest.anyTimeline();
+      manifest.addPartialVariant((variant) => {
+        variant.addPartialStream(ContentType.VIDEO);
+      });
+      manifest.addPartialTextStream((stream) => {
+        stream.language = 'en';
+        stream.mime('application/mp4', 'wvtt');
+      });
+      manifest.sequenceMode = true;
+    });
+
+    fakeNetEngine
+        .setResponseText('test:/master', master)
+        .setResponseText('test:/audio', media)
+        .setResponseText('test:/video', media)
+        .setResponseText('test:/text', media)
+        .setResponseValue('test:/init.mp4', initSegmentData)
+        .setResponseValue('test:/main.mp4', segmentData);
+
+    const actual = await parser.start('test:/master', playerInterface);
+    await loadAllStreamsFor(actual);
+    expect(actual).toEqual(manifest);
+  });
+
   it('detects VTT streams by codec', async () => {
     const master = [
       '#EXTM3U\n',

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

@@ -3412,7 +3412,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')