Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Side by Side Diff: content/test/data/media/peerconnection-call.html

Issue 186193008: Roll webrtc+libjingle to r5645. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 navigator.webkitGetUserMedia({audio: true, video: true}, 156 navigator.webkitGetUserMedia({audio: true, video: true},
157 addStreamToBothConnectionsAndNegotiate, printGetUserMediaError); 157 addStreamToBothConnectionsAndNegotiate, printGetUserMediaError);
158 } 158 }
159 159
160 // 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
161 function negotiateNonCryptoCall() { 161 function negotiateNonCryptoCall() {
162 createConnections(null); 162 createConnections(null);
163 transformSdp = removeCrypto; 163 transformSdp = removeCrypto;
164 onLocalDescriptionError = function(error) { 164 onLocalDescriptionError = function(error) {
165 var expectedMsg = 'Failed to set local offer sdp:' + 165 var expectedMsg = 'Failed to set local offer sdp:' +
166 ' Called with a SDP without crypto enabled.'; 166 ' Called with SDP without DTLS fingerprint.';
167 expectEquals(expectedMsg, error); 167 expectEquals(expectedMsg, error);
168 168
169 // Got the right message, test succeeded. 169 // Got the right message, test succeeded.
170 document.title = 'OK'; 170 document.title = 'OK';
171 }; 171 };
172 navigator.webkitGetUserMedia({audio: true, video: true}, 172 navigator.webkitGetUserMedia({audio: true, video: true},
173 addStreamToBothConnectionsAndNegotiate, printGetUserMediaError); 173 addStreamToBothConnectionsAndNegotiate, printGetUserMediaError);
174 } 174 }
175 175
176 // 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
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 <td><canvas width="320" height="240" id="remote-view-2-canvas" 806 <td><canvas width="320" height="240" id="remote-view-2-canvas"
807 style="display:none"></canvas></td> 807 style="display:none"></canvas></td>
808 <td><canvas width="320" height="240" id="remote-view-3-canvas" 808 <td><canvas width="320" height="240" id="remote-view-3-canvas"
809 style="display:none"></canvas></td> 809 style="display:none"></canvas></td>
810 <td><canvas width="320" height="240" id="remote-view-4-canvas" 810 <td><canvas width="320" height="240" id="remote-view-4-canvas"
811 style="display:none"></canvas></td> 811 style="display:none"></canvas></td>
812 </tr> 812 </tr>
813 </table> 813 </table>
814 </body> 814 </body>
815 </html> 815 </html>
OLDNEW
« no previous file with comments | « DEPS ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698