| 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"> | 4 <script type="text/javascript"> |
| 5 $ = function(id) { | 5 $ = function(id) { |
| 6 return document.getElementById(id); | 6 return document.getElementById(id); |
| 7 }; | 7 }; |
| 8 | 8 |
| 9 var gFirstConnection = null; | 9 var gFirstConnection = null; |
| 10 var gSecondConnection = null; | 10 var gSecondConnection = null; |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 fourthConnection = createConnection(null, 'remote-view-4'); | 95 fourthConnection = createConnection(null, 'remote-view-4'); |
| 96 fourthConnection.addStream(gRemoteStreams['remote-view-2']); | 96 fourthConnection.addStream(gRemoteStreams['remote-view-2']); |
| 97 | 97 |
| 98 negotiateBetween(thirdConnection, fourthConnection); | 98 negotiateBetween(thirdConnection, fourthConnection); |
| 99 | 99 |
| 100 waitForVideo('remote-view-3'); | 100 waitForVideo('remote-view-3'); |
| 101 waitForVideo('remote-view-4'); | 101 waitForVideo('remote-view-4'); |
| 102 } | 102 } |
| 103 | 103 |
| 104 // Do the forwarding after we have received video. | 104 // Do the forwarding after we have received video. |
| 105 detectVideoIn('remote-view-1', onRemoteStream1); | 105 detectVideoPlaying('remote-view-1', onRemoteStream1); |
| 106 detectVideoIn('remote-view-2', onRemoteStream2); | 106 detectVideoPlaying('remote-view-2', onRemoteStream2); |
| 107 } | 107 } |
| 108 | 108 |
| 109 // Test that we can setup call with an audio and video track and | 109 // Test that we can setup call with an audio and video track and |
| 110 // simulate that the remote peer don't support MSID. | 110 // simulate that the remote peer don't support MSID. |
| 111 function callWithoutMsidAndBundle() { | 111 function callWithoutMsidAndBundle() { |
| 112 createConnections(null); | 112 createConnections(null); |
| 113 transformSdp = removeBundle; | 113 transformSdp = removeBundle; |
| 114 transformRemoteSdp = removeMsid; | 114 transformRemoteSdp = removeMsid; |
| 115 gTestWithoutMsid = true; | 115 gTestWithoutMsid = true; |
| 116 navigator.webkitGetUserMedia({audio: true, video: true}, | 116 navigator.webkitGetUserMedia({audio: true, video: true}, |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 addExpectedEvent(); | 205 addExpectedEvent(); |
| 206 var waitDtmf = setInterval(function() { | 206 var waitDtmf = setInterval(function() { |
| 207 if (gSentTones == tones) { | 207 if (gSentTones == tones) { |
| 208 clearInterval(waitDtmf); | 208 clearInterval(waitDtmf); |
| 209 eventOccured(); | 209 eventOccured(); |
| 210 } | 210 } |
| 211 }, 100); | 211 }, 100); |
| 212 } | 212 } |
| 213 | 213 |
| 214 // Do the DTMF test after we have received video. | 214 // Do the DTMF test after we have received video. |
| 215 detectVideoIn('remote-view-2', onCallEstablished); | 215 detectVideoPlaying('remote-view-2', onCallEstablished); |
| 216 } | 216 } |
| 217 | 217 |
| 218 // Test call with a new Video MediaStream that has been created based on a | 218 // Test call with a new Video MediaStream that has been created based on a |
| 219 // stream generated by getUserMedia. | 219 // stream generated by getUserMedia. |
| 220 function callWithNewVideoMediaStream() { | 220 function callWithNewVideoMediaStream() { |
| 221 createConnections(null); | 221 createConnections(null); |
| 222 navigator.webkitGetUserMedia({audio: true, video: true}, | 222 navigator.webkitGetUserMedia({audio: true, video: true}, |
| 223 createNewVideoStreamAndAddToBothConnections, printGetUserMediaError); | 223 createNewVideoStreamAndAddToBothConnections, printGetUserMediaError); |
| 224 waitForVideo('remote-view-1'); | 224 waitForVideo('remote-view-1'); |
| 225 waitForVideo('remote-view-2'); | 225 waitForVideo('remote-view-2'); |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 634 <td><canvas width="320" height="240" id="remote-view-2-canvas" | 634 <td><canvas width="320" height="240" id="remote-view-2-canvas" |
| 635 style="display:none"></canvas></td> | 635 style="display:none"></canvas></td> |
| 636 <td><canvas width="320" height="240" id="remote-view-3-canvas" | 636 <td><canvas width="320" height="240" id="remote-view-3-canvas" |
| 637 style="display:none"></canvas></td> | 637 style="display:none"></canvas></td> |
| 638 <td><canvas width="320" height="240" id="remote-view-4-canvas" | 638 <td><canvas width="320" height="240" id="remote-view-4-canvas" |
| 639 style="display:none"></canvas></td> | 639 style="display:none"></canvas></td> |
| 640 </tr> | 640 </tr> |
| 641 </table> | 641 </table> |
| 642 </body> | 642 </body> |
| 643 </html> | 643 </html> |
| OLD | NEW |