Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-02 12:32:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1041362 - Modify testcases because during the oncanplaythrough callback function, the element might not ended but the mediastream is ended. r=roc

Browse Source
This commit is contained in:
Benjamin Chen 2014-10-15 17:34:30 +08:00
parent cd19a8d6b0
commit e22f960990
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
content/media/test/test_mediarecorder_record_immediate_stop.html
View File

@ -97,9 +97,9 @@ function startTest(test, token) {
// This handler completes a start and stop of recording and verifies // This handler completes a start and stop of recording and verifies
// respective media recorder state. // respective media recorder state.
var canPlayThrough = function() { element.onloadedmetadata = function () {
element.removeEventListener('canplaythrough', canPlayThrough, false); element.onloadedmetadata = null;
element.play();
mediaRecorder.start(); mediaRecorder.start();
is(mediaRecorder.state, 'recording', 'Media recorder should be recording'); is(mediaRecorder.state, 'recording', 'Media recorder should be recording');
is(mediaRecorder.stream, element.stream, is(mediaRecorder.stream, element.stream,
@ -112,8 +112,7 @@ function startTest(test, token) {
'Media recorder stream = element stream post recording'); 'Media recorder stream = element stream post recording');
}; };
element.addEventListener('canplaythrough', canPlayThrough, false); element.preload = "metadata";
element.play();
} }
manager.runTests(gMediaRecorderTests, startTest); manager.runTests(gMediaRecorderTests, startTest);

28
content/media/test/test_mediarecorder_record_no_timeslice.html
View File

@ -84,24 +84,18 @@ function startTest(test, token) {
} }
}; };
element.oncanplaythrough = function () { element.preload = "metadata";
element.oncanplaythrough = null;
// If content has ended, skip the test
if (element.ended) {
ok(true, 'ended fired before canplaythrough, skipping test');
manager.finished(token);
} else {
// If content hasn't ended, start recording
mediaRecorder.start();
is(mediaRecorder.state, 'recording',
'Media recorder should be recording');
is(mediaRecorder.stream, element.stream,
'Media recorder stream = element stream at the start of recording');
// Recording will automatically stop when the stream ends.
}
}
element.play(); element.onloadedmetadata = function () {
element.onloadedmetadata = null;
mediaRecorder.start();
is(mediaRecorder.state, 'recording',
'Media recorder should be recording');
is(mediaRecorder.stream, element.stream,
'Media recorder stream = element stream at the start of recording');
element.play();
}
} }
manager.runTests(gMediaRecorderTests, startTest); manager.runTests(gMediaRecorderTests, startTest);

8
content/media/test/test_mediarecorder_record_session.html
View File

@ -54,15 +54,17 @@ function startTest(test, token) {
ok(false, 'Unexpected warning fired'); ok(false, 'Unexpected warning fired');
} }
element.oncanplaythrough = function () { element.preload = "metadata";
element.oncanplaythrough = null;
element.onloadedmetadata = function () {
element.onloadedmetadata = null;
element.play();
for (var i = 0; i < mExpectStopCount; i++) { for (var i = 0; i < mExpectStopCount; i++) {
mediaRecorder.start(1000); mediaRecorder.start(1000);
mediaRecorder.stop(); mediaRecorder.stop();
} }
} }
element.play();
} }
manager.runTests(gMediaRecorderTests, startTest); manager.runTests(gMediaRecorderTests, startTest);