shaka-player 4.7.9 → 4.7.10

package/lib/dash/segment_template.js

@@ -755,16 +755,10 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
 
     this.evict(this.periodStart_);
 
-    if (timeline.length === 0) {
-      return;
-    }
-
-    if (this.periodEnd_ !== Infinity) {
-      // Adjust the last timeline entry to match the period end
-      const lastTimePeriod = timeline[timeline.length - 1];
-      // NOTE: end should be relative to period start
-      lastTimePeriod.end = this.periodEnd_ - this.periodStart_;
-    }
+    // Do NOT adjust last range to match period end! With high precision
+    // timestamps several recalculations may give wrong results on less precise
+    // platforms. To mitigate that, we're using cached |periodEnd_| value in
+    // find/get() methods whenever possible.
   }
 
   /**
@@ -784,7 +778,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
     const timeline = this.templateInfo_.timeline;
 
     // Early exit if the time isn't within this period
-    if (time < this.periodStart_ || time > this.periodEnd_) {
+    if (time < this.periodStart_ || time >= this.periodEnd_) {
       return null;
     }
 
@@ -797,10 +791,14 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
       // the references by a fraction of a second. To account for this, we use
       // the start of the next segment as /end/, unless this is the last
       // reference, in which case we use the period end as the /end/
-      let end = range.end + this.periodStart_;
+      let end;
 
       if (i < lastIndex) {
         end = timeline[i + 1].start + this.periodStart_;
+      } else if (this.periodEnd_ === Infinity) {
+        end = range.end + this.periodStart_;
+      } else {
+        end = this.periodEnd_;
       }
 
       if ((time >= start) && (time < end)) {
@@ -831,6 +829,12 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
           .unscaledPresentationTimeOffset + range.unscaledStart;
       const timestampOffset = this.periodStart_ -
         this.templateInfo_.scaledPresentationTimeOffset;
+      const trueSegmentEnd = this.periodStart_ + range.end;
+      let segmentEnd = trueSegmentEnd;
+      if (correctedPosition === this.getNumReferences() - 1 &&
+          this.periodEnd_ !== Infinity) {
+        segmentEnd = this.periodEnd_;
+      }
 
       const partialSegmentRefs = [];
 
@@ -901,7 +905,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
 
       ref = new shaka.media.SegmentReference(
           this.periodStart_ + range.start,
-          this.periodStart_ + range.end,
+          segmentEnd,
           createUrisCb,
           /* startByte= */ 0,
           /* endByte= */ null,
@@ -916,6 +920,7 @@ shaka.dash.TimelineSegmentIndex = class extends shaka.media.SegmentIndex {
           shaka.media.SegmentReference.Status.AVAILABLE,
           this.aes128Key_,
           /* allPartialSegments= */ range.partialSegments > 0);
+      ref.trueEndTime = trueSegmentEnd;
       this.references[correctedPosition] = ref;
     }
 

package/lib/hls/hls_parser.js

@@ -2839,12 +2839,12 @@ shaka.hls.HlsParser = class {
     // Don't download the key object until the segment is parsed, to avoid a
     // startup delay for long manifests with lots of keys.
     keyInfo.fetchKey = async () => {
-      const keyUri = shaka.hls.Utils.constructSegmentUris(
+      const keyUris = shaka.hls.Utils.constructSegmentUris(
           getUris(), drmTag.getRequiredAttrValue('URI'), variables);
 
       const requestType = shaka.net.NetworkingEngine.RequestType.KEY;
       const request = shaka.net.NetworkingEngine.makeRequest(
-          [keyUri], this.config_.retryParameters);
+          keyUris, this.config_.retryParameters);
       const keyResponse = await this.makeNetworkRequest_(request, requestType);
 
       // keyResponse.status is undefined when URI is "data:text/plain;base64,"

package/lib/media/segment_reference.js

@@ -129,7 +129,10 @@ shaka.media.InitSegmentReference = class {
   static equal(reference1, reference2) {
     const ArrayUtils = shaka.util.ArrayUtils;
     const BufferUtils = shaka.util.BufferUtils;
-    if (!reference1 || !reference2) {
+
+    if (reference1 === reference2) {
+      return true;
+    } else if (!reference1 || !reference2) {
       return reference1 == reference2;
     } else {
       return reference1.getStartByte() == reference2.getStartByte() &&

package/lib/media/streaming_engine.js

@@ -2163,8 +2163,8 @@ shaka.media.StreamingEngine = class {
     const bufferedBehind = presentationTime - startTime;
 
     const overflow = bufferedBehind - bufferBehind;
-    // See: https://github.com/shaka-project/shaka-player/issues/2982
-    if (overflow <= 0.01) {
+    // See: https://github.com/shaka-project/shaka-player/issues/6240
+    if (overflow <= 1) {
       shaka.log.v2(logPrefix,
           'buffer behind okay:',
           'presentationTime=' + presentationTime,

package/lib/player.js

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

package/lib/util/periods.js

@@ -1215,7 +1215,18 @@ shaka.util.PeriodCombiner = class {
       return false;
     }
 
-    // If language-based differences haven't decided this, look at roles.  If
+    // If language-based differences haven't decided this, look at labels.
+    // If available options differ, look does any matches with output stream.
+    if (best.label !== candidate.label) {
+      if (outputStream.label === best.label) {
+        return false;
+      }
+      if (outputStream.label === candidate.label) {
+        return true;
+      }
+    }
+
+    // If label-based differences haven't decided this, look at roles.  If
     // the candidate has more roles in common with the output, upgrade to the
     // candidate.
     if (outputStream.roles.length) {
@@ -1410,6 +1421,17 @@ shaka.util.PeriodCombiner = class {
       return false;
     }
 
+    // If language-based differences haven't decided this, look at labels.
+    // If available options differ, look does any matches with output stream.
+    if (best.label !== candidate.label) {
+      if (outputStream.label === best.label) {
+        return false;
+      }
+      if (outputStream.label === candidate.label) {
+        return true;
+      }
+    }
+
     // If the candidate has more roles in common with the output, upgrade to the
     // candidate.
     if (outputStream.roles.length) {

package/lib/util/stream_utils.js

@@ -908,7 +908,7 @@ shaka.util.StreamUtils = class {
     // currently don't support 'fLaC', while 'flac' is supported by most
     // major browsers.
     // See https://bugs.chromium.org/p/chromium/issues/detail?id=1422728
-    if (codecs === 'fLaC') {
+    if (codecs === 'fLaC' && !shaka.util.Platform.isSafari()) {
       return 'flac';
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.7.9",
+  "version": "4.7.10",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -43,7 +43,7 @@
     "karma-coverage": "^2.2.0",
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-ajax": "^0.1.13",
-    "karma-local-wd-launcher": "^1.6.6",
+    "karma-local-wd-launcher": "^1.6.7",
     "karma-opera-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-spec-reporter": "^0.0.34",