shaka-player 4.6.11 → 4.6.13

package/docs/tutorials/ui-customization.md

@@ -188,19 +188,6 @@ const config = {
 ui.configure(config);
 ```
 
-If you've chosen to display chapters, you can specify the color for the chapter markers on
-the timeline and the text color of the chapter titles that popup on hover:
- ```js
-const config = {
-  displayChapters: true,
-  seekBarColors: {
-    chapterMarks: 'rgb(27, 27, 27)',
-    chapterLabels: 'rgb(255, 255, 255)'
-  }
-}
-ui.configure(config);
-```
-
 #### Configuring playback, fast forward and rewind rates
 The rate in which the player can play, fast forward and rewind content can be configured using the `playbackRates`, `fastForwardRates` and `rewindRates` options.
 

package/lib/dash/dash_parser.js

@@ -1640,7 +1640,7 @@ shaka.dash.DashParser = class {
     // An attribute which is present and set to 0 should still result in
     // periodic updates.  For more, see:
     // https://github.com/Dash-Industry-Forum/Guidelines-TimingModel/issues/48
-    if (this.updatePeriod_ <= 0) {
+    if (this.updatePeriod_ < 0) {
       return;
     }
 

package/lib/media/content_workarounds.js

@@ -69,6 +69,30 @@ shaka.media.ContentWorkarounds = class {
         })
         .fullBox('encv', onEncryptionMetadataBox)
         .fullBox('enca', onEncryptionMetadataBox)
+        .fullBox('dvav', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
+        .fullBox('dva1', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
+        .fullBox('dvh1', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
+        .fullBox('dvhe', (box) => {
+          boxesToModify.push({
+            box,
+            newType: ContentWorkarounds.BOX_TYPE_ENCV_,
+          });
+        })
         .fullBox('hev1', (box) => {
           boxesToModify.push({
             box,

package/lib/mss/mss_parser.js

@@ -661,6 +661,8 @@ shaka.mss.MssParser = class {
           videoNalus: videoNalus,
           audioConfig: new Uint8Array([]),
           videoConfig: new Uint8Array([]),
+          hSpacing: 0,
+          vSpacing: 0,
           data: null, // Data is not necessary for init segement.
           stream: stream,
         };

package/lib/player.js

@@ -715,6 +715,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     if (shaka.Player.adManagerFactory_) {
       this.adManager_ = shaka.Player.adManagerFactory_();
+      this.adManager_.configure(this.config_.ads);
     }
 
     // If the browser comes back online after being offline, then try to play
@@ -1778,8 +1779,17 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     this.drmEngine_.configure(this.config_.drm);
 
+    const tracksChanged = shaka.util.StreamUtils.applyRestrictions(
+        this.manifest_.variants, this.config_.restrictions, this.maxHwRes_);
+    if (tracksChanged && this.streamingEngine_) {
+      this.onTracksChanged_();
+    }
+
+    const playableVariants = shaka.util.StreamUtils.getPlayableVariants(
+        this.manifest_.variants);
+
     await this.drmEngine_.initForPlayback(
-        this.manifest_.variants,
+        playableVariants,
         this.manifest_.offlineSessionIds);
 
     await this.drmEngine_.attach(this.video_);
@@ -6827,7 +6837,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.6.11' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.6.13' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/media_capabilities.js

@@ -191,10 +191,23 @@ shaka.polyfill.MediaCapabilities = class {
       const videoCapabilities = [];
 
       if (mediaCapkeySystemConfig.audio) {
-        const capability = {
+        let capability = {
           robustness: mediaCapkeySystemConfig.audio.robustness || '',
           contentType: mediaDecodingConfig.audio.contentType,
         };
+
+        // Some Tizen devices seem to misreport AC-3 support, but correctly
+        // report EC-3 support. So query EC-3 as a fallback for AC-3.
+        // See https://github.com/shaka-project/shaka-player/issues/2989 for
+        // details.
+        if (shaka.util.Platform.isTizen() &&
+          mediaDecodingConfig.audio.contentType.includes('codecs="ac-3"')) {
+          capability = {
+            robustness: capability.robustness,
+            contentType: 'audio/mp4; codecs="ec-3"',
+          };
+        }
+
         audioCapabilities.push(capability);
       }
 

package/lib/transmuxer/aac_transmuxer.js

@@ -195,6 +195,8 @@ shaka.transmuxer.AacTransmuxer = class {
       videoNalus: [],
       audioConfig: new Uint8Array([]),
       videoConfig: new Uint8Array([]),
+      hSpacing: 0,
+      vSpacing: 0,
       data: {
         sequenceNumber: this.frameIndex_,
         baseMediaDecodeTime: baseMediaDecodeTime,

package/lib/transmuxer/ac3_transmuxer.js

@@ -184,6 +184,8 @@ shaka.transmuxer.Ac3Transmuxer = class {
       videoNalus: [],
       audioConfig: audioConfig,
       videoConfig: new Uint8Array([]),
+      hSpacing: 0,
+      vSpacing: 0,
       data: {
         sequenceNumber: this.frameIndex_,
         baseMediaDecodeTime: baseMediaDecodeTime,

package/lib/transmuxer/ec3_transmuxer.js

@@ -184,6 +184,8 @@ shaka.transmuxer.Ec3Transmuxer = class {
       videoNalus: [],
       audioConfig: audioConfig,
       videoConfig: new Uint8Array([]),
+      hSpacing: 0,
+      vSpacing: 0,
       data: {
         sequenceNumber: this.frameIndex_,
         baseMediaDecodeTime: baseMediaDecodeTime,

package/lib/transmuxer/h264.js

@@ -20,7 +20,8 @@ shaka.transmuxer.H264 = class {
    * describes the properties of upcoming video frames.
    *
    * @param {!Array.<shaka.extern.VideoNalu>} nalus
-   * @return {?{height: number, width: number, videoConfig: !Uint8Array}}
+   * @return {?{height: number, width: number, videoConfig: !Uint8Array,
+   *            hSpacing: number, vSpacing: number}}
    */
   static parseInfo(nalus) {
     const H264 = shaka.transmuxer.H264;
@@ -129,6 +130,30 @@ shaka.transmuxer.H264 = class {
       frameCropBottomOffset = expGolombDecoder.readUnsignedExpGolomb();
     }
 
+    let hSpacing = 1;
+    let vSpacing = 1;
+
+    // vui_parameters_present_flag
+    if (expGolombDecoder.readBoolean()) {
+      // aspect_ratio_info_present_flag
+      if (expGolombDecoder.readBoolean()) {
+        const aspectRatioIdc = expGolombDecoder.readUnsignedByte();
+        const hSpacingTable = [
+          1, 12, 10, 16, 40, 24, 20, 32, 80, 18, 15, 64, 160, 4, 3, 2,
+        ];
+        const vSpacingTable = [
+          1, 11, 11, 11, 33, 11, 11, 11, 33, 11, 11, 33, 99, 3, 2, 1,
+        ];
+        if (aspectRatioIdc > 0 && aspectRatioIdc < 16) {
+          hSpacing = hSpacingTable[aspectRatioIdc - 1];
+          vSpacing = vSpacingTable[aspectRatioIdc - 1];
+        } else if (aspectRatioIdc === 255) {
+          hSpacing = expGolombDecoder.readBits(16);
+          vSpacing = expGolombDecoder.readBits(16);
+        }
+      }
+    }
+
     const height = ((2 - frameMbsOnlyFlag) *
         (picHeightInMapUnitsMinus1 + 1) * 16) - (frameCropTopOffset * 2) -
         (frameCropBottomOffset * 2);
@@ -165,6 +190,8 @@ shaka.transmuxer.H264 = class {
       height,
       width,
       videoConfig,
+      hSpacing,
+      vSpacing,
     };
   }
 

package/lib/transmuxer/h265.js

@@ -20,7 +20,8 @@ shaka.transmuxer.H265 = class {
    * describes the properties of upcoming video frames.
    *
    * @param {!Array.<shaka.extern.VideoNalu>} nalus
-   * @return {?{height: number, width: number, videoConfig: !Uint8Array}}
+   * @return {?{height: number, width: number, videoConfig: !Uint8Array,
+   *            hSpacing: number, vSpacing: number}}
    */
   static parseInfo(nalus) {
     const H265 = shaka.transmuxer.H265;
@@ -87,6 +88,8 @@ shaka.transmuxer.H265 = class {
       height: spsConfiguration.height,
       width: spsConfiguration.width,
       videoConfig,
+      hSpacing: spsConfiguration.sarWidth,
+      vSpacing: spsConfiguration.sarHeight,
     };
   }
 
@@ -298,6 +301,8 @@ shaka.transmuxer.H265 = class {
       }
     }
     let defaultDisplayWindowFlag = false; // for calc offset
+    let sarWidth = 1;
+    let sarHeight = 1;
     let minSpatialSegmentationIdc = 0; // for hvcC
     gb.readBoolean(); // sps_temporal_mvp_enabled_flag
     gb.readBoolean(); // strong_intra_smoothing_enabled_flag
@@ -306,9 +311,18 @@ shaka.transmuxer.H265 = class {
       const aspectRatioInfoPresentFlag = gb.readBoolean();
       if (aspectRatioInfoPresentFlag) {
         const aspectRatioIdc = gb.readUnsignedByte();
-        if (aspectRatioIdc === 255) {
-          gb.readBits(16); // sar_width
-          gb.readBits(16); // sar_height
+        const sarWidthTable = [
+          1, 12, 10, 16, 40, 24, 20, 32, 80, 18, 15, 64, 160, 4, 3, 2,
+        ];
+        const sarHeightTable = [
+          1, 11, 11, 11, 33, 11, 11, 11, 33, 11, 11, 33, 99, 3, 2, 1,
+        ];
+        if (aspectRatioIdc > 0 && aspectRatioIdc < 16) {
+          sarWidth = sarWidthTable[aspectRatioIdc - 1];
+          sarHeight = sarHeightTable[aspectRatioIdc - 1];
+        } else if (aspectRatioIdc === 255) {
+          sarWidth = gb.readBits(16);
+          sarHeight = gb.readBits(16);
         }
       }
       const overscanInfoPresentFlag = gb.readBoolean();
@@ -459,6 +473,8 @@ shaka.transmuxer.H265 = class {
       bitDepthChromaMinus8,
       width: codecWidth,
       height: codecHeight,
+      sarWidth: sarWidth,
+      sarHeight: sarHeight,
     };
   }
 
@@ -773,7 +789,9 @@ shaka.transmuxer.H265.VPSConfiguration;
  *  bitDepthLumaMinus8: number,
  *  bitDepthChromaMinus8: number,
  *  width: number,
- *  height: number
+ *  height: number,
+ *  sarWidth: number,
+ *  sarHeight: number
  * }}
  *
  * @property {number} generalProfileSpace
@@ -797,6 +815,8 @@ shaka.transmuxer.H265.VPSConfiguration;
  * @property {number} bitDepthChromaMinus8
  * @property {number} width
  * @property {number} height
+ * @property {number} sarWidth
+ * @property {number} sarHeight
  */
 shaka.transmuxer.H265.SPSConfiguration;
 

package/lib/transmuxer/mp3_transmuxer.js

@@ -176,6 +176,8 @@ shaka.transmuxer.Mp3Transmuxer = class {
       videoNalus: [],
       audioConfig: new Uint8Array([]),
       videoConfig: new Uint8Array([]),
+      hSpacing: 0,
+      vSpacing: 0,
       data: {
         sequenceNumber: this.frameIndex_,
         baseMediaDecodeTime: baseMediaDecodeTime,

package/lib/transmuxer/ts_transmuxer.js

@@ -409,6 +409,8 @@ shaka.transmuxer.TsTransmuxer = class {
       videoNalus: [],
       audioConfig: new Uint8Array([]),
       videoConfig: new Uint8Array([]),
+      hSpacing: 0,
+      vSpacing: 0,
       data: {
         sequenceNumber: this.frameIndex_,
         baseMediaDecodeTime: baseMediaDecodeTime,
@@ -500,6 +502,8 @@ shaka.transmuxer.TsTransmuxer = class {
       videoNalus: [],
       audioConfig: audioConfig,
       videoConfig: new Uint8Array([]),
+      hSpacing: 0,
+      vSpacing: 0,
       data: {
         sequenceNumber: this.frameIndex_,
         baseMediaDecodeTime: baseMediaDecodeTime,
@@ -591,6 +595,8 @@ shaka.transmuxer.TsTransmuxer = class {
       videoNalus: [],
       audioConfig: audioConfig,
       videoConfig: new Uint8Array([]),
+      hSpacing: 0,
+      vSpacing: 0,
       data: {
         sequenceNumber: this.frameIndex_,
         baseMediaDecodeTime: baseMediaDecodeTime,
@@ -677,6 +683,8 @@ shaka.transmuxer.TsTransmuxer = class {
       videoNalus: [],
       audioConfig: new Uint8Array([]),
       videoConfig: new Uint8Array([]),
+      hSpacing: 0,
+      vSpacing: 0,
       data: {
         sequenceNumber: this.frameIndex_,
         baseMediaDecodeTime: baseMediaDecodeTime,
@@ -769,6 +777,8 @@ shaka.transmuxer.TsTransmuxer = class {
       videoNalus: [],
       audioConfig: new Uint8Array([]),
       videoConfig: info.videoConfig,
+      hSpacing: info.hSpacing,
+      vSpacing: info.vSpacing,
       data: {
         sequenceNumber: this.frameIndex_,
         baseMediaDecodeTime: baseMediaDecodeTime,
@@ -861,6 +871,8 @@ shaka.transmuxer.TsTransmuxer = class {
       videoNalus: [],
       audioConfig: new Uint8Array([]),
       videoConfig: info.videoConfig,
+      hSpacing: info.hSpacing,
+      vSpacing: info.vSpacing,
       data: {
         sequenceNumber: this.frameIndex_,
         baseMediaDecodeTime: baseMediaDecodeTime,

package/lib/util/cmcd_manager.js

@@ -65,6 +65,9 @@ shaka.util.CmcdManager = class {
    */
   configure(config) {
     this.config_ = config;
+    if (this.config_.sessionId && this.config_.sessionId != this.sid_) {
+      this.sid_ = '';
+    }
   }
 
   /**
@@ -407,6 +410,15 @@ shaka.util.CmcdManager = class {
    */
   getObjectTypeFromMimeType_(mimeType) {
     switch (mimeType.toLowerCase()) {
+      case 'audio/mp4':
+      case 'audio/webm':
+      case 'audio/ogg':
+      case 'audio/mpeg':
+      case 'audio/aac':
+      case 'audio/flac':
+      case 'audio/wav':
+        return shaka.util.CmcdManager.ObjectType.AUDIO;
+
       case 'video/webm':
       case 'video/mp4':
       case 'video/mpeg':
@@ -417,6 +429,7 @@ shaka.util.CmcdManager = class {
       case 'application/vnd.apple.mpegurl':
       case 'application/dash+xml':
       case 'video/vnd.mpeg.dash.mpd':
+      case 'application/vnd.ms-sstr+xml':
         return shaka.util.CmcdManager.ObjectType.MANIFEST;
 
       default:

package/lib/util/manifest_parser_utils.js

@@ -179,6 +179,8 @@ shaka.util.ManifestParserUtils.VIDEO_CODEC_REGEXPS_ = [
   /^avc/,
   /^hev/,
   /^hvc/,
+  /^vvc/,
+  /^vvi/,
   /^vp0?[89]/,
   /^av01/,
   /^dvh/,

package/lib/util/mp4_generator.js

@@ -371,12 +371,13 @@ shaka.util.Mp4Generator = class {
     ]);
 
     let boxName = 'avc1';
+    const paspBox = this.pasp_(streamInfo);
     let sinfBox = new Uint8Array([]);
     if (streamInfo.encrypted) {
       sinfBox = this.sinf_(streamInfo);
       boxName = 'encv';
     }
-    return Mp4Generator.box(boxName, avc1Bytes, avcCBox, sinfBox);
+    return Mp4Generator.box(boxName, avc1Bytes, avcCBox, paspBox, sinfBox);
   }
 
   /**
@@ -500,12 +501,34 @@ shaka.util.Mp4Generator = class {
     ]);
 
     let boxName = 'hvc1';
+    const paspBox = this.pasp_(streamInfo);
     let sinfBox = new Uint8Array([]);
     if (streamInfo.encrypted) {
       sinfBox = this.sinf_(streamInfo);
       boxName = 'encv';
     }
-    return Mp4Generator.box(boxName, hvc1Bytes, hvcCBox, sinfBox);
+    return Mp4Generator.box(boxName, hvc1Bytes, hvcCBox, paspBox, sinfBox);
+  }
+
+  /**
+   * Generate a PASP box
+   *
+   * @param {shaka.util.Mp4Generator.StreamInfo} streamInfo
+   * @return {!Uint8Array}
+   * @private
+   */
+  pasp_(streamInfo) {
+    if (!streamInfo.hSpacing && !streamInfo.vSpacing) {
+      return new Uint8Array([]);
+    }
+    const Mp4Generator = shaka.util.Mp4Generator;
+    const hSpacing = streamInfo.hSpacing;
+    const vSpacing = streamInfo.vSpacing;
+    const bytes = new Uint8Array([
+      ...this.breakNumberIntoBytes_(hSpacing, 4), // hSpacing
+      ...this.breakNumberIntoBytes_(vSpacing, 4), // vSpacing
+    ]);
+    return Mp4Generator.box('pasp', bytes);
   }
 
   /**
@@ -1301,6 +1324,8 @@ shaka.util.Mp4Generator.DINF_ = new Uint8Array([]);
  *    videoNalus: !Array.<string>,
  *    audioConfig: !Uint8Array,
  *    videoConfig: !Uint8Array,
+ *    hSpacing: number,
+ *    vSpacing: number,
  *    data: ?shaka.util.Mp4Generator.Data,
  *    stream: !shaka.extern.Stream
  * }}
@@ -1325,6 +1350,10 @@ shaka.util.Mp4Generator.DINF_ = new Uint8Array([]);
  *   The stream's audio config.
  * @property {!Uint8Array} videoConfig
  *   The stream's video config.
+ * @property {number} hSpacing
+ *   The stream's video horizontal spacing of pixels.
+ * @property {number} vSpacing
+ *   The stream's video vertial spacing of pixels.
  * @property {?shaka.util.Mp4Generator.Data} data
  *   The stream's data.
  * @property {!shaka.extern.Stream} stream

package/lib/util/stream_utils.js

@@ -161,7 +161,7 @@ shaka.util.StreamUtils = class {
           const currentCodec =
             MimeUtils.getNormalizedCodec(stream.codecs);
           if (previousCodec == currentCodec) {
-            if (stream.bandwidth < previousStream.bandwidth) {
+            if (stream.bandwidth > previousStream.bandwidth) {
               validVideoStreams.push(stream);
               validVideoIds.push(stream.id);
             }
@@ -848,15 +848,7 @@ shaka.util.StreamUtils = class {
       return 'opus';
     }
 
-    // Some Tizen devices seem to misreport AC-3 support, but correctly
-    // report EC-3 support.  So query EC-3 as a fallback for AC-3.
-    // See https://github.com/shaka-project/shaka-player/issues/2989 for
-    // details.
-    if (shaka.util.Platform.isTizen()) {
-      return codecs.toLowerCase() == 'ac-3' ? 'ec-3' : codecs;
-    } else {
-      return codecs;
-    }
+    return codecs;
   }
 
 

package/package.json

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

package/test/dash/dash_parser_live_unit.js

@@ -642,6 +642,25 @@ describe('DashParser Live', () => {
     expect(updateTick).toHaveBeenCalledTimes(1);
   });
 
+  it('still updates when @minimumUpdatePeriod is zero', async () => {
+    const lines = [
+      '<SegmentTemplate startNumber="1" media="s$Number$.mp4" duration="2" />',
+    ];
+    // updateTime parameter sets @minimumUpdatePeriod in the manifest.
+    const manifestText = makeSimpleLiveManifestText(lines, /* updateTime= */ 0);
+
+    /** @type {!jasmine.Spy} */
+    const tickAfter = updateTickSpy();
+    Date.now = () => 0;
+
+    fakeNetEngine.setResponseText('dummy://foo', manifestText);
+    await parser.start('dummy://foo', playerInterface);
+
+    expect(tickAfter).toHaveBeenCalledTimes(1);
+    const delay = tickAfter.calls.mostRecent().args[0];
+    expect(delay).toBe(0);
+  });
+
   it('uses @minimumUpdatePeriod', async () => {
     const lines = [
       '<SegmentTemplate startNumber="1" media="s$Number$.mp4" duration="2" />',

package/test/player_integration.js

@@ -61,6 +61,46 @@ describe('Player', () => {
     document.body.removeChild(video);
   });
 
+  describe('seek range', () => {
+    // Regression test for Issue #3675.
+    it('has a reasonable seek range after going from live to VOD', async () => {
+      const netEngine = player.getNetworkingEngine();
+      const startTime = Date.now();
+      netEngine.registerRequestFilter((type, request) => {
+        if (type != shaka.net.NetworkingEngine.RequestType.MANIFEST) {
+          return;
+        }
+        // Simulate a live stream by providing different manifests over time.
+        const time = (Date.now() - startTime) / 1000;
+        const manifestNumber = Math.min(5, Math.floor(0.5 + time / 2));
+        request.uris = [
+          '/base/test/test/assets/3675/dash_' + manifestNumber + '.mpd',
+        ];
+        console.log('getting manifest', request.uris);
+      });
+
+      // Play the stream.
+      await player.load('/base/test/test/assets/3675/dash_0.mpd');
+      await video.play();
+
+      // Wait for the stream to be over.
+      eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
+      /** @type {shaka.test.Waiter} */
+      const waiter = new shaka.test.Waiter(eventManager)
+          .setPlayer(player)
+          .timeoutAfter(40)
+          .failOnTimeout(true);
+      await waiter.waitForEnd(video);
+
+      // The stream should have transitioned to VOD by now.
+      expect(player.isLive()).toBe(false);
+
+      // Check that the final seek range is as expected.
+      const seekRange = player.seekRange();
+      expect(seekRange.end).toBeCloseTo(14);
+    });
+  });
+
   describe('attach', () => {
     beforeEach(async () => {
       // To test attach, we want to construct a player without a video element
@@ -908,46 +948,6 @@ describe('Player', () => {
     });
   });
 
-  describe('seek range', () => {
-    // Regression test for Issue #3675.
-    it('has a reasonable seek range after going from live to VOD', async () => {
-      const netEngine = player.getNetworkingEngine();
-      const startTime = Date.now();
-      netEngine.registerRequestFilter((type, request) => {
-        if (type != shaka.net.NetworkingEngine.RequestType.MANIFEST) {
-          return;
-        }
-        // Simulate a live stream by providing different manifests over time.
-        const time = (Date.now() - startTime) / 1000;
-        const manifestNumber = Math.min(5, Math.floor(0.5 + time / 2));
-        request.uris = [
-          '/base/test/test/assets/3675/dash_' + manifestNumber + '.mpd',
-        ];
-        console.log('getting manifest', request.uris);
-      });
-
-      // Play the stream.
-      await player.load('/base/test/test/assets/3675/dash_0.mpd');
-      await video.play();
-
-      // Wait for the stream to be over.
-      eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
-      /** @type {shaka.test.Waiter} */
-      const waiter = new shaka.test.Waiter(eventManager)
-          .setPlayer(player)
-          .timeoutAfter(40)
-          .failOnTimeout(true);
-      await waiter.waitForEnd(video);
-
-      // The stream should have transitioned to VOD by now.
-      expect(player.isLive()).toBe(false);
-
-      // Check that the final seek range is as expected.
-      const seekRange = player.seekRange();
-      expect(seekRange.end).toBeCloseTo(14);
-    });
-  });
-
   describe('buffering', () => {
     const startBuffering = jasmine.objectContaining({buffering: true});
     const endBuffering = jasmine.objectContaining({buffering: false});
@@ -1012,6 +1012,9 @@ describe('Player', () => {
     });
 
     it('buffers ahead of the playhead', async () => {
+      if (window.ManagedMediaSource) {
+        pending('ManagedMediaSource has buffer control signals.');
+      }
       player.configure('streaming.bufferingGoal', 10);
 
       await player.load('test:sintel_long_compiled');
@@ -1036,6 +1039,9 @@ describe('Player', () => {
     });
 
     it('clears buffer behind playhead', async () => {
+      if (window.ManagedMediaSource) {
+        pending('ManagedMediaSource has buffer control signals.');
+      }
       player.configure('streaming.bufferingGoal', 30);
       player.configure('streaming.bufferBehind', 30);
 

package/test/util/stream_utils_unit.js

@@ -826,12 +826,6 @@ describe('StreamUtils', () => {
             stream.size(20, 20);
           });
         });
-        manifest.addVariant(6, (variant) => {
-          variant.addVideo(7, (stream) => {
-            stream.bandwidth = 600000;
-            stream.size(20, 20);
-          });
-        });
       });
 
       shaka.util.StreamUtils.chooseCodecsAndFilterManifest(manifest,
@@ -839,8 +833,8 @@ describe('StreamUtils', () => {
           /* preferredAudioCodecs= */[],
           /* preferredDecodingAttributes= */[]);
 
-      expect(manifest.variants.length).toBe(2);
-      expect(manifest.variants.every((v) => [300000, 500000].includes(
+      expect(manifest.variants.length).toBe(3);
+      expect(manifest.variants.every((v) => [300000, 400000, 500000].includes(
           v.video.bandwidth))).toBeTruthy();
     });