Chromium Code Reviews Chromium Code Reviews
Issue 1435713002:
Fixing WebRtcBrowserTest.CallAndModifyStream, for new addStream behavior. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW |
|---|---|
| 1 <html> | 1 <html> |
| 2 <head> | 2 <head> |
| 3 <script type="text/javascript" src="webrtc_test_utilities.js"></script> | 3 <script type="text/javascript" src="webrtc_test_utilities.js"></script> |
| 4 <script type="text/javascript" src="webrtc_test_audio.js"></script> | 4 <script type="text/javascript" src="webrtc_test_audio.js"></script> |
| 5 <script type="text/javascript"> | 5 <script type="text/javascript"> |
| 6 $ = function(id) { | 6 $ = function(id) { |
| 7 return document.getElementById(id); | 7 return document.getElementById(id); |
| 8 }; | 8 }; |
| 9 | 9 |
| 10 window.onerror = function(errorMsg, url, lineNumber, column, errorObj) { | 10 window.onerror = function(errorMsg, url, lineNumber, column, errorObj) { |
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 537 | 537 |
| 538 // Add an expectation that the received video track is removed from | 538 // Add an expectation that the received video track is removed from |
| 539 // gSecondConnection. | 539 // gSecondConnection. |
| 540 addExpectedEvent(); | 540 addExpectedEvent(); |
| 541 remoteStream2.onremovetrack = function() { | 541 remoteStream2.onremovetrack = function() { |
| 542 eventOccured(); | 542 eventOccured(); |
| 543 } | 543 } |
| 544 // When all the above events have occurred- the test pass. | 544 // When all the above events have occurred- the test pass. |
| 545 setAllEventsOccuredHandler(reportTestSuccess); | 545 setAllEventsOccuredHandler(reportTestSuccess); |
| 546 | 546 |
| 547 gFirstConnection.removeStream(localStream); | |
|
phoglund_chromium
2015/11/11 07:56:42
So the idea is that you detach the stream, modify
Taylor_Brandstetter
2015/11/11 16:12:27
Yes, you have the right idea. And once we have add
| |
| 547 localStream.addTrack(gLocalStream.getAudioTracks()[0]); | 548 localStream.addTrack(gLocalStream.getAudioTracks()[0]); |
| 548 localStream.removeTrack(localStream.getVideoTracks()[0]); | 549 localStream.removeTrack(localStream.getVideoTracks()[0]); |
| 550 gFirstConnection.addStream(localStream); | |
| 549 negotiate(); | 551 negotiate(); |
| 550 }); | 552 }); |
| 551 } | 553 } |
| 552 | 554 |
| 553 // Loads this page inside itself using an iframe, and ensures we can make a | 555 // Loads this page inside itself using an iframe, and ensures we can make a |
| 554 // successful getUserMedia + peerconnection call inside the iframe. | 556 // successful getUserMedia + peerconnection call inside the iframe. |
| 555 function callInsideIframe(constraints) { | 557 function callInsideIframe(constraints) { |
| 556 runInsideIframe(function(iframe) { | 558 runInsideIframe(function(iframe) { |
| 557 // Run a regular webrtc call inside the iframe. | 559 // Run a regular webrtc call inside the iframe. |
| 558 iframe.contentWindow.call(constraints); | 560 iframe.contentWindow.call(constraints); |
| (...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1018 <td><canvas width="320" height="240" id="remote-view-2-canvas" | 1020 <td><canvas width="320" height="240" id="remote-view-2-canvas" |
| 1019 style="display:none"></canvas></td> | 1021 style="display:none"></canvas></td> |
| 1020 <td><canvas width="320" height="240" id="remote-view-3-canvas" | 1022 <td><canvas width="320" height="240" id="remote-view-3-canvas" |
| 1021 style="display:none"></canvas></td> | 1023 style="display:none"></canvas></td> |
| 1022 <td><canvas width="320" height="240" id="remote-view-4-canvas" | 1024 <td><canvas width="320" height="240" id="remote-view-4-canvas" |
| 1023 style="display:none"></canvas></td> | 1025 style="display:none"></canvas></td> |
| 1024 </tr> | 1026 </tr> |
| 1025 </table> | 1027 </table> |
| 1026 </body> | 1028 </body> |
| 1027 </html> | 1029 </html> |
| OLD | NEW |
