shaka-player 4.6.13 → 4.6.14

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

@@ -2831,12 +2831,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

@@ -123,7 +123,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

@@ -2153,8 +2153,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

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

package/lib/util/periods.js

@@ -1180,7 +1180,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) {
@@ -1383,6 +1394,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

@@ -839,7 +839,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.6.13",
+  "version": "4.6.14",
   "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",

package/test/dash/dash_parser_segment_template_unit.js

@@ -786,7 +786,7 @@ describe('DashParser SegmentTemplate', () => {
         const newTemplateInfo = makeTemplateInfo(newRanges);
 
         const newEnd = newRanges[newRanges.length - 1].end;
-        index.appendTemplateInfo(newTemplateInfo, newEnd);
+        index.appendTemplateInfo(newTemplateInfo, /* periodStart= */ 0, newEnd);
         expect(index.find(newStart)).toBe(10);
         expect(index.find(newEnd - 1.0)).toBe(19);
       });

package/test/media/buffering_observer_unit.js

@@ -11,15 +11,28 @@ describe('BufferingObserver', () => {
   const thresholdAfterStarving = 5;
   const thresholdAfterSatisfied = 2;
 
+  const originalDateNow = Date.now;
+
+  /** @type {!Date} */
+  let baseTime;
+
   /** @type {!shaka.media.BufferingObserver} */
   let controller;
 
   beforeEach(() => {
+    // Any test using Date needs to have Date mocked to avoid flake.
+    baseTime = new Date(2015, 11, 30);
+    Date.now = () => baseTime.getTime();
+
     controller = new BufferingObserver(
         thresholdAfterStarving,
         thresholdAfterSatisfied);
   });
 
+  afterEach(() => {
+    Date.now = originalDateNow;
+  });
+
   describe('when satisfied', () => {
     beforeEach(() => {
       controller.setState(State.SATISFIED);

package/test/test/util/waiter.js

@@ -184,6 +184,7 @@ shaka.test.Waiter = class {
       }
       this.eventManager_.unlisten(mediaElement, 'timeupdate');
       this.eventManager_.unlisten(mediaElement, 'ended');
+      this.eventManager_.unlisten(mediaElement, 'durationchange');
     };
 
     const p = new Promise((resolve) => {
@@ -202,6 +203,10 @@ shaka.test.Waiter = class {
       timer.tickEvery(/* seconds= */ 1);
       this.eventManager_.listen(mediaElement, 'timeupdate', check);
       this.eventManager_.listen(mediaElement, 'ended', check);
+      // Some tests on Safari expose a condition where the ended flag can be
+      // found in the desired state in a brief window during a durationchange
+      // event.
+      this.eventManager_.listen(mediaElement, 'durationchange', check);
     });
 
     return this.waitUntilGeneric_(goalName, p, cleanup, mediaElement);

package/test/transmuxer/transmuxer_integration.js

@@ -306,10 +306,10 @@ filterDescribe('Transmuxer Player', checkNoBrokenEdge, () => {
 
     it('H.265 in TS', async () => {
       const chromeVersion = shaka.util.Platform.chromeVersion();
-      if (shaka.util.Platform.isWindows() &&
-          chromeVersion && chromeVersion === 117) {
-        // It appears that Chrome 117 beta in Windows is incorrectly reporting
-        // H.265 in MediaCapabilities
+      if (shaka.util.Platform.isWindows() && chromeVersion) {
+        // It appears that Chrome 122 in Windows is still incorrectly reporting
+        // H.265 in MediaSource.  Revisit this with a maximum chromeVersion if
+        // Chrome ever fixes it.
         pending('Codec H.265 is not supported by the platform.');
       }
       const mimeType = 'video/mp4; codecs="hvc1.2.4.L123.B0"';

package/test/util/periods_unit.js

@@ -1060,6 +1060,70 @@ describe('PeriodCombiner', () => {
     expect(audio2.originalId).toBe('2,4');
   });
 
+  it('Matches streams with labels', async () => {
+    const stream1 = makeAudioStream('en', /* channels= */ 2);
+    stream1.originalId = '1';
+    stream1.bandwidth = 129597;
+    stream1.codecs = 'mp4a.40.2';
+
+    const stream2 = makeAudioStream('en', /* channels= */ 2);
+    stream2.originalId = '2';
+    stream2.bandwidth = 129637;
+    stream2.codecs = 'mp4a.40.2';
+    stream2.label = 'description';
+
+    const stream3 = makeAudioStream('en', /* channels= */ 2);
+    stream3.originalId = '3';
+    stream3.bandwidth = 131037;
+    stream3.codecs = 'mp4a.40.2';
+
+    const stream4 = makeAudioStream('en', /* channels= */ 2);
+    stream4.originalId = '4';
+    stream4.bandwidth = 131034;
+    stream4.codecs = 'mp4a.40.2';
+    stream4.label = 'description';
+
+    /** @type {!Array.<shaka.extern.Period>} */
+    const periods = [
+      {
+        id: '0',
+        videoStreams: [
+          makeVideoStream(1080),
+        ],
+        audioStreams: [
+          stream1,
+          stream2,
+        ],
+        textStreams: [],
+        imageStreams: [],
+      },
+      {
+        id: '1',
+        videoStreams: [
+          makeVideoStream(1080),
+        ],
+        audioStreams: [
+          stream3,
+          stream4,
+        ],
+        textStreams: [],
+        imageStreams: [],
+      },
+    ];
+
+    await combiner.combinePeriods(periods, /* isDynamic= */ true);
+    const variants = combiner.getVariants();
+    expect(variants.length).toBe(2);
+    // We can use the originalId field to see what each track is composed of.
+    const audio1 = variants[0].audio;
+    expect(audio1.label).toBe(null);
+    expect(audio1.originalId).toBe('1,3');
+
+    const audio2 = variants[1].audio;
+    expect(audio2.label).toBe('description');
+    expect(audio2.originalId).toBe('2,4');
+  });
+
   it('Matches streams with related codecs', async () => {
     const stream1 = makeVideoStream(1080);
     stream1.originalId = '1';