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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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: gjslint issues + fixed if statement for constraints 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 side-by-side diff with in-line comments
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')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/webrtc/manual/peerconnection.html
diff --git a/chrome/test/data/webrtc/manual/peerconnection.html b/chrome/test/data/webrtc/manual/peerconnection.html
index e346587c4801c3e8063fb687660172c6f444414c..d8a55cb497421614ccfc5739346f3eb8c63ada70 100644
--- a/chrome/test/data/webrtc/manual/peerconnection.html
+++ b/chrome/test/data/webrtc/manual/peerconnection.html
@@ -2,53 +2,71 @@
<html>
<head>
<title>WebRTC PeerConnection Manual Test</title>
- <script type="text/javascript" src="../test_functions.js"></script>
- <script type="text/javascript" src="../message_handling.js"></script>
- <script type="text/javascript" src="../getusermedia.js"></script>
- <script type="text/javascript" src="../jsep01_call.js"></script>
- <script type="text/javascript" src="peerconnection.js"></script>
- <link rel="StyleSheet" type="text/css" href="stylesheet.css">
+ <script src="../test_functions.js"></script>
+ <script src="../message_handling.js"></script>
+ <script src="../getusermedia.js"></script>
+ <script src="../jsep01_call.js"></script>
+ <script src="peerconnection.js"></script>
+ <link rel="StyleSheet" href="stylesheet.css">
<meta charset="utf-8">
</head>
<body>
<div id="wrapper">
- <div>
+ <div id="getusermedia-input">
GetUserMedia <a href="http://goo.gl/V7cZg">MediaStreamConstraints</a>:
- <input type="text" id="getusermedia-constraints" size="30">
+ <input type="text" id="getusermedia-constraints">
Audio<input type="checkbox" id="audio" checked
onclick="updateGetUserMediaConstraints();"/>
Video<input type="checkbox" id="video" checked
onclick="updateGetUserMediaConstraints();"/>
+ Screen capture<input type="checkbox" id="screencapture"
+ onclick="updateGetUserMediaConstraints();"/>
<button id="re-request" onclick="getUserMediaFromHere();">
- Request GetUserMedia</button>
+ Request GetUserMedia</button><br/>
Use <a href="constraints.html">constraints.html</a> to create more
- advanced constraints (then paste them into the box to the left).
+ advanced constraints (then paste them into the Constraints box above).
+ <a href="peerconnection-help.html" target="_blank">Help</a>
+ <br/>
</div>
- <a href="peerconnection-help.html" target="_blank">How does this page work?
- </a>
+
<div id="container">
<div id="left-half">
- <h2>Local Preview</h2>
- <video width="320" height="240" id="local-view" autoplay="autoplay">
- </video><br/>
+
+ <div id="local-view-area">
kjellander_chromium 2013/04/08 14:19:52 I suggest adding a CSS class for this div tag that
jansson 2013/04/10 12:11:48 Done.
+ <h2>Local Preview</h2>
+ <video width="320" height="240" id="local-view" autoplay="autoplay">
+ </video><br/>
kjellander_chromium 2013/04/08 14:19:52 Indent +2 spaces.
jansson 2013/04/10 12:11:48 Done.
+ <div id="size">
kjellander_chromium 2013/04/08 14:19:52 Do you use the ID for this and the 'resize' div ta
jansson 2013/04/10 12:11:48 Done.
+ Size: <div id="local-view-size"></div>
+ <div id="local-view-stream-size">(stream size: N/A)</div><br/>
+ </div>
+ <div id="resize">
+ Resize: <button onclick="updateVideoTagSize_('local-view')">
+ To stream size</button>
+ <button onclick="updateVideoTagSize_('local-view', '320', '240' );">
kjellander_chromium 2013/04/08 14:19:52 You should be fine passing integer numbers here.
jansson 2013/04/10 12:11:48 Done.
+ 320x240</button>
+ <button onclick="updateVideoTagSize_('local-view', '640', '480');">
+ 640x480</button>
+ </div>
+ </div>
+
<h2>Send on data channel</h2>
<input type="text" id="data-channel-send" size="10" />
<button onclick="sendDataFromHere();">Send data</button><br>
<h2>Settings</h2>
- Server [<a href="" onclick="showServerHelp()">?</a>]:
- <input type="text" id="server" size="30"
- value="http://localhost:8888" />
+ Server [<a href="" onclick="showServerHelp();">?</a>]:
+ <input type="text" id="server" size="30" value="http://localhost:8888" />
Peer ID: <input type="text" id="peer-id" size="10" />
<button id="connect" onclick="connectFromHere();">Connect</button><br/>
PeerConnection <a href="http://goo.gl/xVi12">createOffer MediaConstraints:
</a><br/>
<input type="text" id="pc-createoffer-constraints" rows="7" cols="40"/>
- <br/>
- PeerConnection <a href="http://goo.gl/0TjfX">createAnswer
- MediaConstraints:</a><br/>
+ <br/>
kjellander_chromium 2013/04/08 14:19:52 I don't see the need for this to be indented as it
jansson 2013/04/10 12:11:48 Done.
+ PeerConnection <a href="http://goo.gl/0TjfX">createAnswer MediaConstraints
kjellander_chromium 2013/04/08 14:19:52 Please leave untouched instead of adding a space b
jansson 2013/04/10 12:11:48 Done.
+ :</a><br/>
<input type="text" id="pc-createanswer-constraints" rows="7" cols="40"/>
<br/>
Call:
@@ -77,27 +95,46 @@
<input type="text" id="dtmf-tones-duration" size="10" value="100" />
gap(ms):
<input type="text" id="dtmf-tones-gap" size="10" value="50" />
- <button onclick="insertDtmfFromHere();">Send</button><br/>
+ <button onclick="insertDtmfFromHere();">Send</button><br/>
Options:
<input type="checkbox" id="force-opus" onclick="forceOpusChanged();"/>
- Force Opus in Outgoing SDP<br/>
+ Force Opus in Outgoing SDP<br/>
<button onclick="clearLog();">Clear Logs</button>
+
<h2>Messages</h2>
<pre id="messages"></pre>
</div>
- <div id="right-half">
+
+ <div id="right-half">
kjellander_chromium 2013/04/08 14:19:52 +2 indent (affects content below too)
jansson 2013/04/10 12:11:48 Done.
+
+ <div id="remote-view-area">
<h2>Remote Video</h2>
- <video width="320" height="240" id="remote-view" autoplay="autoplay">
- </video><br/>
- <h2>Received on data channel</h2>
- <textarea id="data-channel-receive" rows="7" cols="40" disabled="true">
- </textarea>
- <h2>Sent DTMF tones</h2>
- <textarea id="dtmf-tones-sent" rows="7" cols="40" disabled="true">
- </textarea>
+ <video width="320" height="240" id="remote-view" autoplay="autoplay">
+ </video><br/>
+ <div id="size">
+ Size: <div id="remote-view-size"></div>
+ <div id="remote-view-stream-size">(stream size: N/A)</div><br/>
kjellander_chromium 2013/04/08 14:19:52 +2 indent.
jansson 2013/04/10 12:11:48 Done.
+ </div>
+ <div id="resize">
+ Resize: <button onclick="updateVideoTagSize_('remote-view')"> To stream
+ size</button>
+ <button onclick="updateVideoTagSize_('remote-view', '320', '240');">
+ 320x240</button>
+ <button onclick="updateVideoTagSize_('remote-view', '640', '480');">
+ 640x480</button>
+ </div>
+ </div>
+
+ <h2>Received on data channel</h2>
+ <textarea id="data-channel-receive" rows="7" cols="40" disabled="true">
+ </textarea>
+
+ <h2>Sent DTMF tones</h2>
+ <textarea id="dtmf-tones-sent" rows="7" cols="40" disabled="true">
+ </textarea>
- <h2>Debug</h2>
- <pre id="debug"></pre>
+ <h2>Debug</h2>
+ <pre id="debug"></pre>
</div>
</div>
</div>
« 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')

Powered by Google App Engine
This is Rietveld 408576698