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

Modified apprtc demo code to detect browser by checking user_agent in apprtc.py. Now we will use Mozilla stun server if FF is detected as the browser. The CL is an improvement to r4388.

Browse Source 
R=braveyao@webrtc.org, dutton@google.com

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4491 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
vikasmarwaha@webrtc.org 2013-08-05 22:05:20 +00:00
parent 9dba525627
commit 6e7c203aee
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,12 @@ def sanitize(key):
def make_client_id(room, user): def make_client_id(room, user):
return room.key().id_or_name() + '/' + user return room.key().id_or_name() + '/' + user
def get_default_stun_server(user_agent):
default_stun_server = 'stun.l.google.com:19302'
if 'Firefox' in user_agent:
default_stun_server = 'stun.services.mozilla.com'
return default_stun_server
def make_pc_config(stun_server, turn_server, ts_pwd): def make_pc_config(stun_server, turn_server, ts_pwd):
servers = [] servers = []
if turn_server: if turn_server:
@ -46,8 +52,6 @@ def make_pc_config(stun_server, turn_server, ts_pwd):
servers.append({'url':turn_config, 'credential':ts_pwd}) servers.append({'url':turn_config, 'credential':ts_pwd})
if stun_server: if stun_server:
stun_config = 'stun:{}'.format(stun_server) stun_config = 'stun:{}'.format(stun_server)
else:
stun_config = 'stun:' + 'stun.l.google.com:19302'
servers.append({'url':stun_config}) servers.append({'url':stun_config})
return {'iceServers':servers} return {'iceServers':servers}
@ -288,6 +292,7 @@ class MainPage(webapp2.RequestHandler):
channel to push asynchronous updates to the client.""" channel to push asynchronous updates to the client."""
# get the base url without arguments. # get the base url without arguments.
base_url = self.request.path_url base_url = self.request.path_url
user_agent = self.request.headers['User-Agent']
room_key = sanitize(self.request.get('r')) room_key = sanitize(self.request.get('r'))
debug = self.request.get('debug') debug = self.request.get('debug')
unittest = self.request.get('unittest') unittest = self.request.get('unittest')
@ -312,7 +317,8 @@ class MainPage(webapp2.RequestHandler):
stereo = 'false' stereo = 'false'
if self.request.get('stereo'): if self.request.get('stereo'):
stereo = self.request.get('stereo') stereo = self.request.get('stereo')
if not stun_server:
stun_server = get_default_stun_server(user_agent)
# token_timeout for channel creation, default 30min, max 2 days, min 3min. # token_timeout for channel creation, default 30min, max 2 days, min 3min.
token_timeout = self.request.get_range('tt', token_timeout = self.request.get_range('tt',

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

@ -123,10 +123,6 @@
} }
function createPeerConnection() { function createPeerConnection() {
// For FF, use Mozilla STUN server.
if (webrtcDetectedBrowser === "firefox") {
pcConfig = {"iceServers":[{"url":"stun:stun.services.mozilla.com"}]};
}
try { try {
// Create an RTCPeerConnection via the polyfill (adapter.js). // Create an RTCPeerConnection via the polyfill (adapter.js).
pc = new RTCPeerConnection(pcConfig, pcConstraints); pc = new RTCPeerConnection(pcConfig, pcConstraints);