Bug 1093835 - Check video flow in test_pc_videoRenegotiationInactiveAnswer.html. r=jib

MozReview-Commit-ID: G9JIcAXuiWX

--HG--
extra : rebase_source : e36ca4f5045db7669ce119233150b331c25dad32
This commit is contained in:
Andreas Pehrson 2017-04-28 11:15:11 +02:00
parent 8ef263241b
commit 845373e84c

View File

@ -15,14 +15,14 @@
var test; var test;
runNetworkTest(function (options) { runNetworkTest(function (options) {
var helper; const emitter = new VideoFrameEmitter();
const helper = new VideoStreamHelper();
test = new PeerConnectionTest(options); test = new PeerConnectionTest(options);
test.chain.replace("PC_LOCAL_GUM", [ test.chain.replace("PC_LOCAL_GUM", [
function PC_LOCAL_CANVAS_CAPTURESTREAM(test) { function PC_LOCAL_CANVAS_CAPTURESTREAM(test) {
helper = new VideoStreamHelper(); test.pcLocal.attachLocalStream(emitter.stream());
test.pcLocal.attachLocalStream(helper.stream());
} }
]); ]);
@ -30,7 +30,9 @@
function PC_REMOTE_WAIT_FOR_FRAMES() { function PC_REMOTE_WAIT_FOR_FRAMES() {
var vremote = test.pcRemote.remoteMediaElements[0]; var vremote = test.pcRemote.remoteMediaElements[0];
ok(vremote, "Should have remote video element for pcRemote"); ok(vremote, "Should have remote video element for pcRemote");
return helper.waitForFrames(vremote); emitter.start();
return addFinallyToPromise(helper.checkVideoPlaying(vremote, 10, 10, 16))
.finally(() => emitter.stop());
} }
]); ]);
@ -47,7 +49,9 @@
function PC_REMOTE_ENSURE_NO_FRAMES() { function PC_REMOTE_ENSURE_NO_FRAMES() {
var vremote = test.pcRemote.remoteMediaElements[0]; var vremote = test.pcRemote.remoteMediaElements[0];
ok(vremote, "Should have remote video element for pcRemote"); ok(vremote, "Should have remote video element for pcRemote");
return helper.verifyNoFrames(vremote); emitter.start();
return addFinallyToPromise(helper.checkVideoPaused(vremote, 10, 10, 16, 5000))
.finally(() => emitter.stop());
}, },
]); ]);
@ -60,7 +64,9 @@
function PC_REMOTE_WAIT_FOR_FRAMES_2() { function PC_REMOTE_WAIT_FOR_FRAMES_2() {
var vremote = test.pcRemote.remoteMediaElements[0]; var vremote = test.pcRemote.remoteMediaElements[0];
ok(vremote, "Should have remote video element for pcRemote"); ok(vremote, "Should have remote video element for pcRemote");
return helper.waitForFrames(vremote); emitter.start();
return addFinallyToPromise(helper.checkVideoPlaying(vremote, 10, 10, 16))
.finally(() => emitter.stop());
} }
]); ]);