shaka-player 4.6.1 → 4.6.3

package/docs/tutorials/lcevc.md

@@ -24,7 +24,7 @@ LCEVC Decoder library needs to be included in the HTML page:
 ``` 
 - Or use `unpkg.com` for latest LCEVC Decoder libraries.
 ```html 
-<script src="https://unpkg.com/lcevc_dec.js@1.0.0/dist/lcevc_dec.min.js"></script> 
+<script src="https://unpkg.com/lcevc_dec.js@1.0.1/dist/lcevc_dec.min.js"></script>
 ``` 
  
 Configuration to enable LCEVC enhancement: 
@@ -45,7 +45,7 @@ Sample setup using the Shaka Player UI library:
     <link rel="stylesheet" href="dist/controls.css" /> 
  
     <!-- LCEVC decoder compiled library --> 
-    <script src="https://unpkg.com/lcevc_dec.js@1.0.0/dist/lcevc_dec.min.js"></script> 
+    <script src="https://unpkg.com/lcevc_dec.js@1.0.1/dist/lcevc_dec.min.js"></script>
  
     <!-- Application source: --> 
     <script src="app.js"></script> 

package/externs/lcevc.js

@@ -1,3 +1,9 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2023 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /**
 * @fileoverview Externs for LcevcDec
 * compiler.

package/externs/shaka/codecs.js

@@ -1,3 +1,9 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2023 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /**
  * @typedef {{
  *   data: !Uint8Array,

package/externs/shaka/transmuxer.js

@@ -1,3 +1,9 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2023 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /**
  * @fileoverview Externs for Transmuxer.
  *

package/lib/cea/cea608_memory.js

@@ -84,8 +84,10 @@ shaka.cea.Cea608Memory = class {
         startTime, endTime, /* payload= */ '');
     topLevelCue.lineInterpretation =
         shaka.text.Cue.lineInterpretation.PERCENTAGE;
-    const maxRows = shaka.cea.Cea608Memory.CC_ROWS + 1;
-    topLevelCue.line = this.row_ / maxRows * 100;
+    const line = shaka.cea.Cea608Memory.ROW_TO_LINE_CONVERSION_.get(this.row_);
+    if (line) {
+      topLevelCue.line = line;
+    }
     return shaka.cea.CeaUtils.getParsedCaption(
         topLevelCue, stream, this.rows_, startTime, endTime);
   }
@@ -320,3 +322,12 @@ shaka.cea.Cea608Memory.CharSet.ExtendedPortugueseGerman = new Map([
   [0x38, 'Å'], [0x39, 'å'], [0x3a, 'Ø'], [0x3b, 'ø'], [0x3c, '┌'], [0x3d, '┐'],
   [0x3e, '└'], [0x3f, '┘'],
 ]);
+
+/**
+ * @private @const {!Map<number, number>}
+ */
+shaka.cea.Cea608Memory.ROW_TO_LINE_CONVERSION_ = new Map([
+  [1, 10], [2, 15.33], [3, 20.66], [4, 26], [5, 31.33], [6, 36.66], [7, 42],
+  [8, 47.33], [9, 52.66], [10, 58], [11, 63.33], [12, 68.66], [13, 74],
+  [14, 79.33], [15, 84.66],
+]);

package/lib/dash/dash_parser.js

@@ -1433,11 +1433,11 @@ shaka.dash.DashParser = class {
             'Must have Segment* with non-text streams.');
 
         const duration = context.periodInfo.duration || 0;
+        const getBaseUris = context.representation.getBaseUris;
         streamInfo = {
           generateSegmentIndex: () => {
-            const baseUris = context.representation.getBaseUris();
             return Promise.resolve(shaka.media.SegmentIndex.forSingleSegment(
-                periodStart, duration, baseUris));
+                periodStart, duration, getBaseUris()));
           },
         };
       }

package/lib/hls/hls_parser.js

@@ -934,7 +934,8 @@ shaka.hls.HlsParser = class {
         return basicInfo;
       }
     } else if (extension == 'mp4' || extension == 'cmfv' ||
-        contentMimeType == 'video/mp4' || contentMimeType == 'audio/mp4' ||
+        extension == 'm4s' || contentMimeType == 'video/mp4' ||
+        contentMimeType == 'audio/mp4' ||
         contentMimeType == 'video/iso.segment') {
       const basicInfo = shaka.media.SegmentUtils.getBasicInfoFromMp4(
           initData, response.data);

package/lib/media/media_source_engine.js

@@ -1661,6 +1661,7 @@ shaka.media.MediaSourceEngine = class {
     if (shaka.media.Capabilities.isChangeTypeSupported()) {
       if (this.transmuxers_[contentType]) {
         this.transmuxers_[contentType].destroy();
+        delete this.transmuxers_[contentType];
       }
       if (transmuxer) {
         this.transmuxers_[contentType] = transmuxer;
@@ -1859,8 +1860,8 @@ shaka.media.MediaSourceEngine = class {
       }
     }
 
-    const newCodec = MimeUtils.getCodecBase(
-        MimeUtils.getCodecs(newMimeType));
+    const newAllCodecs = MimeUtils.getCodecs(newMimeType);
+    const newCodec = MimeUtils.getCodecBase(newAllCodecs);
     const newBasicType = MimeUtils.getBasicType(newMimeType);
 
     // Current/new codecs base and basic type match then no need to switch
@@ -1868,10 +1869,15 @@ shaka.media.MediaSourceEngine = class {
       return false;
     }
 
-    if (this.config_.codecSwitchingStrategy ===
+    let allowChangeType = true;
+    if (this.needSplitMuxedContent_ || (newAllCodecs.split(',').length &&
+        transmuxer && !this.transmuxers_[contentType])) {
+      allowChangeType = false;
+    }
+
+    if (allowChangeType && this.config_.codecSwitchingStrategy ===
         shaka.config.CodecSwitchingStrategy.SMOOTH &&
-          shaka.media.Capabilities.isChangeTypeSupported() &&
-            !this.needSplitMuxedContent_) {
+          shaka.media.Capabilities.isChangeTypeSupported()) {
       await this.changeType(contentType, newMimeType, transmuxer);
     } else {
       if (transmuxer) {

package/lib/media/segment_reference.js

@@ -128,7 +128,8 @@ shaka.media.InitSegmentReference = class {
     } else {
       return reference1.getStartByte() == reference2.getStartByte() &&
           reference1.getEndByte() == reference2.getEndByte() &&
-          ArrayUtils.equal(reference1.getUris(), reference2.getUris()) &&
+          ArrayUtils.equal(
+              reference1.getUris().sort(), reference2.getUris().sort()) &&
           BufferUtils.equal(reference1.getSegmentData(),
               reference2.getSegmentData());
     }

package/lib/media/streaming_engine.js

@@ -1792,7 +1792,7 @@ shaka.media.StreamingEngine = class {
         reference.initSegmentReference, mediaState.lastInitSegmentReference)) {
       mediaState.lastInitSegmentReference = reference.initSegmentReference;
 
-      if (reference.initSegmentReference) {
+      if (reference.isIndependent() && reference.initSegmentReference) {
         shaka.log.v1(logPrefix, 'fetching init segment');
 
         const fetchInit =

package/lib/player.js

@@ -6781,7 +6781,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.6.1' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.6.3' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/ui_text_displayer.js

@@ -44,6 +44,9 @@ shaka.text.UITextDisplayer = class {
     /** @private {HTMLElement} */
     this.videoContainer_ = videoContainer;
 
+    /** @private {?number} */
+    this.aspectRatio_ = null;
+
     /** @type {HTMLElement} */
     this.textContainer_ = shaka.util.Dom.createHTMLElement('div');
     this.textContainer_.classList.add('shaka-text-container');
@@ -90,6 +93,23 @@ shaka.text.UITextDisplayer = class {
       this.updateCaptions_(/* forceUpdate= */ true);
     });
 
+    // From: https://html.spec.whatwg.org/multipage/media.html#dom-video-videowidth
+    // Whenever the natural width or natural height of the video changes
+    // (including, for example, because the selected video track was changed),
+    // if the element's readyState attribute is not HAVE_NOTHING, the user
+    // agent must queue a media element task given the media element to fire an
+    // event named resize at the media element.
+    this.eventManager_.listen(this.video_, 'resize', () => {
+      const element = /** @type {!HTMLVideoElement} */ (this.video_);
+      const width = element.videoWidth;
+      const height = element.videoHeight;
+      if (width && height) {
+        this.aspectRatio_ = width / height;
+      } else {
+        this.aspectRatio_ = null;
+      }
+    });
+
     /** @private {ResizeObserver} */
     this.resizeObserver_ = null;
     if ('ResizeObserver' in window) {
@@ -400,6 +420,10 @@ shaka.text.UITextDisplayer = class {
    */
   getRegionElement_(cue) {
     const region = cue.region;
+    // from https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#caption-window-size
+    // if aspect ratio is 4/3, use that value, otherwise, use the 16:9 value
+    const lineWidthMultiple = this.aspectRatio_ === 4/3 ? 2.5 : 1.9;
+    const lineHeightMultiple = 5.33;
 
     const regionId = this.generateRegionId_(region);
     if (this.regionElements_.has(regionId)) {
@@ -417,11 +441,33 @@ shaka.text.UITextDisplayer = class {
     regionElement.id = 'shaka-text-region---' + regionId;
     regionElement.classList.add('shaka-text-region');
 
-    regionElement.style.height = region.height + heightUnit;
-    regionElement.style.width = region.width + widthUnit;
     regionElement.style.position = 'absolute';
-    regionElement.style.top = region.viewportAnchorY + viewportAnchorUnit;
-    regionElement.style.left = region.viewportAnchorX + viewportAnchorUnit;
+
+    const linesUnit = shaka.text.CueRegion.units.LINES;
+    if (region.heightUnits === linesUnit && region.widthUnits === linesUnit) {
+      regionElement.style.height = region.height * lineHeightMultiple + '%';
+      regionElement.style.width = region.width * lineWidthMultiple + '%';
+    } else {
+      regionElement.style.height = region.height + heightUnit;
+      regionElement.style.width = region.width + widthUnit;
+    }
+
+    if (region.viewportAnchorUnits === linesUnit) {
+      // from https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#positioning-in-cea-708
+      let top = region.viewportAnchorY / 75 * 100;
+      const windowWidth = this.aspectRatio_ === 4/3 ? 160 : 210;
+      let left = region.viewportAnchorX / windowWidth * 100;
+      // adjust top and left values based on the region anchor and window size
+      top -= region.regionAnchorY * region.height * lineHeightMultiple / 100;
+      left -= region.regionAnchorX * region.width * lineWidthMultiple / 100;
+      regionElement.style.top = top + '%';
+      regionElement.style.left = left + '%';
+    } else {
+      regionElement.style.top = region.viewportAnchorY -
+        region.regionAnchorY * region.height / 100 + viewportAnchorUnit;
+      regionElement.style.left = region.viewportAnchorX -
+        region.regionAnchorX * region.width / 100 + viewportAnchorUnit;
+    }
 
     regionElement.style.display = 'flex';
     regionElement.style.flexDirection = 'column';

package/lib/transmuxer/ts_transmuxer.js

@@ -242,6 +242,9 @@ shaka.transmuxer.TsTransmuxer = class {
         }
       }
     } catch (e) {
+      if (e && e.code == shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA) {
+        return Promise.resolve(new Uint8Array([]));
+      }
       return Promise.reject(e);
     }
 
@@ -704,6 +707,12 @@ shaka.transmuxer.TsTransmuxer = class {
 
     let nalus = [];
     const videoData = tsParser.getVideoData();
+    if (!videoData.length) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MEDIA,
+          shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA);
+    }
     for (let i = 0; i < videoData.length; i++) {
       const pes = videoData[i];
       const dataNalus = pes.nalus;
@@ -790,6 +799,12 @@ shaka.transmuxer.TsTransmuxer = class {
 
     let nalus = [];
     const videoData = tsParser.getVideoData();
+    if (!videoData.length) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MEDIA,
+          shaka.util.Error.Code.TRANSMUXING_NO_VIDEO_DATA);
+    }
     for (let i = 0; i < videoData.length; i++) {
       const pes = videoData[i];
       const dataNalus = pes.nalus;

package/lib/util/error.js

@@ -511,6 +511,12 @@ shaka.util.Error.Code = {
    */
   'MSS_TRANSMUXING_FAILED': 3022,
 
+  /**
+   * An internal error which indicates that transmuxing operation has no video
+   * data. This should not be seen by applications.
+   */
+  'TRANSMUXING_NO_VIDEO_DATA': 3023,
+
 
   /**
    * The Player was unable to guess the manifest type based on file extension

package/lib/util/mp4_box_parsers.js

@@ -301,11 +301,45 @@ shaka.util.Mp4BoxParsers = class {
    */
   static parseESDS(reader) {
     let codec = 'mp4a';
-    reader.skip(11);
-    codec += '.' + this.toHex_(reader.readUint8());
-    // this value is only a single digit
-    codec += '.' +
-        this.toHex_((reader.readUint8() >>> 2) & 0x3f).replace(/^0/, '');
+    let tag;
+    let oti;
+    while (reader.hasMoreData()) {
+      tag = reader.readUint8();
+      let byteRead = reader.readUint8();
+      while (byteRead & 0x80) {
+        byteRead = reader.readUint8();
+      }
+      if (tag == 0x03) {
+        reader.readUint16();
+        const flags = reader.readUint8();
+        if (flags & 0x80) {
+          reader.readUint16();
+        }
+        if (flags & 0x40) {
+          reader.skip(reader.readUint8());
+        }
+        if (flags & 0x20) {
+          reader.readUint16();
+        }
+      } else if (tag == 0x04) {
+        oti = reader.readUint8();
+        reader.skip(12);
+      } else if (tag == 0x05) {
+        break;
+      }
+    }
+    if (oti) {
+      codec += '.' + this.toHex_(oti);
+      if (tag == 0x05 && reader.hasMoreData()) {
+        const firstData = reader.readUint8();
+        let audioObjectType = (firstData & 0xF8) >> 3;
+        if (audioObjectType === 31 && reader.hasMoreData()) {
+          audioObjectType = 32 + ((firstData & 0x7) << 3) +
+              ((reader.readUint8() & 0xE0) >> 5);
+        }
+        codec += '.' + audioObjectType;
+      }
+    }
     return {codec};
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.6.1",
+  "version": "4.6.3",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -48,7 +48,7 @@
     "karma-sourcemap-loader": "^0.3.8",
     "karma-spec-reporter": "^0.0.34",
     "karma-webdriver-launcher": "^1.0.8",
-    "lcevc_dec.js": "^1.0.0",
+    "lcevc_dec.js": "^1.0.1",
     "less": "https://gitpkg.now.sh/joeyparrish/less.js/packages/less?28c63a43",
     "less-plugin-clean-css": "github:austingardner/less-plugin-clean-css#4e9e77bf",
     "material-design-lite": "^1.3.0",

package/test/cea/cea608_memory_unit.js

@@ -31,7 +31,7 @@ describe('Cea608Memory', () => {
     const caption = memory.forceEmit(startTime, endTime);
 
     const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
-    topLevelCue.line = 6.25;
+    topLevelCue.line = 10;
     topLevelCue.lineInterpretation =
         shaka.text.Cue.lineInterpretation.PERCENTAGE;
     topLevelCue.nestedCues = [
@@ -82,7 +82,7 @@ describe('Cea608Memory', () => {
     }
 
     const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
-    topLevelCue.line = 6.25;
+    topLevelCue.line = 10;
     topLevelCue.lineInterpretation =
         shaka.text.Cue.lineInterpretation.PERCENTAGE;
     topLevelCue.nestedCues = [
@@ -119,7 +119,7 @@ describe('Cea608Memory', () => {
     }
 
     const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
-    topLevelCue.line = 6.25;
+    topLevelCue.line = 10;
     topLevelCue.lineInterpretation =
         shaka.text.Cue.lineInterpretation.PERCENTAGE;
     topLevelCue.nestedCues = [
@@ -173,7 +173,7 @@ describe('Cea608Memory', () => {
     // ...
     // So we expect that test\n\ntest is emitted
     const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
-    topLevelCue.line = 37.5;
+    topLevelCue.line = 36.66;
     topLevelCue.lineInterpretation =
         shaka.text.Cue.lineInterpretation.PERCENTAGE;
     topLevelCue.nestedCues = [
@@ -217,7 +217,7 @@ describe('Cea608Memory', () => {
     memory.eraseChar(); // Erase the last 't' from 'testt'
 
     const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
-    topLevelCue.line = 6.25;
+    topLevelCue.line = 10;
     topLevelCue.lineInterpretation =
         shaka.text.Cue.lineInterpretation.PERCENTAGE;
     topLevelCue.nestedCues = [
@@ -291,7 +291,7 @@ describe('Cea608Memory', () => {
 
       // Expected text is 's\nt\nt\ne'
       const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
-      topLevelCue.line = 31.25;
+      topLevelCue.line = 31.33;
       topLevelCue.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [
@@ -338,7 +338,7 @@ describe('Cea608Memory', () => {
 
       // Expected text is 't\ne\ns\nt'
       const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
-      topLevelCue.line = 31.25;
+      topLevelCue.line = 31.33;
       topLevelCue.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [
@@ -385,7 +385,7 @@ describe('Cea608Memory', () => {
 
       // Expected text is 't\ne\ns\nt'
       const topLevelCue = new shaka.text.Cue(startTime, endTime, '');
-      topLevelCue.line = 31.25;
+      topLevelCue.line = 31.33;
       topLevelCue.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [

package/test/cea/cea_decoder_unit.js

@@ -65,7 +65,7 @@ describe('CeaDecoder', () => {
 
       const topLevelCue = new shaka.text.Cue(
           startTimeCaption1, startTimeCaption2, '');
-      topLevelCue.line = 81.25;
+      topLevelCue.line = 74;
       topLevelCue.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [
@@ -113,7 +113,7 @@ describe('CeaDecoder', () => {
       // Since there are three style changes, there should be three nested cues.
       const topLevelCue = new shaka.text.Cue(
           startTimeCaption1, startTimeCaption2, '');
-      topLevelCue.line = 6.25;
+      topLevelCue.line = 10;
       topLevelCue.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
 
@@ -166,7 +166,7 @@ describe('CeaDecoder', () => {
       // A single nested cue containing yellow, italicized text.
       const topLevelCue = new shaka.text.Cue(startTimeCaption1,
           startTimeCaption2, '');
-      topLevelCue.line = 12.5;
+      topLevelCue.line = 15.33;
       topLevelCue.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [
@@ -208,7 +208,7 @@ describe('CeaDecoder', () => {
 
       const topLevelCue = new shaka.text.Cue(startTimeCaption1,
           startTimeCaption2, '');
-      topLevelCue.line = 6.25;
+      topLevelCue.line = 10;
       topLevelCue.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [
@@ -243,7 +243,7 @@ describe('CeaDecoder', () => {
 
       const topLevelCue = new shaka.text.Cue(startTimeCaption1,
           startTimeCaption2, '');
-      topLevelCue.line = 6.25;
+      topLevelCue.line = 10;
       topLevelCue.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue.nestedCues = [
@@ -315,7 +315,7 @@ describe('CeaDecoder', () => {
       // Top level cue corresponding to the first closed caption.
       const topLevelCue1 = new shaka.text.Cue(
           /* startTime= */ time1, /* endTime= */ time2, '');
-      topLevelCue1.line = 93.75;
+      topLevelCue1.line = 84.66;
       topLevelCue1.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue1.nestedCues = [
@@ -326,7 +326,7 @@ describe('CeaDecoder', () => {
       // Top level cue corresponding to the second closed caption.
       const topLevelCue2 = new shaka.text.Cue(
           /* startTime= */ time2, /* endTime= */ time3, '');
-      topLevelCue2.line = 93.75;
+      topLevelCue2.line = 84.66;
       topLevelCue2.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue2.nestedCues = [
@@ -343,7 +343,7 @@ describe('CeaDecoder', () => {
       // Top level cue corresponding to the third closed caption.
       const topLevelCue3 = new shaka.text.Cue(
           /* startTime= */ time3, /* endTime= */ time4, '');
-      topLevelCue3.line = 93.75;
+      topLevelCue3.line = 84.66;
       topLevelCue3.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue3.nestedCues = [
@@ -360,7 +360,7 @@ describe('CeaDecoder', () => {
       // Top level cue corresponding to the fourth closed caption.
       const topLevelCue4 = new shaka.text.Cue(
           /* startTime= */ time4, /* endTime= */ time5, '');
-      topLevelCue4.line = 93.75;
+      topLevelCue4.line = 84.66;
       topLevelCue4.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue4.nestedCues = [
@@ -433,7 +433,7 @@ describe('CeaDecoder', () => {
       // Top level cue corresponding to the first closed caption.
       const topLevelCue1 = new shaka.text.Cue(/* startTime= */ 1,
           /* endTime= */ 2, '');
-      topLevelCue1.line = 93.75;
+      topLevelCue1.line = 84.66;
       topLevelCue1.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue1.nestedCues = [
@@ -444,7 +444,7 @@ describe('CeaDecoder', () => {
       // Top level cue corresponding to the second closed caption.
       const topLevelCue2 = new shaka.text.Cue(/* startTime= */ 2,
           /* endTime= */ 3, '');
-      topLevelCue2.line = 25;
+      topLevelCue2.line = 26;
       topLevelCue2.lineInterpretation =
           shaka.text.Cue.lineInterpretation.PERCENTAGE;
       topLevelCue2.nestedCues = [

package/test/demo/demo_unit.js

@@ -74,14 +74,11 @@ describe('Demo', () => {
     function checkConfig(checkValueNameFn) {
       const configPrimitives = new Set(['number', 'string', 'boolean']);
       const exceptions = new Set()
-          .add('preferredVariantRole')
           .add('playRangeStart')
           .add('playRangeEnd')
           .add('manifest.dash.keySystemsByURI')
-          .add('manifest.hls.mediaPlaylistFullMimeType')
           .add('manifest.mss.keySystemsBySystemId')
           .add('drm.keySystemsMapping')
-          .add('streaming.parsePrftBox')
           .add('manifest.raiseFatalErrorOnManifestUpdateRequestFailure')
           .add('drm.persistentSessionOnlinePlayback')
           .add('drm.persistentSessionsMetadata');

package/test/util/mp4_box_parsers_unit.js

@@ -8,18 +8,24 @@ describe('Mp4BoxParsers', () => {
   const videoInitSegmentUri = '/base/test/test/assets/sintel-video-init.mp4';
   const videoSegmentUri = '/base/test/test/assets/sintel-video-segment.mp4';
 
+  const audioInitSegmentXheAacUri = '/base/test/test/assets/audio-xhe-aac.mp4';
+
   /** @type {!ArrayBuffer} */
   let videoInitSegment;
   /** @type {!ArrayBuffer} */
   let videoSegment;
+  /** @type {!ArrayBuffer} */
+  let audioInitSegmentXheAac;
 
   beforeAll(async () => {
     const responses = await Promise.all([
       shaka.test.Util.fetch(videoInitSegmentUri),
       shaka.test.Util.fetch(videoSegmentUri),
+      shaka.test.Util.fetch(audioInitSegmentXheAacUri),
     ]);
     videoInitSegment = responses[0];
     videoSegment = responses[1];
+    audioInitSegmentXheAac = responses[2];
   });
 
   it('parses init segment', () => {
@@ -157,6 +163,36 @@ describe('Mp4BoxParsers', () => {
     expect(baseMediaDecodeTime).toBe(expectedBaseMediaDecodeTime);
   });
 
+  it('parses ESDS box for xHE-AAC segment', () => {
+    let channelCount;
+    let sampleRate;
+    let codec;
+
+    const Mp4Parser = shaka.util.Mp4Parser;
+    new Mp4Parser()
+        .box('moov', Mp4Parser.children)
+        .box('trak', Mp4Parser.children)
+        .box('mdia', Mp4Parser.children)
+        .box('minf', Mp4Parser.children)
+        .box('stbl', Mp4Parser.children)
+        .fullBox('stsd', Mp4Parser.sampleDescription)
+        .box('mp4a', (box) => {
+          const parsedMP4ABox = shaka.util.Mp4BoxParsers.parseMP4A(box.reader);
+          channelCount = parsedMP4ABox.channelCount;
+          sampleRate = parsedMP4ABox.sampleRate;
+          if (box.reader.hasMoreData()) {
+            Mp4Parser.children(box);
+          }
+        })
+        .box('esds', (box) => {
+          const parsedESDSBox = shaka.util.Mp4BoxParsers.parseESDS(box.reader);
+          codec = parsedESDSBox.codec;
+        }).parse(audioInitSegmentXheAac, /* partialOkay= */ false);
+    expect(channelCount).toBe(2);
+    expect(sampleRate).toBe(48000);
+    expect(codec).toBe('mp4a.40.42');
+  });
+
   /**
    *
    * Explanation on the Uint8Array:

package/ui/presentation_time.js

@@ -64,7 +64,6 @@ shaka.ui.PresentationTimeTracker = class extends shaka.ui.Element {
   updateTime_() {
     const isSeeking = this.controls.isSeeking();
     let displayTime = this.controls.getDisplayTime();
-    const duration = this.video.duration;
     const seekRange = this.player.seekRange();
     const seekRangeSize = seekRange.end - seekRange.start;
     const Utils = shaka.ui.Utils;
@@ -89,11 +88,12 @@ shaka.ui.PresentationTimeTracker = class extends shaka.ui.Element {
         this.currentTime_.disabled = true;
       }
     } else {
-      const showHour = duration >= 3600;
+      const showHour = seekRangeSize >= 3600;
 
-      let value = Utils.buildTimeString(displayTime, showHour);
-      if (duration) {
-        value += ' / ' + Utils.buildTimeString(duration, showHour);
+      const currentTime = Math.max(0, displayTime - seekRange.start);
+      let value = Utils.buildTimeString(currentTime, showHour);
+      if (seekRangeSize) {
+        value += ' / ' + Utils.buildTimeString(seekRangeSize, showHour);
       }
       this.setValue_(value);
       this.currentTime_.disabled = true;