| OLD | NEW |
| 1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> | 1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> |
| 2 <html> | 2 <html> |
| 3 <head> | 3 <head> |
| 4 <link rel="stylesheet" href="../js/resources/js-test-style.css"> | 4 <link rel="stylesheet" href="../js/resources/js-test-style.css"> |
| 5 <script src="../js/resources/js-test-pre.js"></script> | 5 <script src="../js/resources/js-test-pre.js"></script> |
| 6 </head> | 6 </head> |
| 7 <body> | 7 <body> |
| 8 <p id="description"></p> | 8 <p id="description"></p> |
| 9 <div id="console"></div> | 9 <div id="console"></div> |
| 10 <script> | 10 <script> |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 function testConstructor(s) { | 69 function testConstructor(s) { |
| 70 stream = s; | 70 stream = s; |
| 71 shouldThrow('new webkitMediaStream(document)'); | 71 shouldThrow('new webkitMediaStream(document)'); |
| 72 shouldThrow('new webkitMediaStream([document])'); | 72 shouldThrow('new webkitMediaStream([document])'); |
| 73 shouldThrow('new webkitMediaStream([stream.getAudioTracks()[0], document])')
; | 73 shouldThrow('new webkitMediaStream([stream.getAudioTracks()[0], document])')
; |
| 74 shouldThrow('new webkitMediaStream([null])'); | 74 shouldThrow('new webkitMediaStream([null])'); |
| 75 shouldThrow('new webkitMediaStream([undefined])'); | 75 shouldThrow('new webkitMediaStream([undefined])'); |
| 76 shouldThrow('new webkitMediaStream(null)'); | 76 shouldThrow('new webkitMediaStream(null)'); |
| 77 shouldThrow('new webkitMediaStream(undefined)'); | 77 shouldThrow('new webkitMediaStream(undefined)'); |
| 78 | 78 |
| 79 verifyStream(new webkitMediaStream(), 0, 0, true); | 79 verifyStream(new webkitMediaStream(), 0, 0); |
| 80 verifyStream(new webkitMediaStream([]), 0, 0, true); | 80 verifyStream(new webkitMediaStream([]), 0, 0); |
| 81 | 81 |
| 82 verifyStream(new webkitMediaStream(s), s.getAudioTracks().length, s.getVideo
Tracks().length, false); | 82 verifyStream(new webkitMediaStream(s), s.getAudioTracks().length, s.getVideo
Tracks().length); |
| 83 | 83 |
| 84 verifyStream(new webkitMediaStream([s.getAudioTracks()[0]]), 1, 0, false); | 84 verifyStream(new webkitMediaStream([s.getAudioTracks()[0]]), 1, 0); |
| 85 verifyStream(new webkitMediaStream([s.getVideoTracks()[0]]), 0, 1, false); | 85 verifyStream(new webkitMediaStream([s.getVideoTracks()[0]]), 0, 1); |
| 86 verifyStream(new webkitMediaStream([s.getAudioTracks()[0], s.getVideoTracks(
)[0]]), 1, 1, false); | 86 verifyStream(new webkitMediaStream([s.getAudioTracks()[0], s.getVideoTracks(
)[0]]), 1, 1); |
| 87 verifyStream(new webkitMediaStream([s.getVideoTracks()[0], s.getAudioTracks(
)[0], s.getVideoTracks()[0]]), 1, 1, false); | 87 verifyStream(new webkitMediaStream([s.getVideoTracks()[0], s.getAudioTracks(
)[0], s.getVideoTracks()[0]]), 1, 1); |
| 88 | 88 |
| 89 s.onended = function () { | 89 s.onended = function () { |
| 90 verifyStream(new webkitMediaStream([s.getAudioTracks()[0]]), 0, 0, true)
; | 90 verifyStream(new webkitMediaStream([s.getAudioTracks()[0]]), 0, 0); |
| 91 verifyStream(new webkitMediaStream([s.getVideoTracks()[0]]), 0, 0, true)
; | 91 verifyStream(new webkitMediaStream([s.getVideoTracks()[0]]), 0, 0); |
| 92 verifyStream(new webkitMediaStream([s.getAudioTracks()[0], s.getVideoTra
cks()[0]]), 0, 0, true); | 92 verifyStream(new webkitMediaStream([s.getAudioTracks()[0], s.getVideoTra
cks()[0]]), 0, 0); |
| 93 verifyStream(new webkitMediaStream(s), 0, 0, true); | 93 verifyStream(new webkitMediaStream(s), 0, 0); |
| 94 | 94 |
| 95 finishJSTest(); | 95 finishJSTest(); |
| 96 }; | 96 }; |
| 97 | 97 |
| 98 s.stop(); | 98 s.stop(); |
| 99 } | 99 } |
| 100 | 100 |
| 101 function verifyStream(s, numAudioTracks, numVideoTracks, ended) { | 101 function verifyStream(s, numAudioTracks, numVideoTracks) { |
| 102 newStream = s; | 102 newStream = s; |
| 103 nAudio = numAudioTracks; | 103 nAudio = numAudioTracks; |
| 104 nVideo = numVideoTracks; | 104 nVideo = numVideoTracks; |
| 105 | 105 |
| 106 testPassed('Stream constructed'); | 106 testPassed('Stream constructed'); |
| 107 shouldBeNonNull(newStream); | 107 shouldBeNonNull(newStream); |
| 108 shouldBeDefined(newStream); | 108 shouldBeDefined(newStream); |
| 109 shouldBe("newStream.constructor.name", "'MediaStream'"); | 109 shouldBe("newStream.constructor.name", "'MediaStream'"); |
| 110 shouldBe('newStream.getAudioTracks().length', 'nAudio'); | 110 shouldBe('newStream.getAudioTracks().length', 'nAudio'); |
| 111 shouldBe('newStream.getVideoTracks().length', 'nVideo'); | 111 shouldBe('newStream.getVideoTracks().length', 'nVideo'); |
| 112 | 112 |
| 113 if (ended) | |
| 114 shouldBeTrue('newStream.ended'); | |
| 115 else | |
| 116 shouldBeFalse('newStream.ended'); | |
| 117 | |
| 118 shouldBeTrue('checkIdAttribute(newStream.id)'); | 113 shouldBeTrue('checkIdAttribute(newStream.id)'); |
| 119 } | 114 } |
| 120 | 115 |
| 121 getUserMedia({video:true, audio:true}, gotStream); | 116 getUserMedia({video:true, audio:true}, gotStream); |
| 122 | 117 |
| 123 window.jsTestIsAsync = true; | 118 window.jsTestIsAsync = true; |
| 124 window.successfullyParsed = true; | 119 window.successfullyParsed = true; |
| 125 </script> | 120 </script> |
| 126 <script src="../js/resources/js-test-post.js"></script> | 121 <script src="../js/resources/js-test-post.js"></script> |
| 127 </body> | 122 </body> |
| 128 </html> | 123 </html> |
| OLD | NEW |