shaka-player 4.9.34 → 4.9.35

package/lib/cea/cea708_service.js

@@ -60,7 +60,7 @@ shaka.cea.Cea708Service = class {
     // Control codes are in 1 of 4 logical groups:
     // CL (C0, C2), CR (C1, C3), GL (G0, G2), GR (G1, G2).
     if (controlCode >= 0x00 && controlCode <= 0x1f) {
-      return this.handleC0_(controlCode, pts);
+      return this.handleC0_(dtvccPacket, controlCode, pts);
     } else if (controlCode >= 0x80 && controlCode <= 0x9f) {
       return this.handleC1_(dtvccPacket, controlCode, pts);
     } else if (controlCode >= 0x1000 && controlCode <= 0x101f) {
@@ -153,17 +153,42 @@ shaka.cea.Cea708Service = class {
 
   /**
    * Handles C0 group data.
+   * @param {!shaka.cea.DtvccPacket} dtvccPacket
    * @param {number} controlCode
    * @param {number} pts
    * @return {?shaka.extern.ICaptionDecoder.ClosedCaption}
    * @private
    */
-  handleC0_(controlCode, pts) {
+  handleC0_(dtvccPacket, controlCode, pts) {
     // All these commands pertain to the current window, so ensure it exists.
     if (!this.currentWindow_) {
       return null;
     }
 
+    if (controlCode == 0x18) {
+      const firstByte = dtvccPacket.readByte().value;
+      const secondByte = dtvccPacket.readByte().value;
+
+      const isTextBlock = (b) => {
+        return (b >= 0x20 && b <= 0x7f) || (b >= 0xa0 && b <= 0xff);
+      };
+
+      if (isTextBlock(firstByte) && isTextBlock(secondByte)) {
+        const toHexString = (byteArray) => {
+          return byteArray.map((byte) => {
+            return ('0' + (byte & 0xFF).toString(16)).slice(-2);
+          }).join('');
+        };
+        const unicode = toHexString([firstByte, secondByte]);
+        // Takes a unicode hex string and creates a single character.
+        const char = String.fromCharCode(parseInt(unicode, 16));
+        this.currentWindow_.setCharacter(char);
+        return null;
+      } else {
+        dtvccPacket.rewind(2);
+      }
+    }
+
     const window = this.currentWindow_;
     let parsedClosedCaption = null;
 

package/lib/cea/dtvcc_packet_builder.js

@@ -161,6 +161,21 @@ shaka.cea.DtvccPacket = class {
     }
     this.pos_ += numBlocks;
   }
+
+  /**
+   * Rewinds the provided number of blocks in the buffer.
+   * @param {number} numBlocks
+   * @throws {!shaka.util.Error}
+   */
+  rewind(numBlocks) {
+    if (this.pos_ - numBlocks < 0) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.TEXT,
+          shaka.util.Error.Code.BUFFER_READ_OUT_OF_BOUNDS);
+    }
+    this.pos_ -= numBlocks;
+  }
 };
 
 /**

package/lib/dash/dash_parser.js

@@ -645,10 +645,11 @@ shaka.dash.DashParser = class {
       // that the complex logic of multi-Period eviction and period-flattening
       // is correct.  See also:
       // https://github.com/shaka-project/shaka-player/issues/3169#issuecomment-823580634
+      const availabilityStart =
+          presentationTimeline.getSegmentAvailabilityStart();
       for (const stream of Object.values(this.streamMap_)) {
         if (stream.segmentIndex) {
-          stream.segmentIndex.evict(
-              presentationTimeline.getSegmentAvailabilityStart());
+          stream.segmentIndex.evict(availabilityStart);
         }
       }
     } else {
@@ -2122,8 +2123,12 @@ shaka.dash.DashParser = class {
       return element.attributes['schemeIdUri'] == expectedUri &&
           element.attributes['value'] == expectedValue;
     });
+    const codecs = context.representation.codecs;
+    // Detect the presence of Dolby Atmos audio content based on the codec and
+    // bandwidth. Bandwidth above 384 kbps is a good indicator of Atmos content.
+    const isAtmos = codecs.includes('ec-3') && context.bandwidth >= 384000;
     let spatialAudio = false;
-    if (hasJoc) {
+    if (hasJoc || isAtmos) {
       spatialAudio = true;
     }
 
@@ -2157,7 +2162,6 @@ shaka.dash.DashParser = class {
 
     let hdr;
     const profiles = context.profiles;
-    const codecs = context.representation.codecs;
 
     const hevcHDR = 'http://dashif.org/guidelines/dash-if-uhd#hevc-hdr-pq10';
     if (profiles.includes(hevcHDR) && (codecs.includes('hvc1.2.4.L153.B0') ||

package/lib/dash/mpd_utils.js

@@ -279,10 +279,9 @@ shaka.dash.MpdUtils = class {
 
     const durationStr =
         MpdUtils.inheritAttribute(context, callback, 'duration');
-    let segmentDuration = TXml.parsePositiveInt(durationStr || '');
-    if (segmentDuration) {
-      segmentDuration /= timescale;
-    }
+    const unscaledSegmentDuration = TXml.parsePositiveInt(durationStr || '');
+    const segmentDuration = unscaledSegmentDuration ?
+        unscaledSegmentDuration / timescale : null;
 
     const startNumberStr =
         MpdUtils.inheritAttribute(context, callback, 'startNumber');
@@ -309,6 +308,7 @@ shaka.dash.MpdUtils = class {
         (unscaledPresentationTimeOffset / timescale) || 0;
     return {
       timescale: timescale,
+      unscaledSegmentDuration: unscaledSegmentDuration,
       segmentDuration: segmentDuration,
       startNumber: startNumber,
       scaledPresentationTimeOffset: scaledPresentationTimeOffset,
@@ -564,6 +564,7 @@ shaka.dash.MpdUtils = class {
 /**
  * @typedef {{
  *   timescale: number,
+ *   unscaledSegmentDuration: ?number,
  *   segmentDuration: ?number,
  *   startNumber: number,
  *   scaledPresentationTimeOffset: number,
@@ -576,6 +577,8 @@ shaka.dash.MpdUtils = class {
  *
  * @property {number} timescale
  *   The time-scale of the representation.
+ * @property {?number} unscaledSegmentDuration
+ *   The duration of the segments in timescale units, if given.
  * @property {?number} segmentDuration
  *   The duration of the segments in seconds, if given.
  * @property {number} startNumber

package/lib/dash/segment_template.js

@@ -258,6 +258,7 @@ shaka.dash.SegmentTemplate = class {
         context, SegmentTemplate.fromInheritance_, 'index');
 
     return {
+      unscaledSegmentDuration: segmentInfo.unscaledSegmentDuration,
       segmentDuration: segmentInfo.segmentDuration,
       timescale: segmentInfo.timescale,
       startNumber: segmentInfo.startNumber,
@@ -304,10 +305,12 @@ shaka.dash.SegmentTemplate = class {
       if (info.indexTemplate) {
         shaka.log.info('Using the index URL template by default.');
         info.timeline = null;
+        info.unscaledSegmentDuration = null;
         info.segmentDuration = null;
       } else {
         goog.asserts.assert(info.timeline, 'There should be a timeline');
         shaka.log.info('Using the SegmentTimeline by default.');
+        info.unscaledSegmentDuration = null;
         info.segmentDuration = null;
       }
     }
@@ -399,7 +402,6 @@ shaka.dash.SegmentTemplate = class {
         segmentDuration != null, 'Segment duration must not be null!');
 
     const startNumber = info.startNumber;
-    const timescale = info.timescale;
 
     const template = info.mediaTemplate;
     const bandwidth = context.bandwidth || null;
@@ -482,20 +484,18 @@ shaka.dash.SegmentTemplate = class {
       const positionWithinPeriod = position - startNumber;
       const segmentPeriodTime = positionWithinPeriod * segmentDuration;
 
-      // What will appear in the actual segment files.  The media timestamp is
-      // what is expected in the $Time$ template.
-      const segmentMediaTime = segmentPeriodTime +
-          info.scaledPresentationTimeOffset;
+      const unscaledSegmentDuration = info.unscaledSegmentDuration;
+      goog.asserts.assert(unscaledSegmentDuration != null,
+          'Segment duration must not be null!');
 
-      const getUris = () => {
-        let time = segmentMediaTime * timescale;
-        if ('BigInt' in window && time > Number.MAX_SAFE_INTEGER) {
-          time = BigInt(segmentMediaTime) * BigInt(timescale);
-        }
-        const mediaUri = MpdUtils.fillUriTemplate(
-            template, id, position, /* subNumber= */ null, bandwidth, time);
-        return ManifestParserUtils.resolveUris(getBaseUris(), [mediaUri]);
-      };
+      // The original media timestamp from the timeline is what is expected in
+      // the $Time$ template.  (Or based on duration, in this case.)  It should
+      // not be adjusted with presentationTimeOffset or the Period start.
+      let timeReplacement = positionWithinPeriod * unscaledSegmentDuration;
+      if ('BigInt' in window && timeReplacement > Number.MAX_SAFE_INTEGER) {
+        timeReplacement =
+            BigInt(positionWithinPeriod) * BigInt(unscaledSegmentDuration);
+      }
 
       // Relative to the presentation.
       const segmentStart = segmentPeriodTime + periodStart;
@@ -509,6 +509,13 @@ shaka.dash.SegmentTemplate = class {
       goog.asserts.assert(segmentStart < segmentEnd,
           'Generated a segment outside of the period!');
 
+      const getUris = () => {
+        const mediaUri = MpdUtils.fillUriTemplate(
+            template, id, position, /* subNumber= */ null, bandwidth,
+            timeReplacement);
+        return ManifestParserUtils.resolveUris(getBaseUris(), [mediaUri]);
+      };
+
       const ref = new shaka.media.SegmentReference(
           segmentStart,
           segmentEnd,
@@ -925,8 +932,15 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     if (!ref) {
       const range = this.templateInfo_.timeline[correctedPosition];
       const segmentReplacement = range.segmentPosition;
-      const timeReplacement = this.templateInfo_
-          .unscaledPresentationTimeOffset + range.unscaledStart;
+
+      // The original media timestamp from the timeline is what is expected in
+      // the $Time$ template.  It should not be adjusted with
+      // presentationTimeOffset or the Period start, but
+      // unscaledPresentationTimeOffset was already subtracted from the times
+      // in timeline.
+      const timeReplacement = range.unscaledStart +
+          this.templateInfo_.unscaledPresentationTimeOffset;
+
       const timestampOffset = this.periodStart_ -
         this.templateInfo_.scaledPresentationTimeOffset;
       const trueSegmentEnd = this.periodStart_ + range.end;
@@ -1068,6 +1082,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
 /**
  * @typedef {{
  *   timescale: number,
+ *   unscaledSegmentDuration: ?number,
  *   segmentDuration: ?number,
  *   startNumber: number,
  *   scaledPresentationTimeOffset: number,
@@ -1084,6 +1099,8 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
  *
  * @property {number} timescale
  *   The time-scale of the representation.
+ * @property {?number} unscaledSegmentDuration
+ *   The duration of the segments in seconds, in timescale units.
  * @property {?number} segmentDuration
  *   The duration of the segments in seconds, if given.
  * @property {number} startNumber

package/lib/hls/hls_parser.js

@@ -1013,7 +1013,8 @@ shaka.hls.HlsParser = class {
 
     if (extension == 'ts' || contentMimeType == 'video/mp2t') {
       const basicInfo = shaka.media.SegmentUtils.getBasicInfoFromTs(
-          response.data, this.config_.disableAudio, this.config_.disableVideo);
+          response.data, this.config_.disableAudio, this.config_.disableVideo,
+          this.config_.disableText);
       if (basicInfo) {
         return basicInfo;
       }
@@ -1023,7 +1024,7 @@ shaka.hls.HlsParser = class {
         contentMimeType == 'audio/mp4' ||
         contentMimeType == 'video/iso.segment') {
       const basicInfo = shaka.media.SegmentUtils.getBasicInfoFromMp4(
-          initData, response.data);
+          initData, response.data, this.config_.disableText);
       if (basicInfo) {
         return basicInfo;
       }

package/lib/hls/manifest_text_parser.js

@@ -313,4 +313,5 @@ shaka.hls.ManifestTextParser.SEGMENT_TAGS = [
   'EXT-X-DATERANGE',
   'EXT-X-MAP',
   'EXT-X-GAP',
+  'EXT-X-TILES',
 ];

package/lib/media/segment_utils.js

@@ -47,11 +47,12 @@ shaka.media.SegmentUtils = class {
 
   /**
    * @param {!BufferSource} data
-   * @param {boolean=} disableAudio
-   * @param {boolean=} disableVideo
+   * @param {boolean} disableAudio
+   * @param {boolean} disableVideo
+   * @param {boolean} disableText
    * @return {?shaka.media.SegmentUtils.BasicInfo}
    */
-  static getBasicInfoFromTs(data, disableAudio = false, disableVideo = false) {
+  static getBasicInfoFromTs(data, disableAudio, disableVideo, disableText) {
     const uint8ArrayData = shaka.util.BufferUtils.toUint8(data);
     const tsParser = new shaka.util.TsParser().parse(uint8ArrayData);
     const tsCodecs = tsParser.getCodecs();
@@ -63,24 +64,34 @@ shaka.media.SegmentUtils = class {
       switch (tsCodecs.audio) {
         case 'aac':
         case 'aac-loas':
-          codecs.push('mp4a.40.2');
-          hasAudio = true;
+          if (tsParser.getAudioData().length) {
+            codecs.push('mp4a.40.2');
+            hasAudio = true;
+          }
           break;
         case 'mp3':
-          codecs.push('mp4a.40.34');
-          hasAudio = true;
+          if (tsParser.getAudioData().length) {
+            codecs.push('mp4a.40.34');
+            hasAudio = true;
+          }
           break;
         case 'ac3':
-          codecs.push('ac-3');
-          hasAudio = true;
+          if (tsParser.getAudioData().length) {
+            codecs.push('ac-3');
+            hasAudio = true;
+          }
           break;
         case 'ec3':
-          codecs.push('ec-3');
-          hasAudio = true;
+          if (tsParser.getAudioData().length) {
+            codecs.push('ec-3');
+            hasAudio = true;
+          }
           break;
         case 'opus':
-          codecs.push('opus');
-          hasAudio = true;
+          if (tsParser.getAudioData().length) {
+            codecs.push('opus');
+            hasAudio = true;
+          }
           break;
       }
     }
@@ -113,7 +124,7 @@ shaka.media.SegmentUtils = class {
     }
     const onlyAudio = hasAudio && !hasVideo;
     const closedCaptions = new Map();
-    if (hasVideo) {
+    if (hasVideo && !disableText) {
       const captionParser = new shaka.media.ClosedCaptionParser('video/mp2t');
       captionParser.parseFrom(data);
       for (const stream of captionParser.getStreams()) {
@@ -139,9 +150,10 @@ shaka.media.SegmentUtils = class {
   /**
    * @param {?BufferSource} initData
    * @param {!BufferSource} data
+   * @param {boolean} disableText
    * @return {?shaka.media.SegmentUtils.BasicInfo}
    */
-  static getBasicInfoFromMp4(initData, data) {
+  static getBasicInfoFromMp4(initData, data, disableText) {
     const Mp4Parser = shaka.util.Mp4Parser;
     const SegmentUtils = shaka.media.SegmentUtils;
 
@@ -382,7 +394,7 @@ shaka.media.SegmentUtils = class {
     }
     const onlyAudio = hasAudio && !hasVideo;
     const closedCaptions = new Map();
-    if (hasVideo) {
+    if (hasVideo && !disableText) {
       const captionParser = new shaka.media.ClosedCaptionParser('video/mp4');
       if (initData) {
         captionParser.init(initData);

package/lib/media/streaming_engine.js

@@ -2485,7 +2485,7 @@ shaka.media.StreamingEngine = class {
     const segmentIndex = mediaState.stream.segmentIndex;
     if (segmentIndex instanceof shaka.media.MetaSegmentIndex) {
       segmentIndex.evict(
-          this.manifest_.presentationTimeline.getSeekRangeStart());
+          this.manifest_.presentationTimeline.getSegmentAvailabilityStart());
     }
 
     const logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);

package/lib/net/http_fetch_plugin.js

@@ -104,7 +104,7 @@ shaka.net.HttpFetchPlugin = class {
     const fetch = shaka.net.HttpFetchPlugin.fetch_;
     const ReadableStream = shaka.net.HttpFetchPlugin.ReadableStream_;
     let response;
-    let arrayBuffer;
+    let arrayBuffer = new ArrayBuffer(0);
     let loaded = 0;
     let lastLoaded = 0;
 

package/lib/net/http_plugin_utils.js

@@ -6,6 +6,7 @@
 
 goog.provide('shaka.net.HttpPluginUtils');
 
+goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.StringUtils');
@@ -27,6 +28,8 @@ shaka.net.HttpPluginUtils = class {
    * @return {!shaka.extern.Response}
    */
   static makeResponse(headers, data, status, uri, responseURL, requestType) {
+    goog.asserts.assert(data, 'Data should be non-null!');
+
     if (status >= 200 && status <= 299 && status != 202) {
       // Most 2xx HTTP codes are success cases.
       /** @type {shaka.extern.Response} */

package/lib/player.js

@@ -7542,7 +7542,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     if (!this.video_ || this.video_.ended) {
       return true;
     }
-    return this.video_.currentTime >= this.seekRange().end;
+    return !this.isLive() && this.video_.currentTime >= this.seekRange().end;
   }
 };
 
@@ -7585,7 +7585,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat, max-len
-shaka.Player.version = 'v4.9.34' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.9.35' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/util/player_configuration.js

@@ -517,7 +517,13 @@ shaka.util.PlayerConfiguration = class {
     if (hdrLevel == 'AUTO') {
       // Auto detect the ideal HDR level.
       if (window.matchMedia('(color-gamut: p3)').matches) {
-        hdrLevel = 'PQ';
+        const someHLG = tracks.some((track) => {
+          if (track.hdr && track.hdr == 'HLG') {
+            return true;
+          }
+          return false;
+        });
+        hdrLevel = someHLG ? 'HLG' : 'PQ';
       } else {
         hdrLevel = 'SDR';
       }

package/package.json

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