| OLD | NEW |
|---|
| 1 | 1 |
| 2 <html> | 2 <html> |
| 3 <head> | 3 <head> |
| 4 <script type="text/javascript" src="webrtc_test_utilities.js"></script> | 4 <script type="text/javascript" src="webrtc_test_utilities.js"></script> |
| 5 <script type="text/javascript" src="webrtc_test_common.js"></script> | 5 <script type="text/javascript" src="webrtc_test_common.js"></script> |
| 6 <script type="text/javascript" src="webrtc_test_audio.js"></script> | |
| 7 <script type="text/javascript"> | 6 <script type="text/javascript"> |
| 8 $ = function(id) { | 7 $ = function(id) { |
| 9 return document.getElementById(id); | 8 return document.getElementById(id); |
| 10 }; | 9 }; |
| 11 | 10 |
| 12 window.onerror = function(errorMsg, url, lineNumber, column, errorObj) { | 11 window.onerror = function(errorMsg, url, lineNumber, column, errorObj) { |
| 13 failTest('Error: ' + errorMsg + '\nScript: ' + url + | 12 failTest('Error: ' + errorMsg + '\nScript: ' + url + |
| 14 '\nLine: ' + lineNumber + '\nColumn: ' + column + | 13 '\nLine: ' + lineNumber + '\nColumn: ' + column + |
| 15 '\nStackTrace: ' + errorObj); | 14 '\nStackTrace: ' + errorObj); |
| 16 } | 15 } |
| 17 | 16 |
| 18 var gFirstConnection = null; | 17 var gFirstConnection = null; |
| 19 var gSecondConnection = null; | 18 var gSecondConnection = null; |
| 20 var gTestWithoutMsid = false; | |
| 21 var gLocalStream = null; | 19 var gLocalStream = null; |
| 22 | 20 |
| 23 var gRemoteStreams = {}; | 21 var gRemoteStreams = {}; |
| 24 | 22 |
| 25 // When using external SDES, the crypto key is chosen by javascript. | 23 // When using external SDES, the crypto key is chosen by javascript. |
| 26 var EXTERNAL_SDES_LINES = { | 24 var EXTERNAL_SDES_LINES = { |
| 27 'audio': 'a=crypto:1 AES_CM_128_HMAC_SHA1_80 ' + | 25 'audio': 'a=crypto:1 AES_CM_128_HMAC_SHA1_80 ' + |
| 28 'inline:PS1uQCVeeCFCanVmcjkpPywjNWhcYD0mXXtxaVBR', | 26 'inline:PS1uQCVeeCFCanVmcjkpPywjNWhcYD0mXXtxaVBR', |
| 29 'video': 'a=crypto:1 AES_CM_128_HMAC_SHA1_80 ' + | 27 'video': 'a=crypto:1 AES_CM_128_HMAC_SHA1_80 ' + |
| 30 'inline:d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj', | 28 'inline:d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj', |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 | 226 |
| 229 gLocalStream = localStream; | 227 gLocalStream = localStream; |
| 230 } | 228 } |
| 231 | 229 |
| 232 function negotiate() { | 230 function negotiate() { |
| 233 negotiateBetween(gFirstConnection, gSecondConnection); | 231 negotiateBetween(gFirstConnection, gSecondConnection); |
| 234 } | 232 } |
| 235 | 233 |
| 236 function onRemoteStream(e, target) { | 234 function onRemoteStream(e, target) { |
| 237 console.log("Receiving remote stream..."); | 235 console.log("Receiving remote stream..."); |
| 238 if (gTestWithoutMsid && e.stream.id != "default") { | |
| 239 failTest('a default remote stream was expected but instead ' + | |
| 240 e.stream.id + ' was received.'); | |
| 241 } | |
| 242 gRemoteStreams[target] = e.stream; | 236 gRemoteStreams[target] = e.stream; |
| 243 var remoteStreamUrl = URL.createObjectURL(e.stream); | 237 var remoteStreamUrl = URL.createObjectURL(e.stream); |
| 244 var remoteVideo = $(target); | 238 var remoteVideo = $(target); |
| 245 remoteVideo.src = remoteStreamUrl; | 239 remoteVideo.src = remoteStreamUrl; |
| 246 } | 240 } |
| 247 | 241 |
| 248 function connectOnIceCandidate(caller, callee) { | 242 function connectOnIceCandidate(caller, callee) { |
| 249 caller.onicecandidate = function(event) { onIceCandidate(event, callee); } | 243 caller.onicecandidate = function(event) { onIceCandidate(event, callee); } |
| 250 callee.onicecandidate = function(event) { onIceCandidate(event, caller); } | 244 callee.onicecandidate = function(event) { onIceCandidate(event, caller); } |
| 251 } | 245 } |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 style="display:none" autoplay></video></td> | 286 style="display:none" autoplay></video></td> |
| 293 <!-- Canvases are named after their corresponding video elements. --> | 287 <!-- Canvases are named after their corresponding video elements. --> |
| 294 <td><canvas width="320" height="240" id="remote-view-1-canvas" | 288 <td><canvas width="320" height="240" id="remote-view-1-canvas" |
| 295 style="display:none"></canvas></td> | 289 style="display:none"></canvas></td> |
| 296 <td><canvas width="320" height="240" id="remote-view-2-canvas" | 290 <td><canvas width="320" height="240" id="remote-view-2-canvas" |
| 297 style="display:none"></canvas></td> | 291 style="display:none"></canvas></td> |
| 298 </tr> | 292 </tr> |
| 299 </table> | 293 </table> |
| 300 </body> | 294 </body> |
| 301 </html> | 295 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2167133002:
Separates the WebRTC browser tests that deal with audio detection. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master