shaka-player 2.5.1 → 2.5.5

package/lib/util/string_utils.js

@@ -17,6 +17,7 @@
 
 goog.provide('shaka.util.StringUtils');
 
+goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.util.Error');
 
@@ -212,12 +213,47 @@ shaka.util.StringUtils.toUTF16 = function(str, littleEndian) {
  * @return {string}
  */
 shaka.util.StringUtils.fromCharCode = function(array) {
-  let max = 16000;
-  let ret = '';
-  for (let i = 0; i < array.length; i += max) {
-    let subArray = array.subarray(i, i + max);
-    ret += String.fromCharCode.apply(null, subArray);
+  // Check the browser for what chunk sizes it supports.  Cache the result
+  // in an impl method to avoid checking several times.
+  if (!shaka.util.StringUtils.fromCharCodeImpl_) {
+    const supportsChunkSize = (size) => {
+      try {
+        const buffer = new Uint8Array(size);
+        // The compiler will complain about suspicious value if this isn't
+        // stored in a variable and used.
+        const foo = String.fromCharCode(...buffer);
+        goog.asserts.assert(foo, 'Should get value');
+        return true;
+      } catch (error) {
+        return false;
+      }
+    };
+
+    // Different browsers support different chunk sizes; find out the largest
+    // this browser supports so we can use larger chunks on supported browsers
+    // but still support lower-end devices that require small chunks.
+    // 64k is supported on all major desktop browsers.
+    for (let size = 64 * 1024; size > 0; size /= 2) {
+      if (supportsChunkSize(size)) {
+        shaka.util.StringUtils.fromCharCodeImpl_ = (buffer) => {
+          let ret = '';
+          for (let i = 0; i < buffer.length; i += size) {
+            const subArray = buffer.subarray(i, i + size);
+            ret += String.fromCharCode(...subArray);
+          }
+          return ret;
+        };
+        break;
+      }
+    }
   }
 
-  return ret;
+  goog.asserts.assert(
+      shaka.util.StringUtils.fromCharCodeImpl_,
+      'Unable to create a fromCharCode method');
+  return shaka.util.StringUtils.fromCharCodeImpl_(array);
 };
+
+
+/** @private {?function(!TypedArray):string} */
+shaka.util.StringUtils.fromCharCodeImpl_ = null;

package/lib/util/timer.js

@@ -62,7 +62,7 @@ shaka.util.Timer = class {
   }
 
   /**
-   * Have the timer call |onTick| after |seconds| has elasped unless |stop| is
+   * Have the timer call |onTick| after |seconds| has elapsed unless |stop| is
    * called first.
    *
    * @param {number} seconds

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "2.5.1",
+  "version": "2.5.5",
   "homepage": "https://github.com/google/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -11,47 +11,47 @@
     }
   ],
   "devDependencies": {
-    "array-includes": "~3.0.3",
-    "awesomplete": "~1.1.1",
-    "babel-core": "^6.26.0",
+    "awesomplete": "^1.1.4",
+    "babel-core": "^6.26.3",
+    "babel-plugin-istanbul": "^4.1.6",
     "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
+    "babel-preset-env": "^1.7.0",
     "cajon": "^0.4.4",
-    "dialog-polyfill": "^0.4.10",
+    "dialog-polyfill": "^0.5.0",
     "es6-promise-polyfill": "^1.2.0",
-    "es6-shim": "~0.35.3",
-    "eslint": "^4.14.0",
+    "eslint": "^5.16.0",
     "eslint-config-google": "^0.9.1",
-    "esprima": "^4.0.0",
-    "htmlhint": "yaniswang/HTMLHint#152a114f",
-    "in-publish": "~2.0.0",
-    "jasmine-ajax": "~3.3.1",
+    "esprima": "^4.0.1",
+    "htmlhint": "^0.11.0",
+    "jasmine-ajax": "^3.3.1",
     "jasmine-core": "^2.8.0",
-    "jsdoc": "joeyparrish/jsdoc#c2fe066a",
-    "karma": "~1.6.0",
+    "jsdoc": "github:joeyparrish/jsdoc#45c271fa",
+    "karma": "^4.1.0",
     "karma-babel-preprocessor": "^7.0.0",
-    "karma-chrome-launcher": "~2.0.0",
-    "karma-coverage": "~1.1.1",
-    "karma-edge-launcher": "~0.4.1",
-    "karma-firefox-launcher": "~1.0.1",
-    "karma-ie-launcher": "~1.0.0",
-    "karma-jasmine": "~1.1.0",
-    "karma-jasmine-ajax": "~0.1.13",
-    "karma-opera-launcher": "~1.0.0",
-    "karma-safari-launcher": "~1.0.0",
-    "karma-source-map-support": "^1.2.0",
-    "karma-spec-reporter": "~0.0.31",
-    "karma-webdriver-launcher": "~1.0.5",
-    "less": "^3.8.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.2",
+    "karma-edge-launcher": "^0.4.2",
+    "karma-firefox-launcher": "^1.1.0",
+    "karma-ie-launcher": "^1.0.0",
+    "karma-jasmine": "^1.1.0",
+    "karma-jasmine-ajax": "^0.1.13",
+    "karma-opera-launcher": "^1.0.0",
+    "karma-safari-launcher": "^1.0.0",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.32",
+    "karma-webdriver-launcher": "^1.0.7",
+    "less": "^3.9.0",
     "less-plugin-clean-css": "^1.5.1",
     "material-design-lite": "^1.3.0",
     "mux.js": "^5.1.3",
     "promise-mock": "^2.1.0",
-    "rimraf": "~2.6.1",
-    "sprintf-js": "~1.0.3",
-    "useragent": "~2.1.13",
-    "wd": "^1.8.0 <1.11.0",
-    "which": "~1.3.0"
+    "promise-polyfill": "<8.1.1",
+    "rimraf": "^2.6.3",
+    "sprintf-js": "^1.1.2",
+    "stylelint": "github:theodab/stylelint",
+    "stylelint-config-standard": "^18.3.0",
+    "tippy.js": "^4.3.1",
+    "which": "^1.3.1"
   },
   "main": "dist/shaka-player.compiled.js",
   "repository": {
@@ -63,6 +63,6 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "prepublish": "in-publish && python build/checkversion.py && python build/all.py --force || not-in-publish"
+    "prepublishOnly": "python build/checkversion.py && python build/all.py --force"
   }
 }

package/roadmap.md

@@ -0,0 +1,96 @@
+# Shaka Player Roadmap
+
+This doc shows all past and planned future milestones for Shaka Player, with
+brief details about the goals and rough dates of each milestone.  This is not a
+comprehensive list of features or fixes for each release.  For that, see
+CHANGELOG.md.
+
+The goals of future milestones are fluid until we begin that development cycle,
+so the exact milestone for future features is not pre-determined.
+
+Candidate features for future release cycles
+ - HLS discontinuity support
+ - Low-latency live (LHLS, equivalent for DASH)
+ - MediaCapabilities to make performance-based decisions
+ - Codec-switching
+ - Background fetch for offline storage
+ - Preload API
+ - Thumbnail tracks
+ - Own CEA parser, use mux.js only for TS
+ - Smaller, more modular binary
+ - IMA SDK ad integration demo
+ - Ad controls in the UI
+
+v2.6 - 2019 Q3 (estimated)
+ - Code health release
+ - Finish conversion to ES6
+ - Isolate DASH periods to the DASH parser
+
+=====
+
+v2.5 - 2019 Q2
+ - Video controls UI API
+ - FairPlay & iOS support
+ - CEA captions in HLS/CMAF and DASH w/ mux.js
+ - Single-file playback
+ - DASH drift tolerance
+
+v2.4 - 2018 Q2
+ - TTML and VTT regions
+ - CEA captions in HLS/TS
+ - Attach/detach API
+
+v2.3 - 2017 Q4
+ - HLS live
+ - Transmux TS w/ mux.js
+ - NetworkInformation API to improve bandwidth estimates
+ - ES6 transition begins
+
+v2.2 - 2017 Q3
+ - HLS event-type playlists
+ - TextDisplayer interface
+ - DASH xlink support
+
+v2.1 - 2017 Q2
+ - HLS VOD, clear & Widevine only, no CEA
+ - DASH trick mode tracks
+ - Async network filters
+
+v2.0 - 2016 Q3
+ - Multi-period DASH
+ - Chromecast API
+ - TTML, VTT-in-MP4, and TTML-in-MP4
+ - Safari, Firefox, & Opera support
+ - Plugin system (manifest parsers, network filters, text parsers)
+ - DASH emsg box support
+ - DASH IPR support
+
+v1.6 - 2015 Q4
+ - IE11, Edge, & PlayReady support
+ - Chromecast added to demo app
+
+v1.5 - 2015 Q3
+ - Unified configuration system
+ - Multiple DASH BaseURL elements for failover
+ - Side-loaded text streams
+
+v1.4 - 2015 Q3
+ - Code health release
+ - DASH Location element support
+ - Buffering config API
+ - License preprocessing API
+
+v1.3 - 2015 Q2
+ - DASH live
+ - Offline playback
+
+v1.2 - 2015 Q1
+ - DASH Role element support
+
+v1.1 - 2015 Q1
+ - EME API updates
+
+v1.0 - 2014 Q4
+ - DASH VOD (MP4 & WebM)
+ - VTT subtitles, rendered by the browser
+ - Widevine support

package/shaka-player.uncompiled.js

@@ -64,8 +64,11 @@ goog.require('shaka.text.TextEngine');
 goog.require('shaka.text.TtmlTextParser');
 goog.require('shaka.text.VttTextParser');
 goog.require('shaka.ui.Controls');
+goog.require('shaka.ui.PlayButton');
+goog.require('shaka.ui.SettingsMenu');
 goog.require('shaka.ui.OverflowMenu');
 goog.require('shaka.ui.AudioLanguageSelection');
+goog.require('shaka.ui.BigPlayButton');
 goog.require('shaka.ui.CastButton');
 goog.require('shaka.ui.Element');
 goog.require('shaka.ui.FastForwardButton');
@@ -74,7 +77,7 @@ goog.require('shaka.ui.Localization');
 goog.require('shaka.ui.MuteButton');
 goog.require('shaka.ui.Overlay');
 goog.require('shaka.ui.PipButton');
-goog.require('shaka.ui.PlayPauseButton');
+goog.require('shaka.ui.SmallPlayButton');
 goog.require('shaka.ui.PresentationTimeTracker');
 goog.require('shaka.ui.ResolutionSelection');
 goog.require('shaka.ui.RewindButton');
@@ -83,4 +86,5 @@ goog.require('shaka.ui.TextSelection');
 goog.require('shaka.ui.VolumeBar');
 goog.require('shaka.util.Dom');
 goog.require('shaka.util.Error');
+goog.require('shaka.util.FairPlayUtils');
 goog.require('shaka.util.Iterables');

package/test/dash/dash_parser_content_protection_unit.js

@@ -68,7 +68,8 @@ describe('DashParser ContentProtection', function() {
       adaptationSetLines, representation1Lines, representation2Lines) {
     let template = [
       '<MPD xmlns="urn:mpeg:DASH:schema:MPD:2011"',
-      '    xmlns:cenc="urn:mpeg:cenc:2013">',
+      '    xmlns:cenc="urn:mpeg:cenc:2013"',
+      '    xmlns:mspr="urn:microsoft:playready">',
       '  <Period duration="PT30S">',
       '    <SegmentTemplate media="s.mp4" duration="2" />',
       '    <AdaptationSet mimeType="video/mp4" codecs="avc1.4d401f">',
@@ -298,6 +299,39 @@ describe('DashParser ContentProtection', function() {
     await testDashParser(source, expected);
   });
 
+  it('extracts embedded PSSHs with mspr:pro', async () => {
+    const source = buildManifestText([
+      // AdaptationSet lines
+      '<ContentProtection',
+      '  schemeIdUri="urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95">',
+      '  <mspr:pro>UGxheXJlYWR5</mspr:pro>',
+      '</ContentProtection>',
+    ], [], []);
+    const expected = buildExpectedManifest([
+      buildDrmInfo('com.microsoft.playready', [], [
+        'AAAAKXBzc2gAAAAAmgTweZhAQoarkuZb4IhflQAAAAlQbGF5cmVhZHk=',
+      ]),
+    ]);
+    await testDashParser(source, expected);
+  });
+
+  it('extracts embedded PSSHs and prefer cenc:pssh over mspr:pro', async () => {
+    const source = buildManifestText([
+      // AdaptationSet lines
+      '<ContentProtection',
+      '  schemeIdUri="urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95">',
+      '  <cenc:pssh>bm8gaHVtYW4gY2FuIHJlYWQgYmFzZTY0IGRpcmVjdGx5</cenc:pssh>',
+      '  <mspr:pro>ZmFrZSBQbGF5cmVhZHkgUFJP</mspr:pro>',
+      '</ContentProtection>',
+    ], [], []);
+    const expected = buildExpectedManifest([
+      buildDrmInfo('com.microsoft.playready', [], [
+        'bm8gaHVtYW4gY2FuIHJlYWQgYmFzZTY0IGRpcmVjdGx5',
+      ]),
+    ]);
+    await testDashParser(source, expected);
+  });
+
   it('assumes all known key systems for generic CENC', async () => {
     let source = buildManifestText([
       // AdaptationSet lines

package/test/dash/dash_parser_manifest_unit.js

@@ -1215,4 +1215,64 @@ describe('DashParser Manifest', function() {
     const minBufferTime = manifest.minBufferTime;
     expect(minBufferTime).toEqual(75);
   });
+
+  it('does not set presentationDelay to NaN', async () => {
+    // NOTE: This is a regression test for #2015. It ensures that, if
+    // ignoreMinBufferTime is true and there is no suggestedPresentationDelay,
+    // we do not erroneously set presentationDelay to NaN.
+    const manifestText = [
+      '<MPD minBufferTime="PT75S">',
+      '  <Period id="1" duration="PT30S">',
+      '    <AdaptationSet id="1" mimeType="video/mp4">',
+      '      <Representation id="video-sd" width="640" height="480">',
+      '        <BaseURL>v-sd.mp4</BaseURL>',
+      '        <SegmentBase indexRange="100-200" />',
+      '      </Representation>',
+      '    </AdaptationSet>',
+      '  </Period>',
+      '</MPD>',
+    ].join('\n');
+
+    fakeNetEngine.setResponseText('dummy://foo', manifestText);
+    const config = shaka.util.PlayerConfiguration.createDefault().manifest;
+    config.dash.ignoreMinBufferTime = true;
+    parser.configure(config);
+
+    const manifest = await parser.start('dummy://foo', playerInterface);
+    const presentationTimeline = manifest.presentationTimeline;
+    const presentationDelay = presentationTimeline.getDelay();
+    expect(presentationDelay).not.toBeNaN();
+    expect(presentationDelay).toBe(config.dash.defaultPresentationDelay);
+  });
+
+  it('converts Accessibility element to "kind"', async () => {
+    const manifestText = [
+      '<MPD minBufferTime="PT75S">',
+      '  <Period id="1" duration="PT30S">',
+      '    <AdaptationSet id="1" contentType="text">',
+      '      <Accessibility schemeIdUri="urn:mpeg:dash:role:2011" ',
+      '          value="captions" />',
+      '      <Accessibility schemeIdUri="urn:mpeg:dash:role:2011" ',
+      '          value="foo" />',
+      '      <Accessibility schemeIdUri="foobar" value="bar" />',
+      '      <Representation id="text-en" mimeType="text/webvtt">',
+      '        <BaseURL>t-en.vtt</BaseURL>',
+      '      </Representation>',
+      '    </AdaptationSet>',
+      '    <AdaptationSet id="1" mimeType="video/mp4">',
+      '      <Representation id="video-sd" width="640" height="480">',
+      '        <BaseURL>v-sd.mp4</BaseURL>',
+      '        <SegmentBase indexRange="100-200" />',
+      '      </Representation>',
+      '    </AdaptationSet>',
+      '  </Period>',
+      '</MPD>',
+    ].join('\n');
+
+    fakeNetEngine.setResponseText('dummy://foo', manifestText);
+    const manifest = await parser.start('dummy://foo', playerInterface);
+    const textStream = manifest.periods[0].textStreams[0];
+    expect(textStream.roles).toEqual(['captions', 'foo']);
+    expect(textStream.kind).toBe('caption');
+  });
 });

package/test/hls/hls_live_unit.js

@@ -273,12 +273,18 @@ describe('HlsParser live', function() {
       });
 
       it('updates all streams', function(done) {
+        const masterlist = [
+          '#EXTM3U\n',
+          '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1",AUDIO="aud1",',
+          'RESOLUTION=960x540,FRAME-RATE=60\n',
+          'video\n',
+        ].join('');
         const audio = [
           '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aud1",LANGUAGE="eng",',
           'URI="audio"\n',
         ].join('');
 
-        let masterWithAudio = master + audio;
+        let masterWithAudio = masterlist + audio;
         let ref1 = ManifestParser.makeReference('test:/main.mp4',
                                                 0, 2, 4);
         let ref2 = ManifestParser.makeReference('test:/main2.mp4',

package/test/hls/hls_parser_unit.js

@@ -1107,6 +1107,56 @@ describe('HlsParser', function() {
         .catch(fail).then(done);
   });
 
+  it('drops failed text streams when configured to', async () => {
+    const master = [
+      '#EXTM3U\n',
+      '#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="sub1",LANGUAGE="eng",',
+      'URI="text"\n',
+      '#EXT-X-STREAM-INF:BANDWIDTH=200,CODECS="avc1,vtt",',
+      'RESOLUTION=960x540,FRAME-RATE=60,SUBTITLES="sub1"\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 textMedia = [
+      '#EXTM3U\n',
+      '#EXT-X-PLAYLIST-TYPE:VOD\n',
+      '#EXTINF:5,\n',
+      '#EXT-X-BYTERANGE:121090@616\n',
+      'main.foo',
+    ].join('');
+
+    /* eslint-disable indent */
+    const manifest = new shaka.test.ManifestGenerator()
+        .anyTimeline()
+        .addPeriod(0)
+          .addPartialVariant()
+            .addPartialStream(ContentType.VIDEO)
+        .build();
+    /* eslint-enable indent */
+
+    fakeNetEngine
+        .setResponseText('test:/master', master)
+        .setResponseText('test:/audio', media)
+        .setResponseText('test:/video', media)
+        .setResponseText('test:/text', textMedia)
+        .setResponseText('test:/main.foo', '')
+        .setResponseValue('test:/init.mp4', initSegmentData)
+        .setResponseValue('test:/main.mp4', segmentData);
+
+    config.hls.ignoreTextStreamFailures = true;
+    const actual = await parser.start('test:/master', playerInterface);
+    expect(actual).toEqual(manifest);
+  });
+
   it('parses video described by a media tag', async () => {
     const master = [
       '#EXTM3U\n',

package/test/media/drm_engine_unit.js

@@ -829,7 +829,7 @@ describe('DrmEngine', function() {
       it('is listened for', async () => {
         await initAndAttach();
         expect(mockVideo.addEventListener).toHaveBeenCalledWith(
-            'encrypted', jasmine.any(Function), false);
+            'encrypted', jasmine.any(Function), jasmine.anything());
       });
 
       it('triggers the creation of a session', async () => {
@@ -924,7 +924,7 @@ describe('DrmEngine', function() {
             {initDataType: 'webm', initData: initData, keyId: null});
 
         expect(session1.addEventListener).toHaveBeenCalledWith(
-            'message', jasmine.any(Function), false);
+            'message', jasmine.any(Function), jasmine.anything());
       });
 
       it('triggers a license request', async () => {
@@ -1027,7 +1027,7 @@ describe('DrmEngine', function() {
             {initDataType: 'webm', initData: initData, keyId: null});
 
         expect(session1.addEventListener).toHaveBeenCalledWith(
-            'keystatuseschange', jasmine.any(Function), false);
+            'keystatuseschange', jasmine.any(Function), jasmine.anything());
       });
 
       it('triggers callback', function(done) {
@@ -1262,8 +1262,14 @@ describe('DrmEngine', function() {
       // Not mocked.  Run data through real data URI parser to ensure that it is
       // correctly formatted.
       fakeNetEngine.request.and.callFake(function(type, request) {
+        const requestType = shaka.net.NetworkingEngine.RequestType.LICENSE;
+
+        // A dummy progress callback.
+        const progressUpdated = (elapsedMs, bytes, bytesRemaining) => {};
+
         // eslint-disable-next-line new-cap
-        return shaka.net.DataUriPlugin(request.uris[0], request);
+        return shaka.net.DataUriPlugin(
+            request.uris[0], request, requestType, progressUpdated);
       });
 
       await initAndAttach();

package/test/media/media_source_engine_integration.js

@@ -193,6 +193,18 @@ describe('MediaSourceEngine', function() {
     expect(mediaSource.duration).toBeCloseTo(30);
   });
 
+  it('does not throw if endOfStrem called more than once', async () => {
+    const initObject = new Map();
+    initObject.set(ContentType.VIDEO, getFakeStream(metadata.video));
+    await mediaSourceEngine.init(initObject, false);
+    await mediaSourceEngine.setDuration(presentationDuration);
+    await appendInit(ContentType.VIDEO);
+    await append(ContentType.VIDEO, 1);
+    // Call endOfStream twice. There should be no exception.
+    await mediaSourceEngine.endOfStream();
+    await mediaSourceEngine.endOfStream();
+  });
+
   it('queues operations', function(done) {
     let resolutionOrder = [];
     let requests = [];

package/test/media/media_source_engine_unit.js

@@ -1066,6 +1066,8 @@ describe('MediaSourceEngine', function() {
           new shaka.test.StatusPromise(mediaSourceEngine.appendBuffer(
               ContentType.AUDIO, buffer2, null, null,
               /* hasClosedCaptions */ false));
+      // Create the expectation first so we don't get unhandled rejection errors
+      const expected = expectAsync(rejected).toBeRejected();
 
       expect(audioSourceBuffer.appendBuffer).toHaveBeenCalledWith(buffer);
       expect(audioSourceBuffer.appendBuffer).not.toHaveBeenCalledWith(buffer2);
@@ -1076,7 +1078,7 @@ describe('MediaSourceEngine', function() {
       expect(p.status).toBe('pending');
       await Util.delay(0.1);
       expect(p.status).toBe('pending');
-      expect(rejected.status).toBe('rejected');
+      await expected;
       expect(audioSourceBuffer.appendBuffer).toHaveBeenCalledWith(buffer);
       expect(audioSourceBuffer.appendBuffer).not.toHaveBeenCalledWith(buffer2);
       audioSourceBuffer.updateend();

package/test/media/playhead_unit.js

@@ -200,9 +200,9 @@ describe('Playhead', function() {
           Util.spyFunc(onEvent));
 
       expect(video.addEventListener).toHaveBeenCalledWith(
-          'loadedmetadata', jasmine.any(Function), false);
+          'loadedmetadata', jasmine.any(Function), jasmine.anything());
       expect(video.addEventListener).not.toHaveBeenCalledWith(
-          'seeking', jasmine.any(Function), jasmine.any(Boolean));
+          'seeking', jasmine.any(Function), jasmine.anything());
 
       expect(playhead.getTime()).toBe(5);
       expect(video.currentTime).toBe(0);
@@ -211,7 +211,8 @@ describe('Playhead', function() {
       video.on['loadedmetadata']();
 
       expect(video.addEventListener).toHaveBeenCalledWith(
-          'seeking', jasmine.any(Function), false);
+          'seeking', jasmine.any(Function), jasmine.anything());
+      video.on['seeking']();
 
       expect(playhead.getTime()).toBe(5);
       expect(video.currentTime).toBe(5);
@@ -239,6 +240,7 @@ describe('Playhead', function() {
           Util.spyFunc(onSeek),
           Util.spyFunc(onEvent));
 
+      video.on['seeking']();
       expect(playhead.getTime()).toBe(5);
       expect(video.currentTime).toBe(5);
 
@@ -314,7 +316,7 @@ describe('Playhead', function() {
           Util.spyFunc(onEvent));
 
       expect(video.addEventListener).toHaveBeenCalledWith(
-          'loadedmetadata', jasmine.any(Function), false);
+          'loadedmetadata', jasmine.any(Function), jasmine.anything());
 
       expect(playhead.getTime()).toBe(5);
       expect(video.currentTime).toBe(0);
@@ -347,7 +349,7 @@ describe('Playhead', function() {
           Util.spyFunc(onEvent));
 
       expect(video.addEventListener).toHaveBeenCalledWith(
-          'loadedmetadata', jasmine.any(Function), false);
+          'loadedmetadata', jasmine.any(Function), jasmine.anything());
 
       expect(playhead.getTime()).toBe(60);
       expect(video.currentTime).toBe(0);