generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow to skip turn by passing ts=false to apprtc.

Browse Source 
R=braveyao@webrtc.org, fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/6809004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5384 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andresp@webrtc.org 2014-01-14 17:00:23 +00:00
parent 39fcfd78ae
commit 8c5b27de9a
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/js/apprtc/apprtc.py
View File

@ -327,7 +327,6 @@ class MainPage(webapp2.RequestHandler):
if not stun_server: if not stun_server:
stun_server = get_default_stun_server(user_agent) stun_server = get_default_stun_server(user_agent)
turn_server = self.request.get('ts') turn_server = self.request.get('ts')
ts_pwd = self.request.get('tp') ts_pwd = self.request.get('tp')
# Use "audio" and "video" to set the media stream constraints. Defined here: # Use "audio" and "video" to set the media stream constraints. Defined here:
@ -438,10 +437,15 @@ class MainPage(webapp2.RequestHandler):
logging.info('Room ' + room_key + ' is full') logging.info('Room ' + room_key + ' is full')
return return
if turn_server == 'false':
turn_server = None
turn_url = ''
else:
turn_url = 'https://computeengineondemand.appspot.com/'
turn_url = turn_url + 'turn?' + 'username=' + user + '&key=4080218913'
room_link = base_url + '?r=' + room_key room_link = base_url + '?r=' + room_key
room_link = append_url_arguments(self.request, room_link) room_link = append_url_arguments(self.request, room_link)
turn_url = 'https://computeengineondemand.appspot.com/'
turn_url = turn_url + 'turn?' + 'username=' + user + '&key=4080218913'
token = create_channel(room, user, token_timeout) token = create_channel(room, user, token_timeout)
pc_config = make_pc_config(stun_server, turn_server, ts_pwd) pc_config = make_pc_config(stun_server, turn_server, ts_pwd)
pc_constraints = make_pc_constraints(compat, dscp) pc_constraints = make_pc_constraints(compat, dscp)

4
samples/js/apprtc/index.html
View File

@ -22,8 +22,8 @@
var roomKey = '{{ room_key }}'; var roomKey = '{{ room_key }}';
var roomLink = '{{ room_link }}'; var roomLink = '{{ room_link }}';
var initiator = {{ initiator }}; var initiator = {{ initiator }};
var pcConfig = {{ pc_config|safe }}; var pcConfig = {{ pc_config | safe }};
var pcConstraints = {{ pc_constraints|safe }}; var pcConstraints = {{ pc_constraints | safe }};
var offerConstraints = {{ offer_constraints | safe }}; var offerConstraints = {{ offer_constraints | safe }};
var mediaConstraints = {{ media_constraints | safe }}; var mediaConstraints = {{ media_constraints | safe }};
var turnUrl = '{{ turn_url }}'; var turnUrl = '{{ turn_url }}';

4
samples/js/apprtc/js/main.js
View File

@ -61,9 +61,7 @@ function openChannel() {
} }
function maybeRequestTurn() { function maybeRequestTurn() {
// Skipping TURN Http request for Firefox version <=22. if (turnUrl == '') {
// Firefox does not support TURN for version <=22.
if (webrtcDetectedBrowser === 'firefox' && webrtcDetectedVersion <=22) {
turnDone = true; turnDone = true;
return; return;
} }