chrome/test/data/webrtc/manual/peerconnection.html - Issue 12472032: Add screen capture constraints, video tag resize and removed auto video resize

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

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, 8 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

« chrome/test/data/webrtc/jsep01_call.js ('K') | « chrome/test/data/webrtc/jsep01_call.js ('k') | chrome/test/data/webrtc/manual/peerconnection.js » ('j') | chrome/test/data/webrtc/manual/peerconnection.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">	1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">

2 <html>	2 <html>

3 <head>	3 <head>

4 <title>WebRTC PeerConnection Manual Test</title>	4 <title>WebRTC PeerConnection Manual Test</title>

5 <script type="text/javascript" src="../test_functions.js"></script>	5 <script type="text/javascript" src="../test_functions.js"></script>

6 <script type="text/javascript" src="../message_handling.js"></script>	6 <script type="text/javascript" src="../message_handling.js"></script>

7 <script type="text/javascript" src="../getusermedia.js"></script>	7 <script type="text/javascript" src="../getusermedia.js"></script>

8 <script type="text/javascript" src="../jsep01_call.js"></script>	8 <script type="text/javascript" src="../jsep01_call.js"></script>

9 <script type="text/javascript" src="peerconnection.js"></script>	9 <script type="text/javascript" src="peerconnection.js"></script>

10 <link rel="StyleSheet" type="text/css" href="stylesheet.css">	10 <link rel="StyleSheet" type="text/css" href="stylesheet.css">

11 <meta charset="utf-8">	11 <meta charset="utf-8">

12 </head>	12 </head>

13 <body>	13 <body>

14	14

15 <br/>

16 <div id="wrapper">	15 <div id="wrapper">

17 <div>	16 <div>

18 GetUserMedia <a href="http://goo.gl/V7cZg">MediaStreamConstraints</a>:	17 GetUserMedia <a href="http://goo.gl/V7cZg">MediaStreamConstraints</a>:

19 <input type="text" id="getusermedia-constraints" size="30">	18 <input type="text" id="getusermedia-constraints" size="30">
	kjellander_chromium 2013/03/25 13:33:58 I suggest making the text box wider on the page so I suggest making the text box wider on the page so it at least fits the majority of the constraint contents (if not all). I think it would be fine to put a <br/> before the "Use constraints.html..." text to make it go on the next line instead. Just make sure to change the text too, so it says paste into the box "above" instead of "left". jansson 2013/04/05 10:29:42 Done. Show quoted text On 2013/03/25 13:33:58, Henrik Kjellander wrote: > I suggest making the text box wider on the page so it at least fits the majority > of the constraint contents (if not all). > I think it would be fine to put a <br/> before the "Use constraints.html..." > text to make it go on the next line instead. Just make sure to change the text > too, so it says paste into the box "above" instead of "left". Done.
20 Audio<input type="checkbox" id="audio" checked	19 Audio<input type="checkbox" id="audio" checked

21 onclick="updateGetUserMediaConstraints();"/>	20 onclick="updateGetUserMediaConstraints();"/>

22 Video<input type="checkbox" id="video" checked	21 Video<input type="checkbox" id="video" checked

23 onclick="updateGetUserMediaConstraints();"/>	22 onclick="updateGetUserMediaConstraints();"/>

	23 Screen capture<input type="checkbox" id="screencapture"

	24 onclick="updateGetUserMediaConstraints();"/>

24 <button id="re-request" onclick="getUserMediaFromHere();">	25 <button id="re-request" onclick="getUserMediaFromHere();">

25 Request GetUserMedia</button>	26 Request GetUserMedia</button>

26 Use <a href="constraints.html">constraints.html</a> to create more	27 Use <a href="constraints.html">constraints.html</a> to create more

27 advanced constraints (then paste them into the box to the left).	28 advanced constraints (then paste them into the box to the left).

28 </div>	29 </div>

	30

29 <a href="peerconnection-help.html" target="_blank">How does this page work?	31 <a href="peerconnection-help.html" target="_blank">How does this page work?

30 </a>	32 </a>

	33

31 <div id="container">	34 <div id="container">

32	35

33 <div id="left-half">	36 <div id="left-half">

34 <h2>Local Preview</h2>	37 <h2>Local Preview</h2>
	kjellander_chromium 2013/03/25 13:33:58 Optional: I think it would be great if all the stu Optional: I think it would be great if all the stuff that belongs to a video tag could be put in a div wrapping it and putting it with a slightly different background color (or possibly a gray border line). Just to make it more obvious which texts (and now buttons) that belongs to the video tag.
35 <video width="320" height="240" id="local-view" autoplay="autoplay">	38 <video width="320" height="240" id="local-view" autoplay="autoplay">

36 </video><br/>	39 </video><br/>
	kjellander_chromium 2013/03/25 13:33:58 This line shall actually be indented 4 spaces acco This line shall actually be indented 4 spaces according to the style guide. jansson 2013/04/05 10:29:42 Done. Show quoted text On 2013/03/25 13:33:58, Henrik Kjellander wrote: > This line shall actually be indented 4 spaces according to the style guide. Done.
	40

	41 <table>
	kjellander_chromium 2013/03/25 13:33:58 Please don't use tables. Divs+CSS should be enough Please don't use tables. Divs+CSS should be enough (even if it's harder to get it right initially it pays of in the long run).
	42 <tr>

	43 <td>Size: </td>

	44 <td id="local-view-size"></td>

	45 <td id="local-view-stream-size">(stream size: NA)</td>
	kjellander_chromium 2013/03/25 13:33:58 I prefer N/A I prefer N/A jansson 2013/04/05 10:29:42 Done. Show quoted text On 2013/03/25 13:33:58, Henrik Kjellander wrote: > I prefer N/A Done.
	46 </tr>

	47 </table>

	48

	49 <table>

	50 <tr>

	51 <td>Resize: </td>

	52 <td><button onclick="updateVideoTagSize_('local-view')"> To stream s ize
	kjellander_chromium 2013/03/25 13:33:58 Wrap properly (applies below too). Wrap properly (applies below too).
	53 </button></td>

	54 <td><button onclick="updateVideoTagSize_('local-view', '320', '240'

	55 );">320x240</button></td>

	56 <td><button onclick="updateVideoTagSize_('local-view', '640', '480'

	57 );">640x480</button></td>

	58 </tr>

	59 </table>

	60

37 <h2>Send on data channel</h2>	61 <h2>Send on data channel</h2>

38 <input type="text" id="data-channel-send" size="10" />	62 <input type="text" id="data-channel-send" size="10" />

39 <button onclick="sendDataFromHere();">Send data</button><br>	63 <button onclick="sendDataFromHere();">Send data</button><br>

40

41 <h2>Settings</h2>	64 <h2>Settings</h2>
	kjellander_chromium 2013/03/25 13:33:58 I'd like to keep the blank line above this heading I'd like to keep the blank line above this heading for readability. jansson 2013/04/05 10:29:42 Done. Show quoted text On 2013/03/25 13:33:58, Henrik Kjellander wrote: > I'd like to keep the blank line above this heading for readability. Done.
42 Server [<a href="" onclick="showServerHelp()">?</a>]:	65 Server [<a href="" onclick="showServerHelp();">?</a>]:

43 <input type="text" id="server" size="30"	66 <input type="text" id="server" size="30"

44 value="http://localhost:8888" />	67 value="http://localhost:8888" />

45 Peer ID: <input type="text" id="peer-id" size="10" />	68 Peer ID: <input type="text" id="peer-id" size="10" />

46 <button id="connect" onclick="connectFromHere();">Connect</button><br/>	69 <button id="connect" onclick="connectFromHere();">Connect</button><br/>

47 PeerConnection <a href="http://goo.gl/xVi12">createOffer MediaConstraints:	70 PeerConnection <a href="http://goo.gl/xVi12">createOffer MediaConstraints:

48 </a><br/>	71 </a><br/>

49 <input type="text" id="pc-createoffer-constraints" rows="7" cols="40"/>	72 <input type="text" id="pc-createoffer-constraints" rows="7" cols="40"/>

50 <br/>	73 <br/>

51 PeerConnection <a href="http://goo.gl/0TjfX">createAnswer	74 PeerConnection <a href="http://goo.gl/0TjfX">createAnswer

52 MediaConstraints:</a><br/>	75 MediaConstraints:</a><br/>

(...skipping 18 matching lines...) Expand all Loading...
71 <input type="text" id="data-channel-status" size="10" value="not created"	94 <input type="text" id="data-channel-status" size="10" value="not created"

72 disabled="true" /><br/>	95 disabled="true" /><br/>

73 DTMF Sender:	96 DTMF Sender:

74 <button onclick="createDtmfSenderFromHere();">Create</button>	97 <button onclick="createDtmfSenderFromHere();">Create</button>

75 tones:	98 tones:

76 <input type="text" id="dtmf-tones" size="10" value="123,abc" />	99 <input type="text" id="dtmf-tones" size="10" value="123,abc" />

77 duration(ms):	100 duration(ms):

78 <input type="text" id="dtmf-tones-duration" size="10" value="100" />	101 <input type="text" id="dtmf-tones-duration" size="10" value="100" />

79 gap(ms):	102 gap(ms):

80 <input type="text" id="dtmf-tones-gap" size="10" value="50" />	103 <input type="text" id="dtmf-tones-gap" size="10" value="50" />

81 <button onclick="insertDtmfFromHere();">Send</button><br/>	104 <button onclick="insertDtmfFromHere();">Send</button><br/>

82 Options:	105 Options:

83 <input type="checkbox" id="force-opus" onclick="forceOpusChanged();"/>	106 <input type="checkbox" id="force-opus" onclick="forceOpusChanged();"/>

84 Force Opus in Outgoing SDP<br/>	107 Force Opus in Outgoing SDP<br/>

85 <button onclick="clearLog();">Clear Logs</button>	108 <button onclick="clearLog();">Clear Logs</button>

86 <h2>Messages</h2>	109 <h2>Messages</h2>

87 <pre id="messages"></pre>	110 <pre id="messages"></pre>

88 </div>	111 </div>

	112

89 <div id="right-half">	113 <div id="right-half">

90 <h2>Remote Video</h2>	114 <h2>Remote Video</h2>

91 <video width="320" height="240" id="remote-view" autoplay="autoplay">	115 <video width="320" height="240" id="remote-view" autoplay="autoplay">

92 </video><br/>	116 </video><br/>

	117 <table>
	kjellander_chromium 2013/03/25 13:33:58 Same here, try to work out a layout with divs and Same here, try to work out a layout with divs and proper CSS instead of tables. It shouldn't be that hard. jansson 2013/04/05 10:29:42 Done. Show quoted text On 2013/03/25 13:33:58, Henrik Kjellander wrote: > Same here, try to work out a layout with divs and proper CSS instead of tables. > It shouldn't be that hard. Done.
	118 <tr>

	119 <td>Size: </td>

	120 <td id="remote-view-size"></td>

	121 <td id="remote-view-stream-size">(stream size: NA)</td>

	122 </tr>

	123 </table>

	124

	125 <table>

	126 <tr>

	127 <td>Resize: </td>

	128 <td><button onclick="updateVideoTagSize_('remote-view')"> To stream size

	129 </button></td>

	130 <td><button onclick="updateVideoTagSize_('remote-view', '320', '240'

	131 );">320x240</button></td>

	132 <td><button onclick="updateVideoTagSize_('remote-view', '640', '480'

	133 );">640x480</button></td>

	134 </tr>

	135 </table>

	136

93 <h2>Received on data channel</h2>	137 <h2>Received on data channel</h2>

94 <textarea id="data-channel-receive" rows="7" cols="40" disabled="true">	138 <textarea id="data-channel-receive" rows="7" cols="40" disabled="true">

95 </textarea>	139 </textarea>

96 <h2>Sent DTMF tones</h2>	140 <h2>Sent DTMF tones</h2>

97 <textarea id="dtmf-tones-sent" rows="7" cols="40" disabled="true">	141 <textarea id="dtmf-tones-sent" rows="7" cols="40" disabled="true">

98 </textarea>	142 </textarea>

99

100 <h2>Debug</h2>	143 <h2>Debug</h2>
	kjellander_chromium 2013/03/25 13:33:58 I'd like to keep that blank line for improved read I'd like to keep that blank line for improved readability. jansson 2013/04/05 10:29:42 Done. Show quoted text On 2013/03/25 13:33:58, Henrik Kjellander wrote: > I'd like to keep that blank line for improved readability. Done.
101 <pre id="debug"></pre>	144 <pre id="debug"></pre>

102 </div>	145 </div>

103 </div>	146 </div>

104 </div>	147 </div>

105	148

106 </body>	149 </body>

107 </html>	150 </html>

OLD	NEW