shaka-player 4.3.12 → 4.3.14

package/lib/util/platform.js

@@ -199,6 +199,15 @@ shaka.util.Platform = class {
            !shaka.util.Platform.isEdge();
   }
 
+  /**
+   * Check if the current platform is Firefox.
+   *
+   * @return {boolean}
+   */
+  static isFirefox() {
+    return shaka.util.Platform.userAgentContains_('Firefox');
+  }
+
   /**
    * Check if the current platform is from Apple.
    *
@@ -213,10 +222,12 @@ shaka.util.Platform = class {
     return !!navigator.vendor && navigator.vendor.includes('Apple') &&
         !shaka.util.Platform.isTizen() &&
         !shaka.util.Platform.isEOS() &&
+        !shaka.util.Platform.isAPL() &&
         !shaka.util.Platform.isVirginMedia() &&
         !shaka.util.Platform.isOrange() &&
         !shaka.util.Platform.isPS4() &&
-        !shaka.util.Platform.isAmazonFireTV();
+        !shaka.util.Platform.isAmazonFireTV() &&
+        !shaka.util.Platform.isWPE();
   }
 
   /**
@@ -271,6 +282,14 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('AFT');
   }
 
+  /**
+   * Check if the current platform is Comcast X1.
+   * @return {boolean}
+   */
+  static isWPE() {
+    return shaka.util.Platform.userAgentContains_('WPE');
+  }
+
   /**
    * Returns a major version number for Safari, or Safari-based iOS browsers.
    *
@@ -327,6 +346,15 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('PC=EOS');
   }
 
+  /**
+   * Check if the current platform is an APL set-top box.
+   *
+   * @return {boolean}
+   */
+  static isAPL() {
+    return shaka.util.Platform.userAgentContains_('PC=APL');
+  }
+
   /**
    * Guesses if the platform is a mobile one (iOS or Android).
    *
@@ -368,6 +396,15 @@ shaka.util.Platform = class {
     return navigator.platform.toLowerCase().includes('mac');
   }
 
+  /**
+   * Return true if the platform is a Android, regardless of the browser.
+   *
+   * @return {boolean}
+   */
+  static isAndroid() {
+    return shaka.util.Platform.userAgentContains_('Android');
+  }
+
   /**
    * Check if the user agent contains a key. This is the best way we know of
    * right now to detect platforms. If there is a better way, please send a
@@ -429,7 +466,7 @@ shaka.util.Platform = class {
    */
   static requiresEncryptionInfoInAllInitSegments() {
     const Platform = shaka.util.Platform;
-    return Platform.isTizen() || Platform.isXboxOne();
+    return Platform.isTizen() || Platform.isXboxOne() || Platform.isOrange();
   }
 
   /**

package/lib/util/player_configuration.js

@@ -189,13 +189,15 @@ shaka.util.PlayerConfiguration = class {
       parsePrftBox: false,
     };
 
-    // WebOS, Tizen, and Chromecast have long hardware pipelines that respond
-    // slowly to seeking.  Therefore we should not seek when we detect a stall
+    // WebOS, Tizen, Chromecast and Hisense have long hardware pipelines
+    // that respond slowly to seeking.
+    // Therefore we should not seek when we detect a stall
     // on one of these platforms.  Instead, default stallSkip to 0 to force the
     // stall detector to pause and play instead.
     if (shaka.util.Platform.isWebOS() ||
         shaka.util.Platform.isTizen() ||
-        shaka.util.Platform.isChromecast()) {
+        shaka.util.Platform.isChromecast() ||
+        shaka.util.Platform.isHisense()) {
       streaming.stallSkip = 0;
     }
 

package/lib/util/stream_utils.js

@@ -434,19 +434,36 @@ shaka.util.StreamUtils = class {
 
     await shaka.util.StreamUtils.getDecodingInfosForVariants(
         manifest.variants, usePersistentLicenses, /* srcEquals= */ false);
+
+    const ContentType = shaka.util.ManifestParserUtils.ContentType;
+    const Capabilities = shaka.media.Capabilities;
+    const ManifestParserUtils = shaka.util.ManifestParserUtils;
+    const MimeUtils = shaka.util.MimeUtils;
+    const StreamUtils = shaka.util.StreamUtils;
+    const isXboxOne = shaka.util.Platform.isXboxOne();
+
+    const isFirefoxAndroid = shaka.util.Platform.isFirefox() &&
+        shaka.util.Platform.isAndroid();
+
     manifest.variants = manifest.variants.filter((variant) => {
       // See: https://github.com/shaka-project/shaka-player/issues/3860
       const video = variant.video;
+      const videoWidth = (video && video.width) || 0;
+      const videoHeight = (video && video.height) || 0;
 
-      const ContentType = shaka.util.ManifestParserUtils.ContentType;
-      const Capabilities = shaka.media.Capabilities;
-      const ManifestParserUtils = shaka.util.ManifestParserUtils;
-      const MimeUtils = shaka.util.MimeUtils;
-      const StreamUtils = shaka.util.StreamUtils;
+      // See: https://github.com/shaka-project/shaka-player/issues/3380
+      // Note: it makes sense to drop early
+      if (isXboxOne && video &&
+        (videoWidth > 1920 || videoHeight > 1080) &&
+        (video.codecs.includes('avc1.') || video.codecs.includes('avc3.'))
+      ) {
+        shaka.log.debug('Dropping variant - not compatible with platform',
+            StreamUtils.getVariantSummaryString_(variant));
+        return false;
+      }
 
       if (video) {
         let videoCodecs = StreamUtils.getCorrectVideoCodecs_(video.codecs);
-
         // For multiplexed streams. Here we must check the audio of the
         // stream to see if it is compatible.
         if (video.codecs.includes(',')) {
@@ -455,7 +472,6 @@ shaka.util.StreamUtils = class {
           videoCodecs = ManifestParserUtils.guessCodecs(
               ContentType.VIDEO, allCodecs);
           videoCodecs = StreamUtils.getCorrectVideoCodecs_(videoCodecs);
-
           let audioCodecs = ManifestParserUtils.guessCodecs(
               ContentType.AUDIO, allCodecs);
           audioCodecs = StreamUtils.getCorrectAudioCodecs_(audioCodecs);
@@ -484,6 +500,17 @@ shaka.util.StreamUtils = class {
 
       const audio = variant.audio;
 
+      // See: https://github.com/shaka-project/shaka-player/issues/6111
+      // It seems that Firefox Android reports that it supports
+      // Opus + Widevine, but it is not actually supported.
+      // It makes sense to drop early.
+      if (isFirefoxAndroid && audio && audio.encrypted &&
+          audio.codecs.toLowerCase().includes('opus')) {
+        shaka.log.debug('Dropping variant - not compatible with platform',
+            StreamUtils.getVariantSummaryString_(variant));
+        return false;
+      }
+
       if (audio) {
         const codecs = StreamUtils.getCorrectAudioCodecs_(audio.codecs);
         const fullType = MimeUtils.getFullOrConvertedType(
@@ -497,17 +524,6 @@ shaka.util.StreamUtils = class {
         audio.codecs = codecs;
       }
 
-      // See: https://github.com/shaka-project/shaka-player/issues/3380
-      if (shaka.util.Platform.isXboxOne() && video &&
-          ((video.width && video.width > 1920) ||
-          (video.height && video.height > 1080)) &&
-          (video.codecs.includes('avc1.') ||
-          video.codecs.includes('avc3.'))) {
-        shaka.log.debug('Dropping variant - not compatible with platform',
-            StreamUtils.getVariantSummaryString_(variant));
-        return false;
-      }
-
       const supported = variant.decodingInfos.some((decodingInfo) => {
         return decodingInfo.supported;
       });
@@ -790,7 +806,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';
     }
 
@@ -799,15 +815,7 @@ shaka.util.StreamUtils = class {
       return 'opus';
     }
 
-    // Some Tizen devices seem to misreport AC-3 support, but correctly
-    // report EC-3 support.  So query EC-3 as a fallback for AC-3.
-    // See https://github.com/shaka-project/shaka-player/issues/2989 for
-    // details.
-    if (shaka.util.Platform.isTizen()) {
-      return codecs.toLowerCase() == 'ac-3' ? 'ec-3' : codecs;
-    } else {
-      return codecs;
-    }
+    return codecs;
   }
 
 

package/lib/util/ts_parser.js

@@ -122,15 +122,15 @@ shaka.util.TsParser = class {
             // for example
             // NOTE this is only the PID of the track as found in TS,
             // but we are not using this for MP4 track IDs.
-            if (this.videoPid_ == null) {
+            if (parsedPIDs.video != -1) {
               this.videoPid_ = parsedPIDs.video;
               this.videoCodec_ = parsedPIDs.videoCodec;
             }
-            if (this.audioPid_ == null) {
+            if (parsedPIDs.audio != -1) {
               this.audioPid_ = parsedPIDs.audio;
               this.audioCodec_ = parsedPIDs.audioCodec;
             }
-            if (this.id3Pid_ == null) {
+            if (parsedPIDs.id3 != -1) {
               this.id3Pid_ = parsedPIDs.id3;
             }
 

package/lib/util/xml_utils.js

@@ -384,6 +384,11 @@ shaka.util.XmlUtils = class {
       return null;
     }
 
+    // Cobalt browser doesn't support document.createNodeIterator.
+    if (!('createNodeIterator' in document)) {
+      return rootElem;
+    }
+
     // SECURITY: Verify that the document does not contain elements from the
     // HTML or SVG namespaces, which could trigger script execution and XSS.
     const iterator = document.createNodeIterator(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.3.12",
+  "version": "4.3.14",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -42,7 +42,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/cea/cea_decoder_unit.js

@@ -44,6 +44,39 @@ describe('CeaDecoder', () => {
       decoder.clear();
     });
 
+    it('painton captions on CC4', () => {
+      const controlCount = 0x03;
+      const captionData = 0xc0 | controlCount;
+      const paintonCaptionCC4Packet = new Uint8Array([
+        ...atscCaptionInitBytes, captionData, /* padding= */ 0xff,
+        0xfd, 0x9d, 0x29, // Paint-on mode (RDC control code).
+        0xfd, 0xf4, 0xe5, // t, e
+        0xfd, 0x73, 0xf4, // s, t
+      ]);
+
+      const startTimeCaption1 = 1;
+      const startTimeCaption2 = 2;
+      const expectedText = 'test';
+
+      const topLevelCue = new shaka.text.Cue(startTimeCaption1,
+          startTimeCaption2, '');
+      topLevelCue.nestedCues = [
+        CeaUtils.createDefaultCue(
+            startTimeCaption1, startTimeCaption2, expectedText),
+      ];
+
+      const expectedCaptions = [{
+        stream: 'CC4',
+        cue: topLevelCue,
+      }];
+
+      decoder.extract(paintonCaptionCC4Packet, startTimeCaption1);
+      decoder.extract(eraseDisplayedMemory, startTimeCaption2);
+      const captions = decoder.decode();
+
+      expect(captions).toEqual(expectedCaptions);
+    });
+
     it('green and underlined popon caption data on CC3', () => {
       const controlCount = 0x08;
       const captionData = 0xc0 | controlCount;
@@ -486,6 +519,13 @@ describe('CeaDecoder', () => {
 
       expect(decoder.reset).toHaveBeenCalledTimes(1);
     });
+
+    it('does not attempt to extract SEI packet that is too short', () => {
+      const badData = new Uint8Array([0xb5]);
+      decoder.extract(badData, 0);
+      const captions = decoder.decode();
+      expect(captions.length).toBe(0);
+    });
   });
 
   describe('decodes CEA-708', () => {

package/test/dash/dash_parser_live_unit.js

@@ -607,12 +607,12 @@ describe('DashParser Live', () => {
     expect(onError).toHaveBeenCalledTimes(1);
   });
 
-  it('uses @minimumUpdatePeriod', async () => {
+  it('still updates when @minimumUpdatePeriod is zero', async () => {
     const lines = [
       '<SegmentTemplate startNumber="1" media="s$Number$.mp4" duration="2" />',
     ];
     // updateTime parameter sets @minimumUpdatePeriod in the manifest.
-    const manifestText = makeSimpleLiveManifestText(lines, updateTime);
+    const manifestText = makeSimpleLiveManifestText(lines, /* updateTime= */ 0);
 
     /** @type {!jasmine.Spy} */
     const tickAfter = updateTickSpy();
@@ -622,16 +622,14 @@ describe('DashParser Live', () => {
     await parser.start('dummy://foo', playerInterface);
 
     expect(tickAfter).toHaveBeenCalledTimes(1);
-    const delay = tickAfter.calls.mostRecent().args[0];
-    expect(delay).toBe(updateTime);
   });
 
-  it('still updates when @minimumUpdatePeriod is zero', async () => {
+  it('uses @minimumUpdatePeriod', async () => {
     const lines = [
       '<SegmentTemplate startNumber="1" media="s$Number$.mp4" duration="2" />',
     ];
     // updateTime parameter sets @minimumUpdatePeriod in the manifest.
-    const manifestText = makeSimpleLiveManifestText(lines, /* updateTime= */ 0);
+    const manifestText = makeSimpleLiveManifestText(lines, updateTime);
 
     /** @type {!jasmine.Spy} */
     const tickAfter = updateTickSpy();
@@ -640,10 +638,9 @@ describe('DashParser Live', () => {
     fakeNetEngine.setResponseText('dummy://foo', manifestText);
     await parser.start('dummy://foo', playerInterface);
 
-    const waitTime = shaka.dash.DashParser['MIN_UPDATE_PERIOD_'];
     expect(tickAfter).toHaveBeenCalledTimes(1);
     const delay = tickAfter.calls.mostRecent().args[0];
-    expect(delay).toBe(waitTime);
+    expect(delay).toBe(updateTime);
   });
 
   it('does not update when @minimumUpdatePeriod is missing', async () => {

package/test/dash/dash_parser_manifest_unit.js

@@ -57,6 +57,11 @@ describe('DashParser Manifest', () => {
     };
   });
 
+  afterEach(() => {
+    // Dash parser stop is synchronous.
+    parser.stop();
+  });
+
   /**
    * Makes a series of tests for the given manifest type.
    *

package/test/dash/dash_parser_segment_base_unit.js

@@ -43,6 +43,11 @@ describe('DashParser SegmentBase', () => {
     };
   });
 
+  afterEach(() => {
+    // Dash parser stop is synchronous.
+    parser.stop();
+  });
+
   it('requests init data for WebM', async () => {
     const source = [
       '<MPD mediaPresentationDuration="PT75S">',

package/test/dash/dash_parser_segment_list_unit.js

@@ -351,24 +351,28 @@ describe('DashParser SegmentList', () => {
       updateDuration: () => {},
       newDrmInfo: (stream) => {},
     };
-    const manifest = await dashParser.start('dummy://foo', playerInterface);
-    const stream = manifest.variants[0].video;
-    await stream.createSegmentIndex();
-    goog.asserts.assert(stream.segmentIndex, 'Expected index to be created');
+    try {
+      const manifest = await dashParser.start('dummy://foo', playerInterface);
+      const stream = manifest.variants[0].video;
+      await stream.createSegmentIndex();
+      goog.asserts.assert(stream.segmentIndex, 'Expected index to be created');
 
-    // Don't use Dash.testSegmentIndex since it uses SegmentIndex.find, which
-    // doesn't reproduce this issue.  We want to use Array.from which uses the
-    // iterator.
-    const expected = [
-      ManifestParser.makeReference('s1.mp4', 0, 10, baseUri),
-      ManifestParser.makeReference('s2.mp4', 10, 20, baseUri),
-      ManifestParser.makeReference('s3.mp4', 20, 30, baseUri),
+      // Don't use Dash.testSegmentIndex since it uses SegmentIndex.find, which
+      // doesn't reproduce this issue.  We want to use Array.from which uses
+      // the iterator.
+      const expected = [
+        ManifestParser.makeReference('s1.mp4', 0, 10, baseUri),
+        ManifestParser.makeReference('s2.mp4', 10, 20, baseUri),
+        ManifestParser.makeReference('s3.mp4', 20, 30, baseUri),
 
-      ManifestParser.makeReference('s3.mp4', 30, 40, baseUri),
-      ManifestParser.makeReference('s4.mp4', 40, 50, baseUri),
-      ManifestParser.makeReference('s5.mp4', 50, 60, baseUri),
-    ];
-    const actual = Array.from(stream.segmentIndex);
-    expect(actual).toEqual(expected);
+        ManifestParser.makeReference('s3.mp4', 30, 40, baseUri),
+        ManifestParser.makeReference('s4.mp4', 40, 50, baseUri),
+        ManifestParser.makeReference('s5.mp4', 50, 60, baseUri),
+      ];
+      const actual = Array.from(stream.segmentIndex);
+      expect(actual).toEqual(expected);
+    } finally {
+      dashParser.stop();
+    }
   });
 });

package/test/dash/dash_parser_segment_template_unit.js

@@ -52,6 +52,11 @@ describe('DashParser SegmentTemplate', () => {
     };
   });
 
+  afterEach(() => {
+    // Dash parser stop is synchronous.
+    parser.stop();
+  });
+
   shaka.test.Dash.makeTimelineTests(
       'SegmentTemplate', 'media="s$Number$.mp4"', []);
 

package/test/hls/hls_live_unit.js

@@ -501,10 +501,43 @@ describe('HlsParser live', () => {
 
     it('sets 3 times target duration as presentation delay if not configured',
         async () => {
+          const media = [
+            '#EXTM3U\n',
+            '#EXT-X-TARGETDURATION:5\n',
+            '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+            '#EXT-X-MEDIA-SEQUENCE:0\n',
+            '#EXTINF:2,\n',
+            'main.mp4\n',
+            '#EXTINF:2,\n',
+            'main.mp4\n',
+            '#EXTINF:2,\n',
+            'main.mp4\n',
+            '#EXTINF:2,\n',
+            'main.mp4\n',
+            '#EXTINF:2,\n',
+            'main.mp4\n',
+            '#EXTINF:2,\n',
+            'main.mp4\n',
+          ].join('');
           const manifest = await testInitialManifest(master, media);
           expect(manifest.presentationTimeline.getDelay()).toBe(15);
         });
 
+    it('sets 1 times target duration as presentation delay if there are not enough segments', async () => { // eslint-disable-line max-len
+      const media = [
+        '#EXTM3U\n',
+        '#EXT-X-TARGETDURATION:5\n',
+        '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+        '#EXT-X-MEDIA-SEQUENCE:0\n',
+        '#EXTINF:2,\n',
+        'main.mp4\n',
+        '#EXTINF:2,\n',
+        'main.mp4\n',
+      ].join('');
+      const manifest = await testInitialManifest(master, media);
+      expect(manifest.presentationTimeline.getDelay()).toBe(5);
+    });
+
     it('sets presentation delay for low latency mode', async () => {
       const mediaWithLowLatency = [
         '#EXTM3U\n',

package/test/hls/hls_parser_unit.js

@@ -739,6 +739,45 @@ 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 = true;
+    });
+
+    await testHlsParser(master, media, manifest);
+  });
+
   it('parses audio+video variant with no closed captions', async () => {
     const master = [
       '#EXTM3U\n',
@@ -1114,63 +1153,6 @@ describe('HlsParser', () => {
     expect(references[6].discontinuitySequence).toBe(3);
   });
 
-  it('sets reference timetampOffset based on discontinuity start time',
-      async () => {
-        const master = [
-          '#EXTM3U\n',
-          '#EXT-X-STREAM-INF:BANDWIDTH=2000000,CODECS="avc1"\n',
-          'video\n',
-        ].join('');
-
-        const media = [
-          '#EXTM3U\n',
-          '#EXT-X-VERSION:3\n',
-          '#EXT-X-TARGETDURATION:5\n',
-          '#EXT-X-MEDIA-SEQUENCE:0\n',
-          '#EXTINF:3,\n',
-          'clip0-video-0.ts\n',
-          '#EXTINF:1,\n',
-          'clip0-video-1.ts\n',
-          '#EXT-X-DISCONTINUITY\n',
-          '#EXTINF:2,\n',
-          'clip1-video-1.ts\n',
-          '#EXTINF:3,\n',
-          'clip1-video-2.ts\n',
-          '#EXT-X-DISCONTINUITY\n',
-          '#EXTINF:1,\n',
-          'media-clip2-video-0.ts\n',
-          '#EXTINF:1,\n',
-          'media-clip2-video-1.ts\n',
-          '#EXT-X-DISCONTINUITY\n',
-          '#EXTINF:4,\n',
-          'media-clip3-video-1.ts\n',
-          '#EXT-X-ENDLIST\n',
-        ].join('');
-
-        fakeNetEngine
-            .setResponseText('test:/master', master)
-            .setResponseText('test:/video', media);
-
-        const manifest = await parser.start('test:/master', playerInterface);
-        await manifest.variants[0].video.createSegmentIndex();
-
-        const segmentIndex = manifest.variants[0].video.segmentIndex;
-        const references = [];
-
-        for (let i = 0; i < 7; i++) {
-          references.push(segmentIndex.get(i));
-        }
-
-        expect(references[0].timestampOffset).toBe(0);
-        expect(references[1].timestampOffset).toBe(0);
-        expect(references[2].timestampOffset).toBe(4);
-        expect(references[3].timestampOffset).toBe(4);
-        expect(references[4].timestampOffset).toBe(9);
-        expect(references[5].timestampOffset).toBe(9);
-        expect(references[6].timestampOffset).toBe(11);
-      },
-  );
-
   it('parses characteristics from audio tags', async () => {
     const master = [
       '#EXTM3U\n',
@@ -2983,7 +2965,8 @@ describe('HlsParser', () => {
     const media = [
       '#EXTM3U\n',
       '#EXT-X-PLAYLIST-TYPE:VOD\n',
-      '#EXT-X-MAP:URI="init.mp4",BYTERANGE="616@0"\n',
+      '#EXT-X-BYTERANGE:616@0\n',
+      '#EXT-X-MAP:URI="init.mp4"\n',
       '#EXTINF:5,\n',
       'main.mp4\n',
       '#EXT-X-MAP:URI="init2.mp4",BYTERANGE="616@0"\n',
@@ -3011,8 +2994,15 @@ describe('HlsParser', () => {
     // uri.
     const initSegments = Array.from(actualVideo.segmentIndex).map(
         (seg) => seg.initSegmentReference);
-    expect(initSegments[0].getUris()[0]).toBe('test:/init.mp4');
-    expect(initSegments[1].getUris()[0]).toBe('test:/init2.mp4');
+    expect(initSegments.length).toBe(2);
+    const firstInitSegment = initSegments[0];
+    expect(firstInitSegment.getUris()[0]).toBe('test:/init.mp4');
+    expect(firstInitSegment.startByte).toBe(0);
+    expect(firstInitSegment.endByte).toBe(615);
+    const secondInitSegment = initSegments[1];
+    expect(secondInitSegment.getUris()[0]).toBe('test:/init2.mp4');
+    expect(secondInitSegment.startByte).toBe(0);
+    expect(secondInitSegment.endByte).toBe(615);
   });
 
   it('parses variants encrypted with AES-128', async () => {
@@ -3132,8 +3122,10 @@ describe('HlsParser', () => {
 
     const firstMp4Segment = mp4AesEncryptionVideo.segmentIndex.get(0);
     expect(firstMp4Segment.hlsAes128Key).toBeDefined();
+    expect(firstMp4Segment.initSegmentReference.hlsAes128Key).toBeDefined();
     const secondMp4Segment = mp4AesEncryptionVideo.segmentIndex.get(1);
     expect(secondMp4Segment.hlsAes128Key).toBeNull();
+    expect(secondMp4Segment.initSegmentReference.hlsAes128Key).toBeDefined();
 
     const tsAesEncryptionVideo = actual.variants[2].video;
     await tsAesEncryptionVideo.createSegmentIndex();

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