| 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 waitForVideo('remote-view-2'); | 140 waitForVideo('remote-view-2'); |
| 141 } | 141 } |
| 142 | 142 |
| 143 // Test that we can't setup a call with an unsupported video codec | 143 // Test that we can't setup a call with an unsupported video codec |
| 144 function negotiateUnsupportedVideoCodec() { | 144 function negotiateUnsupportedVideoCodec() { |
| 145 createConnections(null); | 145 createConnections(null); |
| 146 transformSdp = removeVideoCodec; | 146 transformSdp = removeVideoCodec; |
| 147 navigator.webkitGetUserMedia({audio: true, video: true}, | 147 navigator.webkitGetUserMedia({audio: true, video: true}, |
| 148 addStreamToBothConnectionsAndNegotiate, printGetUserMediaError); | 148 addStreamToBothConnectionsAndNegotiate, printGetUserMediaError); |
| 149 onLocalDescriptionError = function(error) { | 149 onLocalDescriptionError = function(error) { |
| 150 var expectedMsg = 'SetLocalDescription failed: Failed to' + | 150 var expectedMsg = 'Failed to set local offer sdp:' + |
| 151 ' update session state: ERROR_CONTENT'; | 151 ' Session error code: ERROR_CONTENT. Session error description:' + |
| 152 ' Failed to set video receive codecs..'; |
| 152 expectEquals(expectedMsg, error); | 153 expectEquals(expectedMsg, error); |
| 153 | 154 |
| 154 // Got the right message, test succeeded. | 155 // Got the right message, test succeeded. |
| 155 document.title = 'OK'; | 156 document.title = 'OK'; |
| 156 }; | 157 }; |
| 157 } | 158 } |
| 158 | 159 |
| 159 // Test that we can't setup a call if one peer does not support encryption | 160 // Test that we can't setup a call if one peer does not support encryption |
| 160 function negotiateNonCryptoCall() { | 161 function negotiateNonCryptoCall() { |
| 161 createConnections(null); | 162 createConnections(null); |
| 162 transformSdp = removeCrypto; | 163 transformSdp = removeCrypto; |
| 163 navigator.webkitGetUserMedia({audio: true, video: true}, | 164 navigator.webkitGetUserMedia({audio: true, video: true}, |
| 164 addStreamToBothConnectionsAndNegotiate, printGetUserMediaError); | 165 addStreamToBothConnectionsAndNegotiate, printGetUserMediaError); |
| 165 onLocalDescriptionError = function(error) { | 166 onLocalDescriptionError = function(error) { |
| 166 var expectedMsg = 'SetLocalDescription failed: Called with a SDP without' | 167 var expectedMsg = 'Failed to set local offer sdp:' + |
| 167 + ' crypto enabled.'; | 168 ' Called with a SDP without crypto enabled.'; |
| 168 expectEquals(expectedMsg, error); | 169 expectEquals(expectedMsg, error); |
| 169 | 170 |
| 170 // Got the right message, test succeeded. | 171 // Got the right message, test succeeded. |
| 171 document.title = 'OK'; | 172 document.title = 'OK'; |
| 172 }; | 173 }; |
| 173 } | 174 } |
| 174 | 175 |
| 175 // Test that we can negotiate a call with an SDP offer that includes a | 176 // Test that we can negotiate a call with an SDP offer that includes a |
| 176 // b=AS:XX line to control audio and video bandwidth | 177 // b=AS:XX line to control audio and video bandwidth |
| 177 function negotiateOfferWithBLine() { | 178 function negotiateOfferWithBLine() { |
| (...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 804 <td><canvas width="320" height="240" id="remote-view-2-canvas" | 805 <td><canvas width="320" height="240" id="remote-view-2-canvas" |
| 805 style="display:none"></canvas></td> | 806 style="display:none"></canvas></td> |
| 806 <td><canvas width="320" height="240" id="remote-view-3-canvas" | 807 <td><canvas width="320" height="240" id="remote-view-3-canvas" |
| 807 style="display:none"></canvas></td> | 808 style="display:none"></canvas></td> |
| 808 <td><canvas width="320" height="240" id="remote-view-4-canvas" | 809 <td><canvas width="320" height="240" id="remote-view-4-canvas" |
| 809 style="display:none"></canvas></td> | 810 style="display:none"></canvas></td> |
| 810 </tr> | 811 </tr> |
| 811 </table> | 812 </table> |
| 812 </body> | 813 </body> |
| 813 </html> | 814 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 134633004:
Roll libjingle+webrtc to r5397. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/