shaka-player 4.9.28 → 4.9.30

package/lib/dash/dash_parser.js

@@ -1285,11 +1285,13 @@ shaka.dash.DashParser = class {
     for (let i = 0; i < periodNodes.length; i++) {
       const elem = periodNodes[i];
       const next = periodNodes[i + 1];
-      const start = /** @type {number} */ (
+      let start = /** @type {number} */ (
         TXml.parseAttr(elem, 'start', TXml.parseDuration, prevEnd));
       const periodId = elem.attributes['id'];
       const givenDuration =
           TXml.parseAttr(elem, 'duration', TXml.parseDuration);
+      start = (i == 0 && start == 0 && this.isTransitionFromDynamicToStatic_) ?
+          seekRangeStart : start;
 
       let periodDuration = null;
       if (next) {
@@ -1299,7 +1301,7 @@ shaka.dash.DashParser = class {
         const nextStart =
             TXml.parseAttr(next, 'start', TXml.parseDuration);
         if (nextStart != null) {
-          periodDuration = nextStart - start;
+          periodDuration = nextStart - start + seekRangeStart;
         }
       } else if (presentationDuration != null) {
         // "The Period extends until the Period.start of the next Period, or
@@ -2575,25 +2577,51 @@ shaka.dash.DashParser = class {
           return intValue;
         }
 
+        case 'tag:dolby.com,2015:dash:audio_channel_configuration:2015': {
+          // ETSI TS 103 190-2 v1.2.1, Annex G.3
+          // LSB-to-MSB order
+          const channelCountMapping =
+            [2, 1, 2, 2, 2, 2, 1, 2, 2, 1, 1, 1, 1, 2, 1, 1, 2, 2];
+          const hexValue = parseInt(value, 16);
+          if (!hexValue) {  // 0 or NaN
+            shaka.log.warning('Channel parsing failure! ' +
+                          'Ignoring scheme and value', scheme, value);
+            continue;
+          }
+          let numBits = 0;
+          for (let i = 0; i < channelCountMapping.length; i++) {
+            if (hexValue & (1<<i)) {
+              numBits += channelCountMapping[i];
+            }
+          }
+          if (numBits) {
+            return numBits;
+          }
+          continue;
+        }
+
         case 'tag:dolby.com,2014:dash:audio_channel_configuration:2011':
         case 'urn:dolby:dash:audio_channel_configuration:2011': {
-          // A hex-encoded 16-bit integer, in which each bit represents a
-          // channel.
-          let hexValue = parseInt(value, 16);
+          // Defined by https://ott.dolby.com/OnDelKits/DDP/Dolby_Digital_Plus_Online_Delivery_Kit_v1.5/Documentation/Content_Creation/SDM/help_files/topics/ddp_mpeg_dash_c_mpd_auchlconfig.html
+          // keep list in order of the spec; reverse for LSB-to-MSB order
+          const channelCountMapping =
+            [1, 1, 1, 1, 1, 2, 2, 1, 1, 2, 2, 2, 1, 2, 1, 1].reverse();
+          const hexValue = parseInt(value, 16);
           if (!hexValue) {  // 0 or NaN
             shaka.log.warning('Channel parsing failure! ' +
                           'Ignoring scheme and value', scheme, value);
             continue;
           }
-          // Count the 1-bits in hexValue.
           let numBits = 0;
-          while (hexValue) {
-            if (hexValue & 1) {
-              ++numBits;
+          for (let i = 0; i < channelCountMapping.length; i++) {
+            if (hexValue & (1<<i)) {
+              numBits += channelCountMapping[i];
             }
-            hexValue >>= 1;
           }
-          return numBits;
+          if (numBits) {
+            return numBits;
+          }
+          continue;
         }
 
         // Defined by https://dashif.org/identifiers/audio_source_metadata/ and clause 8.2, in ISO/IEC 23001-8.

package/lib/dash/segment_template.js

@@ -778,7 +778,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
       if (currentTimeline.length) {
         const lastCurrentEntry = currentTimeline[currentTimeline.length - 1];
         newEntries = info.timeline.filter((entry) => {
-          return entry.start >= lastCurrentEntry.end;
+          return entry.end > lastCurrentEntry.end;
         });
       } else {
         newEntries = info.timeline.slice();

package/lib/media/drm_engine.js

@@ -743,6 +743,17 @@ shaka.media.DrmEngine = class {
           return;
         }
       }
+      let duplicate = false;
+      this.storedPersistentSessions_.forEach((metadata, sessionId) => {
+        if (!duplicate &&
+            shaka.util.BufferUtils.equal(initData, metadata.initData)) {
+          duplicate = true;
+        }
+      });
+      if (duplicate) {
+        shaka.log.debug('Ignoring duplicate init data.');
+        return;
+      }
     }
 
     // If there are pre-existing sessions that have all been loaded

package/lib/media/media_source_engine.js

@@ -116,7 +116,7 @@ shaka.media.MediaSourceEngine = class {
     /** @private {boolean} */
     this.playbackHasBegun_ = false;
 
-    /** @private {(MediaSource|ManagedMediaSource)} */
+    /** @private {MediaSource} */
     this.mediaSource_ = this.createMediaSource(this.mediaSourceOpen_);
 
     /** @private {boolean} */
@@ -175,13 +175,16 @@ shaka.media.MediaSourceEngine = class {
    * Replaced by unit tests.
    *
    * @param {!shaka.util.PublicPromise} p
-   * @return {!(MediaSource|ManagedMediaSource)}
+   * @return {!MediaSource}
    */
   createMediaSource(p) {
+    /** @type {!MediaSource} */
+    let mediaSource;
+
     if (window.ManagedMediaSource) {
       this.video_.disableRemotePlayback = true;
 
-      const mediaSource = new ManagedMediaSource();
+      mediaSource = new ManagedMediaSource();
 
       this.eventManager_.listen(
           mediaSource, 'startstreaming', () => {
@@ -192,39 +195,25 @@ shaka.media.MediaSourceEngine = class {
           mediaSource, 'endstreaming', () => {
             this.streamingAllowed_ = false;
           });
-
-      this.eventManager_.listenOnce(
-          mediaSource, 'sourceopen', () => this.onSourceOpen_(p));
-
-      // Correctly set when playback has begun.
-      this.eventManager_.listenOnce(this.video_, 'playing', () => {
-        this.playbackHasBegun_ = true;
-      });
-
-      this.url_ = shaka.media.MediaSourceEngine.createObjectURL(mediaSource);
-
-      this.video_.src = this.url_;
-
-      return mediaSource;
     } else {
-      const mediaSource = new MediaSource();
+      mediaSource = new MediaSource();
+    }
 
-      // Set up MediaSource on the video element.
-      this.eventManager_.listenOnce(
-          mediaSource, 'sourceopen', () => this.onSourceOpen_(p));
+    // Set up MediaSource on the video element.
+    this.eventManager_.listenOnce(
+        mediaSource, 'sourceopen', () => this.onSourceOpen_(p));
 
-      // Correctly set when playback has begun.
-      this.eventManager_.listenOnce(this.video_, 'playing', () => {
-        this.playbackHasBegun_ = true;
-      });
+    // Correctly set when playback has begun.
+    this.eventManager_.listenOnce(this.video_, 'playing', () => {
+      this.playbackHasBegun_ = true;
+    });
 
-      // Store the object URL for releasing it later.
-      this.url_ = shaka.media.MediaSourceEngine.createObjectURL(mediaSource);
+    // Store the object URL for releasing it later.
+    this.url_ = shaka.media.MediaSourceEngine.createObjectURL(mediaSource);
 
-      this.video_.src = this.url_;
+    this.video_.src = this.url_;
 
-      return mediaSource;
-    }
+    return mediaSource;
   }
 
   /**

package/lib/media/playhead.js

@@ -427,7 +427,9 @@ shaka.media.MediaSourcePlayhead = class {
         // infinite loop on systems where changing currentTime takes a
         // significant amount of time (e.g. Chromecast).
         const time = Date.now() / 1000;
-        if (!this.lastCorrectiveSeek_ || this.lastCorrectiveSeek_ < time - 1) {
+        const seekDelay = shaka.util.Platform.isFuchsiaCastDevice() ? 3 : 1;
+        if (!this.lastCorrectiveSeek_ ||
+            this.lastCorrectiveSeek_ < time - seekDelay) {
           this.lastCorrectiveSeek_ = time;
           canCorrectiveSeek = true;
         }

package/lib/media/preload_manager.js

@@ -131,6 +131,9 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     /** @private {!shaka.util.Stats} */
     this.stats_ = new shaka.util.Stats();
 
+    /** @private {!shaka.util.PublicPromise} */
+    this.manifestPromise_ = new shaka.util.PublicPromise();
+
     /** @private {!shaka.util.PublicPromise} */
     this.successPromise_ = new shaka.util.PublicPromise();
 
@@ -383,6 +386,8 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
         await this.parseManifestInner_();
         this.throwIfDestroyed_();
 
+        this.manifestPromise_.resolve();
+
         await this.initializeDrmInner_();
         this.throwIfDestroyed_();
 
@@ -703,6 +708,18 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
     return this.successPromise_;
   }
 
+  /**
+   * Waits for the manifest to be loaded (or to fail with an error).
+   * @return {!Promise}
+   */
+  waitForManifest() {
+    const promises = [
+      this.manifestPromise_,
+      this.successPromise_,
+    ];
+    return Promise.race(promises);
+  }
+
   /**
    * Releases or stops all non-entrusted resources.
    *

package/lib/media/presentation_timeline.js

@@ -78,6 +78,9 @@ shaka.media.PresentationTimeline = class {
     /** @private {boolean} */
     this.static_ = true;
 
+    /** @private {boolean} */
+    this.isLive2VodTransition_ = false;
+
     /** @private {number} */
     this.userSeekStart_ = 0;
 
@@ -179,6 +182,9 @@ shaka.media.PresentationTimeline = class {
    */
   setStatic(isStatic) {
     // NOTE: the argument name is not "static" because that's a keyword in ES6
+    if (isStatic && !this.static_) {
+      this.isLive2VodTransition_ = true;
+    }
     this.static_ = isStatic;
   }
 
@@ -384,7 +390,7 @@ shaka.media.PresentationTimeline = class {
       // No data yet, and Math.min(null, startTime) is always 0.  So just store
       // startTime.
       this.minSegmentStartTime_ = startTime;
-    } else {
+    } else if (!this.isLive2VodTransition_) {
       this.minSegmentStartTime_ =
           Math.min(this.minSegmentStartTime_, startTime);
     }

package/lib/media/streaming_engine.js

@@ -82,7 +82,7 @@ shaka.media.StreamingEngine = class {
     this.deferredCloseSegmentIndex_ = new Map();
 
     /** @private {number} */
-    this.bufferingGoalScale_ = 1;
+    this.bufferingScale_ = 1;
 
     /** @private {?shaka.extern.Variant} */
     this.currentVariant_ = null;
@@ -148,6 +148,9 @@ shaka.media.StreamingEngine = class {
 
     /** @private {number} */
     this.playRangeEnd_ = Infinity;
+
+    /** @private {?shaka.media.StreamingEngine.MediaState_} */
+    this.lastTextMediaStateBeforeUnload_ = null;
   }
 
   /** @override */
@@ -380,6 +383,8 @@ shaka.media.StreamingEngine = class {
     if (state) {
       this.cancelUpdate_(state);
       this.abortOperations_(state).catch(() => {});
+      this.lastTextMediaStateBeforeUnload_ =
+          this.mediaStates_.get(ContentType.TEXT);
       this.mediaStates_.delete(ContentType.TEXT);
     }
     this.currentTextStream_ = null;
@@ -476,6 +481,7 @@ shaka.media.StreamingEngine = class {
    * @param {shaka.extern.Stream} textStream
    */
   async switchTextStream(textStream) {
+    this.lastTextMediaStateBeforeUnload_ = null;
     this.currentTextStream_ = textStream;
 
     if (!this.startupComplete_) {
@@ -1352,7 +1358,7 @@ shaka.media.StreamingEngine = class {
         this.config_.bufferingGoal);
 
     const scaledBufferingGoal = Math.max(1,
-        unscaledBufferingGoal * this.bufferingGoalScale_);
+        unscaledBufferingGoal * this.bufferingScale_);
 
     // Check if we've buffered to the end of the presentation.
     const timeUntilEnd =
@@ -1793,7 +1799,7 @@ shaka.media.StreamingEngine = class {
         }
         this.mediaStates_.delete(ContentType.TEXT);
       } else if (error.code == shaka.util.Error.Code.QUOTA_EXCEEDED_ERROR) {
-        this.handleQuotaExceeded_(mediaState, error);
+        await this.handleQuotaExceeded_(mediaState, error);
       } else {
         shaka.log.error(logPrefix, 'failed fetch and append: code=' +
             error.code);
@@ -1906,9 +1912,10 @@ shaka.media.StreamingEngine = class {
    *
    * @param {shaka.media.StreamingEngine.MediaState_} mediaState
    * @param {!shaka.util.Error} error
+   * @return {!Promise}
    * @private
    */
-  handleQuotaExceeded_(mediaState, error) {
+  async handleQuotaExceeded_(mediaState, error) {
     const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
 
     // The segment cannot fit into the SourceBuffer. Ideally, MediaSource would
@@ -1930,18 +1937,22 @@ shaka.media.StreamingEngine = class {
     });
 
     if (!waitingForAnotherStreamToRecover) {
+      const maxDisabledTime = this.getDisabledTime_(error);
+      if (maxDisabledTime) {
+        shaka.log.debug(logPrefix, 'Disabling stream due to quota', error);
+      }
       const handled = this.playerInterface_.disableStream(
-          mediaState.stream, this.config_.maxDisabledTime);
+          mediaState.stream, maxDisabledTime);
       if (handled) {
         return;
       }
       // Reduction schedule: 80%, 60%, 40%, 20%, 16%, 12%, 8%, 4%, fail.
       // Note: percentages are used for comparisons to avoid rounding errors.
-      const percentBefore = Math.round(100 * this.bufferingGoalScale_);
+      const percentBefore = Math.round(100 * this.bufferingScale_);
       if (percentBefore > 20) {
-        this.bufferingGoalScale_ -= 0.2;
+        this.bufferingScale_ -= 0.2;
       } else if (percentBefore > 4) {
-        this.bufferingGoalScale_ -= 0.04;
+        this.bufferingScale_ -= 0.04;
       } else {
         shaka.log.error(
             logPrefix, 'MediaSource threw QuotaExceededError too many times');
@@ -1950,12 +1961,14 @@ shaka.media.StreamingEngine = class {
         this.playerInterface_.onError(error);
         return;
       }
-      const percentAfter = Math.round(100 * this.bufferingGoalScale_);
+      const percentAfter = Math.round(100 * this.bufferingScale_);
       shaka.log.warning(
           logPrefix,
           'MediaSource threw QuotaExceededError:',
           'reducing buffering goals by ' + (100 - percentAfter) + '%');
       mediaState.recovering = true;
+      const presentationTime = this.playerInterface_.getPresentationTime();
+      await this.evict_(mediaState, presentationTime);
     } else {
       shaka.log.debug(
           logPrefix,
@@ -2484,12 +2497,16 @@ shaka.media.StreamingEngine = class {
     // Use the max segment duration, if it is longer than the bufferBehind, to
     // avoid accidentally clearing too much data when dealing with a manifest
     // with a long keyframe interval.
-    const bufferBehind = Math.max(this.config_.bufferBehind,
+    const bufferBehind = Math.max(
+        this.config_.bufferBehind * this.bufferingScale_,
         this.manifest_.presentationTimeline.getMaxSegmentDuration());
 
     const startTime =
         this.playerInterface_.mediaSourceEngine.bufferStart(mediaState.type);
     if (startTime == null) {
+      if (this.lastTextMediaStateBeforeUnload_ == mediaState) {
+        this.lastTextMediaStateBeforeUnload_ = null;
+      }
       shaka.log.v2(logPrefix,
           'buffer behind okay because nothing buffered:',
           'presentationTime=' + presentationTime,
@@ -2524,6 +2541,11 @@ shaka.media.StreamingEngine = class {
 
     this.destroyer_.ensureNotDestroyed();
     shaka.log.v1(logPrefix, 'evicted ' + overflow + ' seconds');
+
+    if (this.lastTextMediaStateBeforeUnload_) {
+      await this.evict_(this.lastTextMediaStateBeforeUnload_, presentationTime);
+      this.destroyer_.ensureNotDestroyed();
+    }
   }
 
 
@@ -2768,18 +2790,26 @@ shaka.media.StreamingEngine = class {
    * @private
    */
   async handleStreamingError_(mediaState, error) {
+    const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
+
     // If we invoke the callback right away, the application could trigger a
     // rapid retry cycle that could be very unkind to the server.  Instead,
     // use the backoff system to delay and backoff the error handling.
     await this.failureCallbackBackoff_.attempt();
     this.destroyer_.ensureNotDestroyed();
-    // Try to recover from network errors
-    if (error.category === shaka.util.Error.Category.NETWORK) {
+
+    // Try to recover from network errors, but not timeouts.
+    // See https://github.com/shaka-project/shaka-player/issues/7368
+    if (error.category === shaka.util.Error.Category.NETWORK &&
+        error.code != shaka.util.Error.Code.TIMEOUT) {
       if (mediaState.restoreStreamAfterTrickPlay) {
         this.setTrickPlay(/* on= */ false);
         return;
       }
       const maxDisabledTime = this.getDisabledTime_(error);
+      if (maxDisabledTime) {
+        shaka.log.debug(logPrefix, 'Disabling stream due to error', error);
+      }
       error.handled = this.playerInterface_.disableStream(
           mediaState.stream, maxDisabledTime);
 
@@ -2804,6 +2834,7 @@ shaka.media.StreamingEngine = class {
 
   /**
    * @param {!shaka.util.Error} error
+   * @return {number}
    * @private
    */
   getDisabledTime_(error) {

package/lib/player.js

@@ -1406,13 +1406,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       //
       // DrmEngine requires this to be done before we destroy DrmEngine itself.
       if (this.video_ && this.video_.src) {
-        // TODO: Investigate this more.  Only reproduces on Firefox 69.
-        // Introduce a delay before detaching the video source.  We are seeing
-        // spurious Promise rejections involving an AbortError in our tests
-        // otherwise.
-        await new Promise(
-            (resolve) => new shaka.util.Timer(resolve).tickAfter(0.1));
-
         this.video_.removeAttribute('src');
         this.video_.load();
       }
@@ -1646,6 +1639,17 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           await this.srcEqualsInner_(startTimeOfLoad, mimeType);
         }, 'srcEqualsInner_');
       } else {
+        // Wait for the manifest to be parsed.
+        await mutexWrapOperation(async () => {
+          await preloadManager.waitForManifest();
+        }, 'waitForFinish');
+
+        // Retrieve the manifest. This is specifically put before the media
+        // source engine is initialized, for the benefit of event handlers.
+        this.parserFactory_ = preloadManager.getParserFactory();
+        this.parser_ = preloadManager.receiveParser();
+        this.manifest_ = preloadManager.getManifest();
+
         if (!this.mediaSourceEngine_) {
           await mutexWrapOperation(async () => {
             await this.initializeMediaSourceEngineInner_();
@@ -1660,11 +1664,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         // Get manifest and associated values from preloader.
         this.config_ = preloadManager.getConfiguration();
         this.manifestFilterer_ = preloadManager.getManifestFilterer();
-        this.parserFactory_ = preloadManager.getParserFactory();
-        this.parser_ = preloadManager.receiveParser();
         this.regionTimeline_ = preloadManager.receiveRegionTimeline();
         this.qualityObserver_ = preloadManager.getQualityObserver();
-        this.manifest_ = preloadManager.getManifest();
         const currentAdaptationSetCriteria =
             preloadManager.getCurrentAdaptationSetCriteria();
         if (currentAdaptationSetCriteria) {
@@ -2802,6 +2803,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       }
     }
     mediaElement.src = playbackUri;
+    // If ManagedMediaSource exists, we've disabled remote playback on our own.
+    // Reenable it so AirPlay can be used via RemotePlayback API.
+    if (this.mediaSourceEngine_ && window.ManagedMediaSource) {
+      mediaElement.disableRemotePlayback = false;
+    }
 
     // Tizen 3 / WebOS won't load anything unless you call load() explicitly,
     // no matter the value of the preload attribute.  This is harmful on some
@@ -6589,6 +6595,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       oldTrack = shaka.util.StreamUtils.variantToTrack(currentVariant);
     }
     const newTrack = shaka.util.StreamUtils.variantToTrack(variant);
+    newTrack.active = true;
 
     if (fromAdaptation) {
       // Dispatch an 'adaptation' event
@@ -6740,27 +6747,28 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @private
    */
   onSegmentAppended_(start, end, contentType, isMuxed) {
-    // When we append a segment to media source (via streaming engine) we are
-    // changing what data we have buffered, so notify the playhead of the
-    // change.
-    if (this.playhead_) {
-      this.playhead_.notifyOfBufferingChange();
-      // Skip the initial buffer gap
-      const startTime = this.mediaSourceEngine_.bufferStart(contentType);
-      const ContentType = shaka.util.ManifestParserUtils.ContentType;
-      if (
-        !this.isLive() &&
-        // If not paused then GapJumpingController will handle this gap.
-        this.video_.paused &&
-        startTime != null &&
-        contentType != ContentType.TEXT &&
-        startTime > 0 &&
-        this.playhead_.getTime() < startTime
-      ) {
-        this.playhead_.setStartTime(startTime);
-      }
-    }
-    this.pollBufferState_();
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
+    if (contentType != ContentType.TEXT) {
+      // When we append a segment to media source (via streaming engine) we are
+      // changing what data we have buffered, so notify the playhead of the
+      // change.
+      if (this.playhead_) {
+        this.playhead_.notifyOfBufferingChange();
+        // Skip the initial buffer gap
+        const startTime = this.mediaSourceEngine_.bufferStart(contentType);
+        if (
+          !this.isLive() &&
+          // If not paused then GapJumpingController will handle this gap.
+          this.video_.paused &&
+          startTime != null &&
+          startTime > 0 &&
+          this.playhead_.getTime() < startTime
+        ) {
+          this.playhead_.setStartTime(startTime);
+        }
+      }
+      this.pollBufferState_();
+    }
 
     // Dispatch an event for users to consume, too.
     const data = new Map()
@@ -7527,7 +7535,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat, max-len
-shaka.Player.version = 'v4.9.28' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.30' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/encryption_scheme.js

@@ -7,6 +7,7 @@
 goog.provide('shaka.polyfill.EncryptionScheme');
 
 goog.require('shaka.polyfill');
+goog.require('shaka.util.Platform');
 
 /**
  * @summary A polyfill to add support for EncryptionScheme queries in EME.
@@ -23,6 +24,14 @@ shaka.polyfill.EncryptionScheme = class {
    * @export
    */
   static install() {
+    // Skip polyfill for PlayStation 4 and SkyQ devices due to known crashes
+    // caused by unsupported encryptionScheme handling. These platforms do not
+    // require the polyfill, and forcing encryptionScheme processing can result
+    // in playback crashes.
+    if (shaka.util.Platform.isPS4() || shaka.util.Platform.isSkyQ()) {
+      return;
+    }
+
     EncryptionSchemePolyfills.install();
   }
 };

package/lib/polyfill/media_capabilities.js

@@ -10,6 +10,7 @@ goog.require('shaka.log');
 goog.require('shaka.media.Capabilities');
 goog.require('shaka.polyfill');
 goog.require('shaka.util.DrmUtils');
+goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Platform');
 
 
@@ -222,6 +223,7 @@ shaka.polyfill.MediaCapabilities = class {
    * @private
    */
   static async checkDrmSupport_(videoConfig, audioConfig, mcapKeySystemConfig) {
+    const MimeUtils = shaka.util.MimeUtils;
     const audioCapabilities = [];
     const videoCapabilities = [];
 
@@ -277,8 +279,12 @@ shaka.polyfill.MediaCapabilities = class {
       mediaKeySystemConfig.videoCapabilities = videoCapabilities;
     }
 
-    const videoCodec = videoConfig ? videoConfig.contentType : '';
-    const audioCodec = audioConfig ? audioConfig.contentType : '';
+    const videoMimeType = videoConfig ? videoConfig.contentType : '';
+    const audioMimeType = audioConfig ? audioConfig.contentType : '';
+    const videoCodec = MimeUtils.getBasicType(videoMimeType) + ';' +
+        MimeUtils.getCodecBase(videoMimeType);
+    const audioCodec = MimeUtils.getBasicType(audioMimeType) + ';' +
+        MimeUtils.getCodecBase(audioMimeType);
     const keySystem = mcapKeySystemConfig.keySystem;
 
     /** @type {MediaKeySystemAccess} */

package/lib/util/periods.js

@@ -75,6 +75,9 @@ shaka.util.PeriodCombiner = class {
     this.textStreams_ = [];
     this.imageStreams_ = [];
     this.variants_ = [];
+    this.multiTypeVariantsAllowed_ = false;
+    this.useStreamOnce_ = false;
+    this.usedPeriodIds_.clear();
   }
 
   /**