shaka-player 4.6.13 → 4.6.15

package/lib/ads/ad_manager.js

@@ -656,7 +656,7 @@ shaka.ads.AdManager = class extends shaka.util.FakeEventTarget {
    */
   getServerSideCuePoints() {
     shaka.Deprecate.deprecateFeature(5,
-        'AdManager',
+        'AdManager.getServerSideCuePoints',
         'Please use getCuePoints function.');
     return this.getCuePoints();
   }

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/deprecate/deprecate.js

@@ -107,7 +107,7 @@ shaka.Deprecate = class {
       libraryVersion,
       '. Additional information:',
       description,
-    ].join('');
+    ].join(' ');
 
     shaka.log.alwaysError(errorMessage);
     goog.asserts.assert(false, errorMessage);

package/lib/hls/hls_parser.js

@@ -32,6 +32,7 @@ goog.require('shaka.util.FakeEvent');
 goog.require('shaka.util.LanguageUtils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MimeUtils');
+goog.require('shaka.util.Networking');
 goog.require('shaka.util.OperationManager');
 goog.require('shaka.util.Pssh');
 goog.require('shaka.media.SegmentUtils');
@@ -908,8 +909,11 @@ shaka.hls.HlsParser = class {
         playlist, middleSegment.tags, getUris);
     this.mapTagToInitSegmentRefMap_.clear();
     if (initSegmentRef) {
-      const initSegmentRequest = shaka.net.NetworkingEngine.makeRequest(
-          initSegmentRef.getUris(), this.config_.retryParameters);
+      const initSegmentRequest = shaka.util.Networking.createSegmentRequest(
+          initSegmentRef.getUris(),
+          initSegmentRef.getStartByte(),
+          initSegmentRef.getEndByte(),
+          this.config_.retryParameters);
       const initType =
           shaka.net.NetworkingEngine.AdvancedRequestType.INIT_SEGMENT;
       const initResponse = await this.makeNetworkRequest_(
@@ -2831,12 +2835,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,"
@@ -4122,7 +4126,22 @@ shaka.hls.HlsParser = class {
    * @return {?shaka.extern.DrmInfo}
    * @private
    */
-  static identityDrmParser_(drmTag) {
+  static identityDrmParser_(drmTag, mimeType) {
+    if (mimeType == 'video/mp2t') {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MANIFEST,
+          shaka.util.Error.Code.HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED);
+    }
+
+    if (shaka.util.Platform.isMediaKeysPolyfilled()) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MANIFEST,
+          shaka.util.Error.Code
+              .HLS_MSE_ENCRYPTED_LEGACY_APPLE_MEDIA_KEYS_NOT_SUPPORTED);
+    }
+
     const method = drmTag.getRequiredAttrValue('METHOD');
     const VALID_METHODS = ['SAMPLE-AES', 'SAMPLE-AES-CTR'];
     if (!VALID_METHODS.includes(method)) {

package/lib/media/manifest_parser.js

@@ -28,7 +28,7 @@ shaka.media.ManifestParser = class {
    */
   static registerParserByExtension(extension, parserFactory) {
     shaka.Deprecate.deprecateFeature(5,
-        'ManifestParser',
+        'ManifestParser.registerParserByExtension',
         'Please use an ManifestParser with registerParserByMime function.');
   }
 
@@ -125,7 +125,8 @@ shaka.media.ManifestParser = class {
         shaka.util.Error.Severity.CRITICAL,
         shaka.util.Error.Category.MANIFEST,
         shaka.util.Error.Code.UNABLE_TO_GUESS_MANIFEST_TYPE,
-        uri);
+        uri,
+        mimeType);
   }
 
 

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

@@ -734,7 +734,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // player having been initialized.
     if (mediaElement) {
       shaka.Deprecate.deprecateFeature(5,
-          'Player',
+          'Player w/ mediaElement',
           'Please migrate from initializing Player with a mediaElement; ' +
           'use the attach method instead.');
       this.attach(mediaElement, /* initializeMediaSource= */ true);
@@ -1842,7 +1842,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.abrManager_ = abrFactory();
       if (typeof this.abrManager_.setMediaElement != 'function') {
         shaka.Deprecate.deprecateFeature(5,
-            'AbrManager',
+            'AbrManager w/o setMediaElement',
             'Please use an AbrManager with setMediaElement function.');
         this.abrManager_.setMediaElement = () => {};
       }
@@ -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.15' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/mediasource.js

@@ -32,11 +32,12 @@ shaka.polyfill.MediaSource = class {
 
     if (!window.MediaSource) {
       shaka.log.info('No MSE implementation available.');
-    } else if (window.cast && cast.__platform__ &&
-               cast.__platform__.canDisplayType) {
+    } else if (shaka.util.Platform.isChromecast()) {
       shaka.log.info('Patching Chromecast MSE bugs.');
-      // Chromecast cannot make accurate determinations via isTypeSupported.
-      shaka.polyfill.MediaSource.patchCastIsTypeSupported_();
+      // Chromecast fails on some TS content, even though it is supposed to
+      // support it.  Better to transmux.
+      // See https://github.com/shaka-project/shaka-player/issues/5278
+      shaka.polyfill.MediaSource.rejectContainer_('mp2t');
     } else if (safariVersion) {
       // NOTE:  shaka.Player.isBrowserSupported() has its own restrictions on
       // Safari version.
@@ -182,38 +183,6 @@ shaka.polyfill.MediaSource = class {
     };
   }
 
-  /**
-   * Patch isTypeSupported() to chain to a private API on the Chromecast which
-   * can query for support of detailed content parameters.
-   *
-   * @private
-   */
-  static patchCastIsTypeSupported_() {
-    const originalIsTypeSupported = MediaSource.isTypeSupported;
-
-    MediaSource.isTypeSupported = (mimeType) => {
-      // Parse the basic MIME type from its parameters.
-      const pieces = mimeType.split(/ *; */);
-      pieces.shift();  // Remove basic MIME type from pieces.
-
-      const hasCodecs = pieces.some((piece) => piece.startsWith('codecs='));
-      if (!hasCodecs) {
-        // Though the original reason for this special case was not documented,
-        // it is presumed to be because the platform won't accept a MIME type
-        // without codecs in canDisplayType.  It is valid, however, in
-        // isTypeSupported.
-        return originalIsTypeSupported(mimeType);
-      }
-
-      // Only canDisplayType can check extended MIME type parameters on this
-      // platform (such as frame rate, resolution, etc).
-      // In previous versions of this polyfill, the MIME type parameters were
-      // manipulated, filtered, or extended.  This is no longer true, so we pass
-      // the full MIME type to the platform as we received it.
-      return cast.__platform__.canDisplayType(mimeType);
-    };
-  }
-
   /**
    * Patch isTypeSupported() to translate vp09 codec strings into vp9, to allow
    * such content to play on older smart TVs.

package/lib/text/vtt_text_parser.js

@@ -687,6 +687,8 @@ shaka.text.VttTextParser = class {
         refCue.fontFamily, cue.fontFamily);
     cue.fontSize = VttTextParser.getOrDefault_(
         refCue.fontSize, cue.fontSize);
+    cue.textShadow = VttTextParser.getOrDefault_(
+        refCue.textShadow, cue.textShadow);
 
     // Overwrite with new values as unable to determine
     // if new value is set or not
@@ -695,7 +697,6 @@ shaka.text.VttTextParser = class {
     cue.opacity = refCue.opacity;
     cue.rubyTag = refCue.rubyTag;
     cue.textCombineUpright = refCue.textCombineUpright;
-    cue.textShadow = refCue.textShadow;
     cue.wrapLine = refCue.wrapLine;
   }
 

package/lib/util/error.js

@@ -527,6 +527,7 @@ shaka.util.Error.Code = {
    *   <li>Configure the server to accept a HEAD request for the manifest.
    * </ul>
    * <br> error.data[0] is the manifest URI.
+   * <br> error.data[1] is the detected or specified MIME type.
    */
   'UNABLE_TO_GUESS_MANIFEST_TYPE': 4000,
 

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/lib/util/ts_parser.js

@@ -433,7 +433,7 @@ shaka.util.TsParser = class {
    */
   parseAvcNalus(pes, nextPes) {
     shaka.Deprecate.deprecateFeature(5,
-        'TsParser',
+        'TsParser.parseAvcNalus',
         'Please use parseNalus function instead.');
     return this.parseNalus(pes);
   }
@@ -769,7 +769,7 @@ shaka.util.TsParser = class {
    */
   getVideoResolution() {
     shaka.Deprecate.deprecateFeature(5,
-        'TsParser',
+        'TsParser.getVideoResolution',
         'Please use getVideoInfo function instead.');
     const videoInfo = this.getVideoInfo();
     return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.6.13",
+  "version": "4.6.15",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -43,13 +43,13 @@
     "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",
     "karma-webdriver-launcher": "^1.0.8",
     "lcevc_dec.js": "^1.0.1",
-    "less": "https://gitpkg.now.sh/joeyparrish/less.js/packages/less?28c63a43",
+    "less": "^4.2.0",
     "less-plugin-clean-css": "github:austingardner/less-plugin-clean-css#4e9e77bf",
     "material-design-lite": "^1.3.0",
     "open-sans-fonts": "^1.6.2",

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/hls/hls_parser_unit.js

@@ -4074,6 +4074,34 @@ describe('HlsParser', () => {
       await verifyError(master, media, error, /* onCreateSegmentIndex= */ true);
     });
 
+    it('if SAMPLE-AES encryption with MSE and mp2t content', async () => {
+      const master = [
+        '#EXTM3U\n',
+        '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1",',
+        'RESOLUTION=960x540,FRAME-RATE=60\n',
+        'video\n',
+      ].join('');
+
+      const media = [
+        '#EXTM3U\n',
+        '#EXT-X-TARGETDURATION:6\n',
+        '#EXT-X-PLAYLIST-TYPE:VOD\n',
+        '#EXT-X-KEY:METHOD=SAMPLE-AES,',
+        'URI="fake",\n',
+        '#EXTINF:5,\n',
+        '#EXT-X-BYTERANGE:121090@616\n',
+        'main.ts',
+      ].join('');
+
+      const error = new shaka.util.Error(
+          shaka.util.Error.Severity.CRITICAL,
+          shaka.util.Error.Category.MANIFEST,
+          Code.HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED);
+
+      await verifyError(master, media, error, /* onCreateSegmentIndex= */ true);
+    });
+
+
     describe('if required tags are missing', () => {
       /**
        * @param {string} master

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/player_integration.js

@@ -1208,13 +1208,21 @@ describe('Player', () => {
         'com.widevine.alpha': bogusUrl,
         'com.microsoft.playready': bogusUrl,
       });
-      await player.load('test:sintel-enc_compiled');
+
+      // This load may be interrupted, so ignore errors and don't wait.
+      const loadPromise =
+          player.load('test:sintel-enc_compiled').catch(() => {});
 
       await errorPromise;
       expect(unloadPromise).not.toBeNull();
+
       if (unloadPromise) {
         await unloadPromise;
       }
+
+      // This should be done, and errors ignored.  But don't leave any Promise
+      // unresolved.
+      await loadPromise;
     });
   });  // describe('unloading')
 

package/test/player_load_graph_integration.js

@@ -373,11 +373,11 @@ describe('Player Load Graph', () => {
 
       // Make the two requests one-after-another so that we don't have any idle
       // time between them.
-      const attachRequest = player.attach(video);
-      const loadRequest = player.load('test:sintel');
+      const attach = player.attach(video);
+      const load = player.load('test:sintel');
 
-      await attachRequest;
-      await expectAsync(loadRequest).toBeRejected();
+      await attach;
+      await expectAsync(load).toBeRejected();
 
       // Wait a couple interrupter cycles to allow the player to enter idle
       // state.
@@ -420,22 +420,23 @@ describe('Player Load Graph', () => {
       // Normally the player would initialize media source after attaching to
       // the media element, however since we don't support media source, it
       // should stop at the attach state.
-      player.attach(video, /* initMediaSource= */ true);
+      const attach = player.attach(video, /* initMediaSource= */ true);
 
       await shaka.test.Util.delay(/* seconds= */ 0.25);
       expect(lastStateChange).toBe('attach');
+
+      await attach;
     });
 
     it('loading ignores media source path', async () => {
       await player.attach(video, /* initMediaSource= */ false);
 
-      // Normally the player would load content like this with the media source
-      // path, but since we don't have media source support, it should use the
-      // src= path.
-      player.load(SMALL_MP4_CONTENT_URI);
+      const load = player.load(SMALL_MP4_CONTENT_URI);
 
       await shaka.test.Util.delay(/* seconds= */ 0.25);
       expect(lastStateChange).toBe('src-equals');
+
+      await load;
     });
 
     it('unloading ignores init media source flag', async () => {
@@ -445,10 +446,12 @@ describe('Player Load Graph', () => {
       // Normally the player would try to go to the media source state because
       // we are saying to initialize media source after unloading, but since we
       // don't have media source, it should stop at the attach state.
-      player.unload(/* initMediaSource= */ true);
+      const unload = player.unload(/* initMediaSource= */ true);
 
       await shaka.test.Util.delay(/* seconds= */ 0.25);
       expect(lastStateChange).toBe('unload');
+
+      await unload;
     });
   });
 

package/test/player_src_equals_integration.js

@@ -115,8 +115,8 @@ describe('Player Src Equals', () => {
     expect(video.currentTime).toBeLessThan(2.0);
 
     // Trigger a seek and then wait for the seek to take effect.
-    // This seek target is very close to the duration of the video.
-    video.currentTime = 10;
+    // This seek target is very close to the duration of the video (10.01s).
+    video.currentTime = 9.5;
     await waiter.waitForMovementOrFailOnTimeout(video, /* timeout= */10);
 
     // Make sure the playhead is roughly where we expect it to be after

package/test/player_unit.js

@@ -667,15 +667,21 @@ describe('Player', () => {
     });
 
     describe('when config.streaming.preferNativeHls is set to true', () => {
-      beforeEach(() => {
+      beforeAll(() => {
         shaka.media.ManifestParser.registerParserByMime(
             'application/x-mpegurl',
             () => new shaka.test.FakeManifestParser(manifest));
       });
 
+      afterAll(() => {
+        // IMPORTANT: restore the ORIGINAL parser.  DO NOT just unregister the
+        // fake!
+        shaka.media.ManifestParser.registerParserByMime(
+            'application/x-mpegurl',
+            () => new shaka.hls.HlsParser());
+      });
+
       afterEach(() => {
-        shaka.media.ManifestParser.unregisterParserByMime(
-            'application/x-mpegurl');
         video.canPlayType.calls.reset();
       });
 

package/test/test/assets/hls-ts-h265/index.m3u8

@@ -4,4 +4,6 @@
 #EXT-X-MEDIA-SEQUENCE:0
 #EXTINF:12.000000,
 0.ts
+#EXTINF:12.000000,
+0.ts
 #EXT-X-ENDLIST

package/test/test/assets/hls-ts-muxed-aac-h265/media.m3u8

@@ -6,4 +6,8 @@
 0.ts
 #EXTINF:5.000000,
 1.ts
-#EXT-X-ENDLIST
+#EXTINF:5.000000,
+0.ts
+#EXTINF:5.000000,
+1.ts
+#EXT-X-ENDLIST

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);