Bug 1312886: P8. Update EME multikey-sequential WPT from upstream so they pass. r=jya
authorChris Pearce <cpearce@mozilla.com>
Fri, 28 Oct 2016 16:29:24 +1300
changeset 319927 5e28fc45d1364e909cbefbf078ba2ea3b26eeb53
parent 319926 09371a75ac7e3122e5ebe7154d1c3c89300b7d52
child 319928 aeb0df69182a4c13eb06f9a7f18bd66c437ce245
push id20749
push userryanvm@gmail.com
push dateSat, 29 Oct 2016 13:21:21 +0000
treeherderfx-team@1b170b39ed6b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya
bugs1312886
milestone52.0a1
Bug 1312886: P8. Update EME multikey-sequential WPT from upstream so they pass. r=jya MozReview-Commit-ID: 2XRTqkJbwBs
testing/web-platform/tests/encrypted-media/scripts/playback-temporary-multikey-sequential.js
--- a/testing/web-platform/tests/encrypted-media/scripts/playback-temporary-multikey-sequential.js
+++ b/testing/web-platform/tests/encrypted-media/scripts/playback-temporary-multikey-sequential.js
@@ -14,51 +14,91 @@ function runTest(config,qualifier) {
                             videoCapabilities: [{contentType: config.videoType}],
                             sessionTypes: ['temporary'] };
 
     async_test(function(test) {
         var _video = config.video,
             _mediaKeys,
             _mediaKeySessions = [],
             _mediaSource,
-            _playbackStarted = false;
+            _waitingForKey = false,
+            _playingCount = 0,
+            _canplayCount = 0,
+            _timeupdateWhileWaitingCount = 0;
 
         function startNewSession() {
             assert_less_than(_mediaKeySessions.length, config.initData.length);
             var mediaKeySession = _mediaKeys.createSession('temporary');
             waitForEventAndRunStep('message', mediaKeySession, onMessage, test);
             _mediaKeySessions.push(mediaKeySession);
             mediaKeySession.variantId = config.variantIds ? config.variantIds[_mediaKeySessions.length - 1] : undefined;
             mediaKeySession.generateRequest(config.initDataType, config.initData[_mediaKeySessions.length - 1]).catch(onFailure);
         }
 
         function onFailure(error) {
             forceTestFailureFromPromise(test, error);
         }
 
         function onMessage(event) {
+            var firstMessage = !_video.src;
             config.messagehandler(event.messageType, event.message, {variantId: event.target.variantId}).then(function(response) {
                 return event.target.update(response);
+            }).then(function(){
+                if (firstMessage) {
+                    _video.src = URL.createObjectURL(_mediaSource);
+                    return _mediaSource.done;
+                } else if (event.target.keyStatuses.size > 0){
+                    _waitingForKey = false;
+                    return Promise.resolve();
+                }
+            }).then(function(){
+                if (firstMessage) {
+                    _video.play();
+                }
             }).catch(onFailure);
         }
 
         function onWaitingForKey(event) {
+            _waitingForKey = true;
             if (config.checkReadyState) {
-                assert_equals(_video.readyState, _video.HAVE_METADATA, "Video readyState should be HAVE_METADATA on watingforkey event");
+                // This test does not start playing until the first license has been provided,
+                // so this event should occur when transitioning between keys.
+                // Thus, the frame at the current playback position is available and readyState
+                // should be HAVE_CURRENT_DATA.
+                assert_equals(_video.readyState, _video.HAVE_CURRENT_DATA, "Video readyState should be HAVE_CURRENT_DATA on watingforkey event");
             }
             startNewSession();
         }
 
         function onPlaying(event) {
-            assert_equals(_mediaKeySessions.length, 1, "Playback should start with a single key / session");
+            _playingCount++;
+            assert_equals(_mediaKeySessions.length, _playingCount, "Should get one 'playing' event per key / session added");
+            assert_less_than_equal(_playingCount, 2, "Should not get more than two 'playing' events.");
+        }
+
+        function onCanPlay(event) {
+            _canplayCount++;
+            assert_equals(_mediaKeySessions.length, _canplayCount, "Should get one 'canplay' event per key / session added");
+            assert_less_than_equal(_canplayCount, 2, "Should not get more than two 'canplay' events.");
         }
 
         function onTimeupdate(event) {
+            // We should not receive 'timeupdate' events due to playing while waiting for a key, except
+            // when we first start waiting for key we should change the readyState to HAVE_CURRENT_DATA
+            // which will trigger the "If the previous ready state was HAVE_FUTURE_DATA or more, and
+            // the new ready state is HAVE_CURRENT_DATA or less" case of the readyState change
+            // algorithm which requires a "timeupdate" event be fired.
+             if (_waitingForKey) {
+                assert_equals(++_timeupdateWhileWaitingCount, 1, "Should only receive one timeupdate while waiting for key");
+                assert_equals(_video.readyState, _video.HAVE_CURRENT_DATA, "Video readyState should be HAVE_CURRENT_DATA while wating for key");
+            }
+
             if (_video.currentTime > config.duration) {
                 assert_equals(_mediaKeySessions.length, config.initData.length, "It should require all keys to reach end of content");
+                assert_equals(_timeupdateWhileWaitingCount, 1, "Should have only received exactly one timeupdate while waiting for key");
                 _video.pause();
                 test.done();
             }
         }
 
         navigator.requestMediaKeySystemAccess(config.keysystem, [configuration]).then(function(access) {
             return access.createMediaKeys();
         }).then(function(mediaKeys) {
@@ -66,19 +106,17 @@ function runTest(config,qualifier) {
             return _video.setMediaKeys(_mediaKeys);
         }).then(function(){
             // Not using waitForEventAndRunStep() to avoid too many
             // EVENT(onTimeUpdate) logs.
             _video.addEventListener('timeupdate', test.step_func(onTimeupdate), true);
 
             waitForEventAndRunStep('waitingforkey', _video, onWaitingForKey, test);
             waitForEventAndRunStep('playing', _video, onPlaying, test);
-
-            startNewSession();
+            waitForEventAndRunStep('canplay', _video, onCanPlay, test);
 
             return testmediasource(config);
         }).then(function(source) {
             _mediaSource = source;
-            _video.src = URL.createObjectURL(_mediaSource);
-            _video.play();
+            startNewSession();
         }).catch(onFailure);
     }, testname);
 }