shaka-player 3.0.11 → 3.0.15

package/lib/text/mp4_ttml_parser.js

@@ -88,6 +88,9 @@ shaka.text.Mp4TtmlParser = class {
 
 shaka.text.TextEngine.registerParser(
     'application/mp4; codecs="stpp"', () => new shaka.text.Mp4TtmlParser());
+shaka.text.TextEngine.registerParser(
+    'application/mp4; codecs="stpp.ttml"',
+    () => new shaka.text.Mp4TtmlParser());
 shaka.text.TextEngine.registerParser(
     'application/mp4; codecs="stpp.ttml.im1t"',
     () => new shaka.text.Mp4TtmlParser());

package/lib/text/ttml_text_parser.js

@@ -277,6 +277,11 @@ shaka.text.TtmlTextParser = class {
         !cueElement.hasAttribute('begin') &&
         !cueElement.hasAttribute('end');
 
+    if (cueElement.nodeType == Node.COMMENT_NODE) {
+      // The comments do not contain information that interests us here.
+      return null;
+    }
+
     if (
       cueElement.nodeType != Node.ELEMENT_NODE ||
       /* Disregards empty elements without time attributes nor content

package/lib/text/ui_text_displayer.js

@@ -11,6 +11,7 @@ goog.require('goog.asserts');
 goog.require('shaka.text.Cue');
 goog.require('shaka.text.CueRegion');
 goog.require('shaka.util.Dom');
+goog.require('shaka.util.EventManager');
 goog.require('shaka.util.Timer');
 
 
@@ -70,6 +71,22 @@ shaka.text.UITextDisplayer = class {
 
     /** private {Map.<!shaka.extern.Cue, !HTMLElement>} */
     this.currentCuesMap_ = new Map();
+
+    /** @private {shaka.util.EventManager} */
+    this.eventManager_ = new shaka.util.EventManager();
+
+    this.eventManager_.listen(document, 'fullscreenchange', () => {
+      this.updateCaptions_(/* forceUpdate= */ true);
+    });
+
+    /** @private {ResizeObserver} */
+    this.resizeObserver_ = null;
+    if ('ResizeObserver' in window) {
+      this.resizeObserver_ = new ResizeObserver(() => {
+        this.updateCaptions_(/* forceUpdate= */ true);
+      });
+      this.resizeObserver_.observe(this.textContainer_);
+    }
   }
 
 
@@ -114,6 +131,17 @@ shaka.text.UITextDisplayer = class {
     }
 
     this.currentCuesMap_.clear();
+
+    // Tear-down the event manager to ensure messages stop moving around.
+    if (this.eventManager_) {
+      this.eventManager_.release();
+      this.eventManager_ = null;
+    }
+
+    if (this.resizeObserver_) {
+      this.resizeObserver_.disconnect();
+      this.resizeObserver_ = null;
+    }
   }
 
 
@@ -128,9 +156,14 @@ shaka.text.UITextDisplayer = class {
     }
 
     // Remove the cues out of the time range.
+    const oldNumCues = this.cues_.length;
     this.cues_ = this.cues_.filter(
         (cue) => cue.startTime < start || cue.endTime >= end);
-    this.updateCaptions_();
+    // If anything was actually removed in this process, force the captions to
+    // update. This makes sure that the currently-displayed cues will stop
+    // displaying if removed (say, due to the user changing languages).
+    const forceUpdate = oldNumCues > this.cues_.length;
+    this.updateCaptions_(forceUpdate);
 
     return true;
   }
@@ -154,9 +187,10 @@ shaka.text.UITextDisplayer = class {
 
   /**
    * Display the current captions.
+   * @param {boolean=} forceUpdate
    * @private
    */
-  updateCaptions_() {
+  updateCaptions_(forceUpdate = false) {
     const currentTime = this.video_.currentTime;
 
     // Return true if the cue should be displayed at the current time point.
@@ -168,7 +202,7 @@ shaka.text.UITextDisplayer = class {
     // For each cue in the current cues map, if the cue's end time has passed,
     // remove the entry from the map, and remove the captions from the page.
     for (const cue of this.currentCuesMap_.keys()) {
-      if (!shouldCueBeDisplayed(cue)) {
+      if (!shouldCueBeDisplayed(cue) || forceUpdate) {
         const captions = this.currentCuesMap_.get(cue);
         this.textContainer_.removeChild(captions);
         this.currentCuesMap_.delete(cue);

package/lib/util/error.js

@@ -22,10 +22,7 @@ goog.provide('shaka.util.Error');
  * <ul>
  *   <li><a href="https://developer.mozilla.org/en-US/docs/Web/API/MediaError">MediaError</a>
  *   <li><a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Status">HTTP Codes</a>
- *   <li>
- *     <a href="https://docs.microsoft.com/en-us/windows/win32/wmdm/error-codes">PlayReady errors</a>
- *     or
- *     <a href="https://github.com/tpn/winsdk-10/blob/master/Include/10.0.16299.0/winrt/Windows.Media.Protection.PlayReadyErrors.h">more PlayReady errors</a>
+ *   <li><a href="https://hresult.info">Edge/PlayReady errors</a>
  * </ul>
  *
  * @export

package/lib/util/fake_event.js

@@ -6,6 +6,8 @@
 
 goog.provide('shaka.util.FakeEvent');
 
+goog.require('goog.asserts');
+
 
 /**
  * @summary Create an Event work-alike object based on the provided dictionary.
@@ -16,18 +18,62 @@ goog.provide('shaka.util.FakeEvent');
  */
 shaka.util.FakeEvent = class {
   /**
-   * @param {string} type
-   * @param {Object=} dict
+   * @param {!Event} event
+   * @return {!shaka.util.FakeEvent}
    */
-  constructor(type, dict = {}) {
-    // Take properties from dict if present.
-    for (const key in dict) {
-      Object.defineProperty(this, key, {
-        value: dict[key],
+  static fromRealEvent(event) {
+    const fakeEvent = new shaka.util.FakeEvent(event.type);
+    for (const key in event) {
+      Object.defineProperty(fakeEvent, key, {
+        value: event[key],
         writable: true,
         enumerable: true,
       });
     }
+    return fakeEvent;
+  }
+
+  /**
+   * Allows us to tell the compiler that the dictionary "map" is actually a
+   * generic object, for backwards compatibility.
+   * @param {!Map.<string, Object>} dict
+   * @return {!Object}
+   * @suppress {invalidCasts}
+   * @private
+   */
+  static recastDictAsObject_(dict) {
+    goog.asserts.assert(!(dict instanceof Map), 'dict should not be a map');
+    return /** @type {!Object} */ (dict);
+  }
+
+  /**
+   * @param {string} type
+   * @param {Map.<string, Object>=} dict
+   */
+  constructor(type, dict) {
+    if (dict) {
+      if (dict instanceof Map) {
+        // Take properties from dict if present.
+        for (const key of dict.keys()) {
+          Object.defineProperty(this, key, {
+            value: dict.get(key),
+            writable: true,
+            enumerable: true,
+          });
+        }
+      } else {
+        // For backwards compatibility with external apps that may make use of
+        // this public constructor, this should still accept generic objects.
+        const obj = shaka.util.FakeEvent.recastDictAsObject_(dict);
+        for (const key in obj) {
+          Object.defineProperty(this, key, {
+            value: obj[key],
+            writable: true,
+            enumerable: true,
+          });
+        }
+      }
+    }
 
     // The properties below cannot be set by the dict.  They are all provided
     // for compatibility with native events.

package/lib/util/mime_utils.js

@@ -79,6 +79,39 @@ shaka.util.MimeUtils = class {
     return parts[0];
   }
 
+  /**
+   * Takes a full MIME type (with codecs) or basic MIME type (without codecs)
+   * and returns a basic MIME type (without codecs or other parameters).
+   *
+   * @param {string} mimeType
+   * @return {string}
+   */
+  static getBasicType(mimeType) {
+    return mimeType.split(';')[0];
+  }
+
+  /**
+   * Takes a MIME type and returns the codecs parameter, or an empty string if
+   * there is no codecs parameter.
+   *
+   * @param {string} mimeType
+   * @return {string}
+   */
+  static getCodecs(mimeType) {
+    // Parse the basic MIME type from its parameters.
+    const pieces = mimeType.split(/ *; */);
+    pieces.shift();  // Remove basic MIME type from pieces.
+
+    const codecs = pieces.find((piece) => piece.startsWith('codecs='));
+    if (!codecs) {
+      return '';
+    }
+
+    // The value may be quoted, so remove quotes at the beginning or end.
+    const value = codecs.split('=')[1].replace(/^"|"$/g, '');
+    return value;
+  }
+
   /**
    * 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

@@ -75,7 +75,10 @@ shaka.util.PeriodCombiner = class {
 
   /** @return {!Array.<shaka.extern.Stream>} */
   getTextStreams() {
-    return this.textStreams_;
+    // Return a copy of the array because makeTextStreamsForClosedCaptions
+    // may make changes to the contents of the array. Those changes should not
+    // propagate back to the PeriodCombiner.
+    return this.textStreams_.slice();
   }
 
   /**
@@ -551,7 +554,7 @@ shaka.util.PeriodCombiner = class {
 
     // We need to create all the per-period segment indexes and append them to
     // the output's MetaSegmentIndex.
-    await Promise.all(matches.map((match) => match.createSegmentIndex()));
+    await shaka.util.PeriodCombiner.createSegmentIndexes_(matches);
 
     // Assure the compiler that matches didn't become null during the async
     // operation above.
@@ -563,6 +566,25 @@ shaka.util.PeriodCombiner = class {
     return true;
   }
 
+  /**
+   * Creates all segment indexes for an array of streams.  Returns once every
+   * segment index is created.
+   *
+   * @param {!Array.<!shaka.extern.Stream>} streams
+   * @return {!Promise}
+   * @private
+   */
+  static createSegmentIndexes_(streams) {
+    const operations = [];
+    for (const stream of streams) {
+      operations.push(stream.createSegmentIndex());
+      if (stream.trickModeVideo && !stream.trickModeVideo.segmentIndex) {
+        operations.push(stream.trickModeVideo.createSegmentIndex());
+      }
+    }
+    return Promise.all(operations);
+  }
+
   /**
    * Create a new output Stream based on a particular input Stream.  Locates
    * matching Streams in all other periods and combines them into an output
@@ -605,7 +627,7 @@ shaka.util.PeriodCombiner = class {
     if (outputStream.createSegmentIndex) {
       // For T == Stream, we need to create all the per-period segment indexes
       // in advance.  concat() will add them to the output's MetaSegmentIndex.
-      await Promise.all(matches.map((match) => match.createSegmentIndex()));
+      await shaka.util.PeriodCombiner.createSegmentIndexes_(matches);
     }
 
     // Assure the compiler that matches didn't become null during the async

package/lib/util/stream_utils.js

@@ -16,6 +16,7 @@ goog.require('shaka.util.LanguageUtils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.MultiMap');
+goog.require('shaka.util.Platform');
 
 
 /**
@@ -296,6 +297,16 @@ shaka.util.StreamUtils = class {
         return false;
       }
 
+      // See: https://github.com/google/shaka-player/issues/3380
+      if (shaka.util.Platform.isXboxOne() && video &&
+          ((video.width && video.width > 1920) ||
+          (video.height && video.height > 1080)) &&
+          video.codecs.includes('avc1.')) {
+        shaka.log.debug('Dropping variant - video not compatible with platform',
+            StreamUtils.getStreamSummaryString_(video));
+        return false;
+      }
+
       if (audio && currentVariant && currentVariant.audio) {
         if (!StreamUtils.areStreamsCompatible_(audio, currentVariant.audio)) {
           shaka.log.debug('Droping variant - not compatible with active audio',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "3.0.11",
+  "version": "3.0.15",
   "homepage": "https://github.com/google/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -27,8 +27,8 @@
     "eslint-plugin-shaka-rules": "file:./build/eslint-plugin-shaka-rules",
     "esprima": "^4.0.1",
     "fontfaceonload": "^1.0.2",
-    "google-closure-compiler-java": "^20201006.0.0",
-    "google-closure-library": "^20200830.0.0",
+    "google-closure-compiler-java": "^20210505.0.0",
+    "google-closure-library": "^20210406.0.0",
     "htmlhint": "^0.11.0",
     "jasmine-ajax": "^4.0.0",
     "jimp": "^0.11.0",

package/test/cast/cast_proxy_unit.js

@@ -297,7 +297,8 @@ describe('CastProxy', () => {
             'timeupdate', Util.spyFunc(proxyListener));
 
         expect(proxyListener).not.toHaveBeenCalled();
-        const fakeEvent = new FakeEvent('timeupdate', {detail: 8675309});
+        const fakeEvent = new FakeEvent(
+            'timeupdate', (new Map()).set('detail', 8675309));
         mockVideo.on['timeupdate'](fakeEvent);
         expect(proxyListener).toHaveBeenCalledWith(jasmine.objectContaining({
           type: 'timeupdate',
@@ -315,7 +316,8 @@ describe('CastProxy', () => {
         mockSender.hasRemoteProperties.and.returnValue(true);
 
         expect(proxyListener).not.toHaveBeenCalled();
-        const fakeEvent = new FakeEvent('timeupdate', {detail: 8675309});
+        const fakeEvent = new FakeEvent(
+            'timeupdate', (new Map()).set('detail', 8675309));
         mockVideo.on['timeupdate'](fakeEvent);
         expect(proxyListener).not.toHaveBeenCalled();
       });
@@ -332,7 +334,8 @@ describe('CastProxy', () => {
         mockSender.hasRemoteProperties.and.returnValue(true);
 
         expect(proxyListener).not.toHaveBeenCalled();
-        const fakeEvent = new FakeEvent('timeupdate', {detail: 8675309});
+        const fakeEvent = new FakeEvent(
+            'timeupdate', (new Map()).set('detail', 8675309));
         mockSender.onRemoteEvent('video', fakeEvent);
         expect(proxyListener).toHaveBeenCalledWith(jasmine.objectContaining({
           type: 'timeupdate',
@@ -446,7 +449,8 @@ describe('CastProxy', () => {
             'buffering', Util.spyFunc(proxyListener));
 
         expect(proxyListener).not.toHaveBeenCalled();
-        const fakeEvent = new FakeEvent('buffering', {detail: 8675309});
+        const fakeEvent = new FakeEvent(
+            'buffering', (new Map()).set('detail', 8675309));
         mockPlayer.listeners['buffering'](fakeEvent);
         expect(proxyListener).toHaveBeenCalledWith(jasmine.objectContaining({
           type: 'buffering',
@@ -464,7 +468,8 @@ describe('CastProxy', () => {
         mockSender.hasRemoteProperties.and.returnValue(true);
 
         expect(proxyListener).not.toHaveBeenCalled();
-        const fakeEvent = new FakeEvent('buffering', {detail: 8675309});
+        const fakeEvent = new FakeEvent(
+            'buffering', (new Map()).set('detail', 8675309));
         mockPlayer.listeners['buffering'](fakeEvent);
         expect(proxyListener).not.toHaveBeenCalled();
       });
@@ -481,7 +486,8 @@ describe('CastProxy', () => {
         mockSender.hasRemoteProperties.and.returnValue(true);
 
         expect(proxyListener).not.toHaveBeenCalled();
-        const fakeEvent = new FakeEvent('buffering', {detail: 8675309});
+        const fakeEvent = new FakeEvent(
+            'buffering', (new Map()).set('detail', 8675309));
         mockSender.onRemoteEvent('player', fakeEvent);
         expect(proxyListener).toHaveBeenCalledWith(jasmine.objectContaining({
           type: 'buffering',

package/test/cast/cast_receiver_integration.js

@@ -170,7 +170,7 @@ filterDescribe('CastReceiver', castReceiverIntegrationSupport, () => {
       // Check that the update message is of a reasonable size. From previous
       // testing we found that the socket would silently reject data that got
       // too big. 6KB is safely below the limit.
-      expect(message.length).toBeLessThan(6 * 1024);
+      expect(message.length).toBeLessThan(7 * 1024);
     });
 
     drmIt('has reasonable average message size', async () => {

package/test/cast/cast_utils_unit.js

@@ -129,7 +129,7 @@ describe('CastUtils', () => {
       expect(typeof deserialized).toBe('object');
 
       // The object can be used to construct a FakeEvent.
-      const fakeEvent = new FakeEvent(deserialized['type'], deserialized);
+      const fakeEvent = FakeEvent.fromRealEvent(deserialized);
 
       // The fake event has the same type and properties as the original.
       const asObj = /** @type {!Object} */ (fakeEvent);

package/test/dash/dash_parser_manifest_unit.js

@@ -1796,4 +1796,77 @@ describe('DashParser Manifest', () => {
       expect(uri).not.toContain('/p2/');
     }
   });
+
+  /**
+     * @param {!Array.<number>} periods Start time of multiple periods
+     * @return {string}
+     */
+  function buildManifestWithPeriodStartTime(periods) {
+    const mpdTemplate = [
+      `<MPD type="dynamic"`,
+      'availabilityStartTime="1970-01-01T00:00:00Z"',
+      'timeShiftBufferDepth="PT10H">',
+      '    %(periods)s',
+      '</MPD>',
+    ].join('\n');
+    const periodTemplate = (id, period, duration) => {
+      return [
+        `    <Period id="${id}" start="PT${period}S">`,
+        '        <AdaptationSet mimeType="video/mp4" lang="en" group="1">',
+        '            <SegmentTemplate startNumber="1" media="l-$Number$.mp4">',
+        '                <SegmentTimeline>',
+        `                    <S t="0" d="${duration}" />`,
+        '                </SegmentTimeline>',
+        '            </SegmentTemplate>',
+        '            <Representation id="1"/>',
+        '        </AdaptationSet>',
+        '    </Period>',
+      ].join('\n');
+    };
+    const periodXmls = periods.map((period, i) => {
+      const duration = i+1 === periods.length ? 10 : periods[i+1] - period;
+      // Period start time as ID here. If we use index then there will be
+      // periods with same period ID and different start time which are invalid.
+      return periodTemplate(period, period, duration);
+    });
+    return sprintf(mpdTemplate, {
+      periods: periodXmls.join('\n'),
+    });
+  }
+
+  // Bug description: Inconsistent period start time in the manifests due
+  // to failover triggered in backend servers
+
+  // When one of the servers is down, the manifest will be served by other
+  // redundant servers. The period start time might become out of sync
+  // during the switch-over/recovery.
+
+  it('skip periods that are earlier than max period start time', async () => {
+    const sources = [
+      buildManifestWithPeriodStartTime([5, 15]),
+      buildManifestWithPeriodStartTime([6, 15]), // simulate out-of-sync of +1s
+      buildManifestWithPeriodStartTime([4, 15]), // simulate out-of-sync of -1s
+    ];
+    const segments = [];
+
+    for (const source of sources) {
+      fakeNetEngine.setResponseText('dummy://foo', source);
+      /** @type {shaka.extern.Manifest} */
+      // eslint-disable-next-line no-await-in-loop
+      const manifest = await parser.start('dummy://foo', playerInterface);
+      const video = manifest.variants[0].video;
+      // eslint-disable-next-line no-await-in-loop
+      await video.createSegmentIndex();
+      goog.asserts.assert(video.segmentIndex, 'Null segmentIndex!');
+      segments.push(Array.from(video.segmentIndex));
+    }
+
+    // Expect identical segments
+    expect(segments[0].length).toBe(2);
+    expect(segments[1].length).toBe(2);
+    expect(segments[0][0].startTime).toBe(5);
+    expect(segments[1][0].startTime).toBe(5);
+    expect(segments[0][1].startTime).toBe(15);
+    expect(segments[1][1].startTime).toBe(15);
+  });
 });

package/test/demo/demo_unit.js

@@ -96,7 +96,6 @@ describe('Demo', () => {
       const configPrimitives = new Set(['number', 'string', 'boolean']);
       const exceptions = new Set()
           .add('preferredVariantRole')
-          .add('preferredTextRole')
           .add('playRangeStart')
           .add('playRangeEnd');
 

package/test/hls/hls_parser_unit.js

@@ -202,6 +202,46 @@ describe('HlsParser', () => {
     expect(actual).toEqual(manifest);
   });
 
+  it('prioritize AVERAGE-BANDWIDTH to BANDWIDTH', async () => {
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1",',
+      'RESOLUTION=960x540,FRAME-RATE=60,',
+      'AVERAGE-BANDWIDTH=100\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.bandwidth = 100;
+        variant.addPartialStream(ContentType.VIDEO, (stream) => {
+          stream.frameRate = 60;
+          stream.mime('video/mp4', 'avc1');
+          stream.size(960, 540);
+        });
+      });
+    });
+
+    fakeNetEngine
+        .setResponseText('test:/master', master)
+        .setResponseText('test:/video', media)
+        .setResponseValue('test:/init.mp4', initSegmentData)
+        .setResponseValue('test:/main.mp4', segmentData);
+
+    const actual = await parser.start('test:/master', playerInterface);
+    expect(actual).toEqual(manifest);
+  });
+
   it('ignores duplicate CODECS', async () => {
     const master = [
       '#EXTM3U\n',
@@ -736,7 +776,7 @@ describe('HlsParser', () => {
       'RESOLUTION=960x540,FRAME-RATE=120,AUDIO="aud2"\n',
       'video2\n',
       '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="eng",',
-      'URI="audio"\n',
+      'DEFAULT=YES,URI="audio"\n',
       '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud2",LANGUAGE="fr",',
       'URI="audio2"\n',
     ].join('');
@@ -754,6 +794,7 @@ describe('HlsParser', () => {
       manifest.anyTimeline();
       manifest.addPartialVariant((variant) => {
         variant.bandwidth = 200;
+        variant.primary = true;
         variant.addPartialStream(ContentType.VIDEO, (stream) => {
           stream.size(960, 540);
         });
@@ -763,6 +804,7 @@ describe('HlsParser', () => {
       });
       manifest.addPartialVariant((variant) => {
         variant.bandwidth = 300;
+        variant.primary = false;
         variant.addPartialStream(ContentType.VIDEO, (stream) => {
           stream.size(960, 540);
         });
@@ -1171,6 +1213,8 @@ describe('HlsParser', () => {
     // stream.
     const timeline = actual.presentationTimeline;
     expect(timeline.getDuration()).toBe(10);
+    expect(timeline.getSeekRangeStart()).toBe(0);
+    expect(timeline.getSeekRangeEnd()).toBe(10);
 
     expect(actual.textStreams.length).toBe(1);
     expect(actual.variants.length).toBe(1);

package/test/media/drm_engine_unit.js

@@ -1954,6 +1954,49 @@ describe('DrmEngine', () => {
           [drmInfoAudio]);
       expect(returned).toEqual([drmInfoDesired]);
     });
+
+    it('dedupes the merged init data based on keyId matching', () => {
+      const serverCert = new Uint8Array(0);
+      const drmInfoVideo = {
+        keySystem: 'drm.abc',
+        licenseServerUri: 'http://abc.drm/license',
+        distinctiveIdentifierRequired: false,
+        persistentStateRequired: true,
+        videoRobustness: 'really_really_ridiculously_good',
+        serverCertificate: serverCert,
+        serverCertificateUri: '',
+        initData: [{keyId: 'v-init'}],
+        keyIds: new Set(['deadbeefdeadbeefdeadbeefdeadbeef']),
+      };
+      const drmInfoAudio = {
+        keySystem: 'drm.abc',
+        licenseServerUri: undefined,
+        distinctiveIdentifierRequired: true,
+        persistentStateRequired: false,
+        audioRobustness: 'good',
+        serverCertificate: undefined,
+        serverCertificateUri: '',
+        initData: [{keyId: 'v-init'}, {keyId: 'a-init'}],
+        keyIds: new Set(['eadbeefdeadbeefdeadbeefdeadbeefd']),
+      };
+      const drmInfoDesired = {
+        keySystem: 'drm.abc',
+        licenseServerUri: 'http://abc.drm/license',
+        distinctiveIdentifierRequired: true,
+        persistentStateRequired: true,
+        audioRobustness: 'good',
+        videoRobustness: 'really_really_ridiculously_good',
+        serverCertificate: serverCert,
+        initData: [{keyId: 'v-init'}, {keyId: 'a-init'}],
+        keyIds: new Set([
+          'deadbeefdeadbeefdeadbeefdeadbeef',
+          'eadbeefdeadbeefdeadbeefdeadbeefd',
+        ]),
+      };
+      const returned = shaka.media.DrmEngine.getCommonDrmInfos([drmInfoVideo],
+          [drmInfoAudio]);
+      expect(returned).toEqual([drmInfoDesired]);
+    });
   }); // describe('getCommonDrmInfos')
 
   describe('configure', () => {
@@ -2087,6 +2130,19 @@ describe('DrmEngine', () => {
       await expectAsync(drmEngine.removeSession('abc'))
           .toBeRejectedWith(expected);
     });
+
+    // Regression test for #3534
+    it('does not remove the same session again on destroy', async () => {
+      updatePromise.resolve();
+      expect(session1.remove).not.toHaveBeenCalled();
+      await drmEngine.removeSession('abc');
+      expect(session1.remove).toHaveBeenCalled();
+      session1.remove.calls.reset();
+      await drmEngine.destroy();
+      // The session should only be removed ONCE. If it's double-removed, it
+      // will make a (non-fatal) DOMException.
+      expect(session1.remove).not.toHaveBeenCalled();
+    });
   });
 
   describe('expiration', () => {