| 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 <script src="../../resources/js-test.js"></script> | 4 <script src="../../resources/js-test.js"></script> |
| 5 </head> | 5 </head> |
| 6 <body> | 6 <body> |
| 7 <script> | 7 <script> |
| 8 description("Test adding and removing tracks."); | 8 description("Test adding and removing tracks."); |
| 9 | 9 |
| 10 var stream1; | 10 var stream1; |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 | 109 |
| 110 // add new tracks (from stream2) | 110 // add new tracks (from stream2) |
| 111 tryAddTrack(stream1, stream2.getAudioTracks()[0]); | 111 tryAddTrack(stream1, stream2.getAudioTracks()[0]); |
| 112 tryAddTrack(stream1, stream2.getVideoTracks()[0]); | 112 tryAddTrack(stream1, stream2.getVideoTracks()[0]); |
| 113 | 113 |
| 114 // verify added tracks | 114 // verify added tracks |
| 115 shouldBe('stream1.getAudioTracks().length', '2'); | 115 shouldBe('stream1.getAudioTracks().length', '2'); |
| 116 shouldBe('stream1.getVideoTracks().length', '2'); | 116 shouldBe('stream1.getVideoTracks().length', '2'); |
| 117 shouldBe('stream1.getTracks().length', '4'); | 117 shouldBe('stream1.getTracks().length', '4'); |
| 118 | 118 |
| 119 // when all tracks have been removed, stream.ended should return true. | 119 // when all tracks have been removed, stream.active should return false. |
| 120 tryRemoveTrack(stream2, stream2.getAudioTracks()[0]); | 120 tryRemoveTrack(stream2, stream2.getAudioTracks()[0]); |
| 121 tryRemoveTrack(stream2, stream2.getVideoTracks()[0]); | 121 tryRemoveTrack(stream2, stream2.getVideoTracks()[0]); |
| 122 shouldBeTrue('stream2.ended'); | 122 shouldBeFalse('stream2.active'); |
| 123 | 123 |
| 124 stream1.stop(); | 124 stream1.stop(); |
| 125 | 125 |
| 126 shouldThrow('stream1.addTrack(audioTrack)'); | 126 shouldThrow('stream1.addTrack(audioTrack)'); |
| 127 shouldThrow('stream1.removeTrack(audioTrack)'); | 127 shouldThrow('stream1.removeTrack(audioTrack)'); |
| 128 | 128 |
| 129 setTimeout(finishJSTest, 0); | 129 setTimeout(finishJSTest, 0); |
| 130 } | 130 } |
| 131 | 131 |
| 132 function gotStream1(s) { | 132 function gotStream1(s) { |
| 133 stream1 = s; | 133 stream1 = s; |
| 134 getUserMedia({audio:true, video:true}, gotStream2); | 134 getUserMedia({audio:true, video:true}, gotStream2); |
| 135 } | 135 } |
| 136 | 136 |
| 137 getUserMedia({audio:true, video:true}, gotStream1); | 137 getUserMedia({audio:true, video:true}, gotStream1); |
| 138 | 138 |
| 139 window.jsTestIsAsync = true; | 139 window.jsTestIsAsync = true; |
| 140 window.successfullyParsed = true; | 140 window.successfullyParsed = true; |
| 141 </script> | 141 </script> |
| 142 </body> | 142 </body> |
| 143 </html> | 143 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 827673002:
Add MediaStream.active attribute (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master