shaka-player 4.6.0 → 4.6.2

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/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

@@ -285,7 +285,8 @@ shaka.dash.DashParser = class {
 
     // For redirections add the response uri to the first entry in the
     // Manifest Uris array.
-    if (response.uri && !this.manifestUris_.includes(response.uri)) {
+    if (response.uri && response.uri != response.originalUri &&
+        !this.manifestUris_.includes(response.uri)) {
       this.manifestUris_.unshift(response.uri);
     }
 
@@ -373,19 +374,16 @@ shaka.dash.DashParser = class {
 
     const contentSteering = XmlUtils.findChild(mpd, 'ContentSteering');
     if (contentSteering && this.playerInterface_) {
-      const hasPrevContentSteeringManager = !!this.contentSteeringManager_;
+      const defaultPathwayId =
+          contentSteering.getAttribute('defaultServiceLocation');
       if (!this.contentSteeringManager_) {
         this.contentSteeringManager_ =
             new shaka.util.ContentSteeringManager(this.playerInterface_);
-      }
-      this.contentSteeringManager_.configure(this.config_);
-      this.contentSteeringManager_.setBaseUris(manifestBaseUris);
-      this.contentSteeringManager_.setManifestType(
-          shaka.media.ManifestParser.DASH);
-      const defaultPathwayId =
-          contentSteering.getAttribute('defaultServiceLocation');
-      this.contentSteeringManager_.setDefaultPathwayId(defaultPathwayId);
-      if (!hasPrevContentSteeringManager) {
+        this.contentSteeringManager_.configure(this.config_);
+        this.contentSteeringManager_.setManifestType(
+            shaka.media.ManifestParser.DASH);
+        this.contentSteeringManager_.setBaseUris(manifestBaseUris);
+        this.contentSteeringManager_.setDefaultPathwayId(defaultPathwayId);
         const uri = XmlUtils.getContents(contentSteering);
         if (uri) {
           const queryBeforeStart =
@@ -398,6 +396,9 @@ shaka.dash.DashParser = class {
             this.contentSteeringManager_.requestInfo(uri);
           }
         }
+      } else {
+        this.contentSteeringManager_.setBaseUris(manifestBaseUris);
+        this.contentSteeringManager_.setDefaultPathwayId(defaultPathwayId);
       }
     }
 

package/lib/dash/segment_template.js

@@ -141,7 +141,8 @@ shaka.dash.SegmentTemplate = class {
         );
       } else {
         const tsi = /** @type {!TimelineSegmentIndex} */(segmentIndex);
-        tsi.appendTemplateInfo(info, periodStart, periodEnd, shouldFit);
+        tsi.appendTemplateInfo(
+            info, periodStart, periodEnd, shouldFit, initSegmentReference);
 
         const availabilityStart =
           context.presentationTimeline.getSegmentAvailabilityStart();
@@ -167,7 +168,7 @@ shaka.dash.SegmentTemplate = class {
           if (segmentIndex instanceof shaka.dash.TimelineSegmentIndex &&
               segmentIndex.isEmpty()) {
             segmentIndex.appendTemplateInfo(info, periodStart,
-                periodEnd, shouldFit);
+                periodEnd, shouldFit, initSegmentReference);
           }
           return Promise.resolve(segmentIndex);
         },
@@ -684,8 +685,11 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
    * @param {number} periodStart
    * @param {number} periodEnd
    * @param {boolean} shouldFit
+   * @param {shaka.media.InitSegmentReference} initSegmentReference
    */
-  appendTemplateInfo(info, periodStart, periodEnd, shouldFit) {
+  appendTemplateInfo(info, periodStart, periodEnd, shouldFit,
+      initSegmentReference) {
+    this.initSegmentReference_ = initSegmentReference;
     if (!this.templateInfo_) {
       this.templateInfo_ = info;
       this.periodStart_ = periodStart;
@@ -693,6 +697,8 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     } else {
       const currentTimeline = this.templateInfo_.timeline;
 
+      this.templateInfo_.mediaTemplate = info.mediaTemplate;
+
       // Append timeline
       const lastCurrentEntry = currentTimeline[currentTimeline.length - 1];
       const newEntries = info.timeline.filter((entry) => {

package/lib/hls/hls_parser.js

@@ -1672,9 +1672,15 @@ shaka.hls.HlsParser = class {
     // the value NONE. If the value is a quoted-string, it MUST match the
     // value of the GROUP-ID attribute of an EXT-X-MEDIA tag elsewhere in the
     // Playlist whose TYPE attribute is CLOSED-CAPTIONS.
-    if (type == ContentType.VIDEO && closedCaptionsAttr &&
-    closedCaptionsAttr != 'NONE') {
-      return this.groupIdToClosedCaptionsMap_.get(closedCaptionsAttr);
+    if (type == ContentType.VIDEO) {
+      if (closedCaptionsAttr && closedCaptionsAttr != 'NONE') {
+        return this.groupIdToClosedCaptionsMap_.get(closedCaptionsAttr);
+      } else if (!closedCaptionsAttr &&
+          this.groupIdToClosedCaptionsMap_.size) {
+        for (const key of this.groupIdToClosedCaptionsMap_.keys()) {
+          return this.groupIdToClosedCaptionsMap_.get(key);
+        }
+      }
     }
     return null;
   }

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

@@ -1351,6 +1351,7 @@ shaka.media.StreamingEngine = class {
         let remaining = new Uint8Array(0);
         let processingResult = false;
         let callbackCalled = false;
+        let streamDataCallbackError;
         const streamDataCallback = async (data) => {
           if (processingResult) {
             // If the fallback result processing was triggered, don't also
@@ -1363,40 +1364,47 @@ shaka.media.StreamingEngine = class {
           if (this.fatalError_) {
             return;
           }
-          // Append the data with complete boxes.
-          // Every time streamDataCallback gets called, append the new data to
-          // the remaining data.
-          // Find the last fully completed Mdat box, and slice the data into two
-          // parts: the first part with completed Mdat boxes, and the second
-          // part with an incomplete box.
-          // Append the first part, and save the second part as remaining data,
-          // and handle it with the next streamDataCallback call.
-          remaining = this.concatArray_(remaining, data);
-          let sawMDAT = false;
-          let offset = 0;
-          new shaka.util.Mp4Parser()
-              .box('mdat', (box) => {
-                offset = box.size + box.start;
-                sawMDAT = true;
-              })
-              .parse(remaining, /* partialOkay= */ false,
+          try {
+            // Append the data with complete boxes.
+            // Every time streamDataCallback gets called, append the new data
+            // to the remaining data.
+            // Find the last fully completed Mdat box, and slice the data into
+            // two parts: the first part with completed Mdat boxes, and the
+            // second part with an incomplete box.
+            // Append the first part, and save the second part as remaining
+            // data, and handle it with the next streamDataCallback call.
+            remaining = this.concatArray_(remaining, data);
+            let sawMDAT = false;
+            let offset = 0;
+            new shaka.util.Mp4Parser()
+                .box('mdat', (box) => {
+                  offset = box.size + box.start;
+                  sawMDAT = true;
+                })
+                .parse(remaining, /* partialOkay= */ false,
+                    /* isChunkedData= */ true);
+            if (sawMDAT) {
+              const dataToAppend = remaining.subarray(0, offset);
+              remaining = remaining.subarray(offset);
+              await this.append_(
+                  mediaState, presentationTime, stream, reference, dataToAppend,
                   /* isChunkedData= */ true);
-          if (sawMDAT) {
-            const dataToAppend = remaining.subarray(0, offset);
-            remaining = remaining.subarray(offset);
-            await this.append_(
-                mediaState, presentationTime, stream, reference, dataToAppend,
-                /* isChunkedData= */ true);
-
-            if (mediaState.segmentPrefetch && mediaState.segmentIterator) {
-              mediaState.segmentPrefetch.prefetchSegments(
-                  reference, /* skipFirst= */ true);
+
+              if (mediaState.segmentPrefetch && mediaState.segmentIterator) {
+                mediaState.segmentPrefetch.prefetchSegments(
+                    reference, /* skipFirst= */ true);
+              }
             }
+          } catch (error) {
+            streamDataCallbackError = error;
           }
         };
 
         const result =
             await this.fetch_(mediaState, reference, streamDataCallback);
+        if (streamDataCallbackError) {
+          throw streamDataCallbackError;
+        }
         if (!callbackCalled) {
           // In some environments, we might be forced to use network plugins
           // that don't support streamDataCallback. In those cases, as a
@@ -1784,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

@@ -4595,9 +4595,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       }
       await this.addSrcTrackElement_(uri, language, kind, mimeType, label || '',
           adCuePoints);
+
+      const LanguageUtils = shaka.util.LanguageUtils;
+      const languageNormalized = LanguageUtils.normalize(language);
+
       const textTracks = this.getTextTracks();
       const srcTrack = textTracks.find((t) => {
-        return t.language == language &&
+        return LanguageUtils.normalize(t.language) == languageNormalized &&
             t.label == (label || '') &&
             t.kind == kind;
       });
@@ -6777,7 +6781,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.6.0' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.6.2' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.6.0",
+  "version": "4.6.2",
   "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/hls/hls_parser_unit.js

@@ -750,6 +750,46 @@ describe('HlsParser', () => {
     await testHlsParser(master, media, manifest);
   });
 
+  it('parses audio+video variant with global closed captions', async () => {
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="eng",CHANNELS="2",',
+      'URI="audio"\n',
+      '#EXT-X-MEDIA:TYPE=CLOSED-CAPTIONS,GROUP-ID="cap1",LANGUAGE="eng",',
+      'INSTREAM-ID="CC1"\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1,mp4a",',
+      'RESOLUTION=960x540,FRAME-RATE=60,AUDIO="aud1"\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 closedCaptions = new Map([['CC1', 'en']]);
+    const manifest = shaka.test.ManifestGenerator.generate((manifest) => {
+      manifest.anyTimeline();
+      manifest.addPartialVariant((variant) => {
+        variant.addPartialStream(ContentType.VIDEO, (stream) => {
+          stream.closedCaptions = closedCaptions;
+          stream.mime('video/mp4', 'avc1');
+        });
+        variant.addPartialStream(ContentType.AUDIO, (stream) => {
+          stream.mime('audio/mp4', 'mp4a');
+        });
+      });
+      manifest.sequenceMode = sequenceMode;
+      manifest.type = shaka.media.ManifestParser.HLS;
+    });
+
+    await testHlsParser(master, media, manifest);
+  });
+
   it('parses audio+video variant with no closed captions', async () => {
     const master = [
       '#EXTM3U\n',

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;