| 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 var gFirstConnection = null; | 10 var gFirstConnection = null; |
| (...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 491 | 491 |
| 492 function createConnection(constraints, remoteView) { | 492 function createConnection(constraints, remoteView) { |
| 493 var pc = new webkitRTCPeerConnection(null, constraints); | 493 var pc = new webkitRTCPeerConnection(null, constraints); |
| 494 pc.onaddstream = function(event) { | 494 pc.onaddstream = function(event) { |
| 495 onRemoteStream(event, remoteView); | 495 onRemoteStream(event, remoteView); |
| 496 } | 496 } |
| 497 return pc; | 497 return pc; |
| 498 } | 498 } |
| 499 | 499 |
| 500 function displayAndRemember(localStream) { | 500 function displayAndRemember(localStream) { |
| 501 var localStreamUrl = webkitURL.createObjectURL(localStream); | 501 var localStreamUrl = URL.createObjectURL(localStream); |
| 502 $('local-view').src = localStreamUrl; | 502 $('local-view').src = localStreamUrl; |
| 503 | 503 |
| 504 gLocalStream = localStream; | 504 gLocalStream = localStream; |
| 505 } | 505 } |
| 506 | 506 |
| 507 // Called if getUserMedia fails. | 507 // Called if getUserMedia fails. |
| 508 function printGetUserMediaError(error) { | 508 function printGetUserMediaError(error) { |
| 509 document.title = 'getUserMedia request failed:'; | 509 document.title = 'getUserMedia request failed:'; |
| 510 if (error.constraintName) | 510 if (error.constraintName) |
| 511 document.title += ' could not satisfy constraint ' + error.constraintName; | 511 document.title += ' could not satisfy constraint ' + error.constraintName; |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 702 } | 702 } |
| 703 } | 703 } |
| 704 | 704 |
| 705 function onRemoteStream(e, target) { | 705 function onRemoteStream(e, target) { |
| 706 if (gTestWithoutMsid && e.stream.id != "default") { | 706 if (gTestWithoutMsid && e.stream.id != "default") { |
| 707 document.title = 'a default remote stream was expected but instead ' + | 707 document.title = 'a default remote stream was expected but instead ' + |
| 708 e.stream.id + ' was received.'; | 708 e.stream.id + ' was received.'; |
| 709 return; | 709 return; |
| 710 } | 710 } |
| 711 gRemoteStreams[target] = e.stream; | 711 gRemoteStreams[target] = e.stream; |
| 712 var remoteStreamUrl = webkitURL.createObjectURL(e.stream); | 712 var remoteStreamUrl = URL.createObjectURL(e.stream); |
| 713 var remoteVideo = $(target); | 713 var remoteVideo = $(target); |
| 714 remoteVideo.src = remoteStreamUrl; | 714 remoteVideo.src = remoteStreamUrl; |
| 715 } | 715 } |
| 716 | 716 |
| 717 </script> | 717 </script> |
| 718 </head> | 718 </head> |
| 719 <body> | 719 <body> |
| 720 <table border="0"> | 720 <table border="0"> |
| 721 <tr> | 721 <tr> |
| 722 <td>Local Preview</td> | 722 <td>Local Preview</td> |
| (...skipping 19 matching lines...) Expand all Loading... |
| 742 <td><canvas width="320" height="240" id="remote-view-2-canvas" | 742 <td><canvas width="320" height="240" id="remote-view-2-canvas" |
| 743 style="display:none"></canvas></td> | 743 style="display:none"></canvas></td> |
| 744 <td><canvas width="320" height="240" id="remote-view-3-canvas" | 744 <td><canvas width="320" height="240" id="remote-view-3-canvas" |
| 745 style="display:none"></canvas></td> | 745 style="display:none"></canvas></td> |
| 746 <td><canvas width="320" height="240" id="remote-view-4-canvas" | 746 <td><canvas width="320" height="240" id="remote-view-4-canvas" |
| 747 style="display:none"></canvas></td> | 747 style="display:none"></canvas></td> |
| 748 </tr> | 748 </tr> |
| 749 </table> | 749 </table> |
| 750 </body> | 750 </body> |
| 751 </html> | 751 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 121203002:
Use window.URL instead of window.webkitURL. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master