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

Side by Side Diff: chrome/test/data/webrtc/manual/peerconnection.js

Issue 12472032: Add screen capture constraints, video tag resize and removed auto video resize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@testingscreen
Patch Set: removed line break Created 7 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
OLDNEW
1 /** 1 /**
2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 * Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 * Use of this source code is governed by a BSD-style license that can be 3 * Use of this source code is governed by a BSD-style license that can be
4 * found in the LICENSE file. 4 * found in the LICENSE file.
5 */ 5 */
6 6
7 // The *Here functions are called from peerconnection.html and will make calls 7 // The *Here functions are called from peerconnection.html and will make calls
8 // into our underlying JavaScript library with the values from the page 8 // into our underlying JavaScript library with the values from the page
9 // (have to be named differently to avoid name clashes with existing functions). 9 // (have to be named differently to avoid name clashes with existing functions).
10 10
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 dontTouchSdp_(); 115 dontTouchSdp_();
116 } 116 }
117 } 117 }
118 118
119 /** 119 /**
120 * Updates the constraints in the getusermedia-constraints text box with a 120 * Updates the constraints in the getusermedia-constraints text box with a
121 * MediaStreamConstraints string. This string is created based on the status of 121 * MediaStreamConstraints string. This string is created based on the status of
122 * the checkboxes for audio and video. 122 * the checkboxes for audio and video.
123 */ 123 */
124 function updateGetUserMediaConstraints() { 124 function updateGetUserMediaConstraints() {
125 var constraints = { 125 if ($('video').checked && $('screencapture').checked)
126 audio: $('audio').checked, 126 var constraints = {
127 video: $('video').checked 127 audio: false,
kjellander_chromium 2013/03/25 13:33:58 Is audio not possible to have set to true? If that
jansson 2013/04/05 10:29:42 Done.
128 }; 128 video: {mandatory: {chromeMediaSource: 'screen'}}
kjellander_chromium 2013/03/25 13:33:58 Is there no way to get both screen capture and a w
jansson 2013/04/05 10:29:42 It's not possible to send both with our test pages
kjellander_chromium 2013/04/08 14:19:51 I think it should be possible according to the spe
129 };
130 else
131 var constraints = {
kjellander_chromium 2013/03/25 13:33:58 Depending on if it's a bug or not to not being abl
jansson 2013/04/05 10:29:42 Done.
132 audio: $('audio').checked,
133 video: $('video').checked
134 };
129 $('getusermedia-constraints').value = 135 $('getusermedia-constraints').value =
130 JSON.stringify(constraints, null, ' '); 136 JSON.stringify(constraints, null, ' ');
131 } 137 }
132 138
133 function showServerHelp() { 139 function showServerHelp() {
134 alert('You need to build and run a peerconnection_server on some ' + 140 alert('You need to build and run a peerconnection_server on some ' +
135 'suitable machine. To build it in chrome, just run make/ninja ' + 141 'suitable machine. To build it in chrome, just run make/ninja ' +
136 'peerconnection_server. Otherwise, read in https://code.google' + 142 'peerconnection_server. Otherwise, read in https://code.google' +
137 '.com/searchframe#xSWYf0NTG_Q/trunk/peerconnection/README&q=REA' + 143 '.com/searchframe#xSWYf0NTG_Q/trunk/peerconnection/README&q=REA' +
138 'DME%20package:webrtc%5C.googlecode%5C.com.'); 144 'DME%20package:webrtc%5C.googlecode%5C.com.');
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 setOnToneChange(function(tone) { 301 setOnToneChange(function(tone) {
296 debug('Sent DTMF tone: ' + tone.tone); 302 debug('Sent DTMF tone: ' + tone.tone);
297 $('dtmf-tones-sent').value = 303 $('dtmf-tones-sent').value =
298 tone.tone + '\n' + $('dtmf-tones-sent').value; 304 tone.tone + '\n' + $('dtmf-tones-sent').value;
299 }); 305 });
300 } 306 }
301 307
302 $ = function(id) { 308 $ = function(id) {
303 return document.getElementById(id); 309 return document.getElementById(id);
304 }; 310 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698