LayoutTests/http/tests/media/media-source/mediasource-play-then-seek-back.html - Issue 20114005: Layout Test for basic MSE seek scenario.

Side by Side Diff: LayoutTests/http/tests/media/media-source/mediasource-play-then-seek-back.html

Issue 20114005: Layout Test for basic MSE seek scenario. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Code cleanup and reorganisation. Created 7 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « no previous file | LayoutTests/http/tests/media/media-source/mediasource-play-then-seek-back-expected.txt » ('j') | LayoutTests/http/tests/media/media-source/mediasource-util.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <!DOCTYPE html>

	2 <html>

	3 <head>

	4 <script src="/w3c/resources/testharness.js"></script>

	5 <script src="/w3c/resources/testharnessreport.js"></script>

	6 <script src="mediasource-util.js"></script>

	7 <script src="/media/resources/media-source/webm/segment-info.js"></scrip t>

	8 <link rel="stylesheet" href="/w3c/resources/testharness.css">

	9 </head>

	10 <body>

	11 <div id='log'></div>

	12

	13 <script>

	14

	15 function seekBackAfterPlayingTest(testFunction, description, options )

	16 {

	17 mediasource_test(function(test, mediaElement, mediaSource)

	18 {

	19 var segmentInfo = WebMSegmentInfo.testWebM;

	20 test.failOnEvent(mediaElement, 'error');

	21

	22 var sourceBuffer = mediaSource.addSourceBuffer(segmentInfo.t ype);

	23 MediaSourceUtil.loadBinaryData(test, segmentInfo.url, functi on(mediaData)

	24 {

	25 testFunction(test, mediaElement, mediaSource, segmentInf o, sourceBuffer, mediaData);

	26 });

	27 }, description, options);

	28 }

	29

	30 seekBackAfterPlayingTest(function(test, mediaElement, mediaSource, s egmentInfo, sourceBuffer, mediaData)

	31 {

	32

	33 mediaElement.play();

	34 // Append all the segments

	35 test.expectEvent(sourceBuffer, 'updateend', 'sourceBuffer');

	36 test.expectEvent(mediaElement, 'playing', 'Playing triggered');

	37 sourceBuffer.appendBuffer(mediaData);

	38

	39 function confirmPlayThenEnd()

	40 {

	41 function delayedPlayHandlerThatEnds()

	42 {

	43 assert_greater_than(mediaElement.currentTime, 0.0, 'Play back has started after seek.');

	44 test.done();

	45 }

	46 test.expectDelayedCallback(delayedPlayHandlerThatEnds);

	47 }

	48

	49 function finishSeekThenPlay()

	50 {

	51 assert_true(mediaElement.seeking, 'mediaElement is seeking') ;

	52 assert_equals(mediaElement.currentTime, 0.0, 'Current time i s 0.0');

	53 test.expectEvent(mediaElement, 'timeupdate', 'timeupdate fir ed.');

	54 test.expectEvent(mediaElement, 'seeked', 'mediaElement finis hed seek');

	55

	56 test.waitForExpectedEvents(function()

	57 {

	58 confirmPlayThenEnd();

	59 });

	60 }

	61

	62 function delayedPlayHandler()

	63 {

	64 assert_greater_than(mediaElement.currentTime, 0.0, 'Playback has started.');

	65 test.expectEvent(mediaElement, 'seeking', 'mediaElement');

	66 mediaElement.currentTime = 0.0;

	67

	68 test.waitForExpectedEvents(function()

	69 {

	70 finishSeekThenPlay();

	71 });

	72 }

	73

	74 test.waitForExpectedEvents(function()

	75 {

	76 test.expectDelayedCallback(delayedPlayHandler);
	acolwell GONE FROM CHROMIUM 2013/08/06 18:42:37 After looking at this some more, it seems line wha After looking at this some more, it seems line what you really want here and above is something along the lines of test.waitForCurrentTimeToAdvance(mediaElement, function() { ... }); This function could capture the current value of currentTime and then listen for timeupdate events until currentTime changes. I think that would be more robust to bot load then a hard coded timeout. I also think it would make your intentions here more explicit. wolenetz 2013/08/06 21:28:58 If going this route, please use a separate mechani Show quoted text On 2013/08/06 18:42:37, acolwell wrote: > After looking at this some more, it seems line what you really want here and > above is something along the lines of > > test.waitForCurrentTimeToAdvance(mediaElement, function() > { > ... > }); > > This function could capture the current value of currentTime and then listen for > timeupdate events until currentTime changes. I think that would be more robust > to bot load then a hard coded timeout. I also think it would make your > intentions here more explicit. If going this route, please use a separate mechanism to listen / expect the timeupdate events than the existing expectEvent / waitForExpectedEvents. Otherwise, users of waitForCurrentTimeToAdvance may get flaky expectation matching for their expected timeupdate and other events on the mediaElement (sequence is enforced in waitForExpectedEvents; waitForCurrentTimeToAdvance shouldn't impact this other than mentioning in the util API that timeupdate events are used by this method to trigger checking for time advancement). anandc 2013/08/06 21:30:51 This is a good idea, thanks. PTAL at the new waitF Show quoted text On 2013/08/06 18:42:37, acolwell wrote: > After looking at this some more, it seems line what you really want here and > above is something along the lines of > > test.waitForCurrentTimeToAdvance(mediaElement, function() > { > ... > }); > > This function could capture the current value of currentTime and then listen for > timeupdate events until currentTime changes. I think that would be more robust > to bot load then a hard coded timeout. I also think it would make your > intentions here more explicit. This is a good idea, thanks. PTAL at the new waitForTimeUpdate in *utils.js. I thought of adding parameters that specify a target-time and a comparison operator, to check if current time is < or > target-time, and then calling the callback. Testing that properly took a while, so uploading this for now.
	77 });

	78

	79 }, 'Test playing then seeking back.');

	80 </script>

	81 </body>

	82 </html>

OLD	NEW