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

Samples, add IPv6 supporting into Apprtc demo.

Browse Source 
BUG=2828
TEST=Manual Test
R=juberti@google.com

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5432 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
braveyao@webrtc.org
2014-01-27 03:08:16 +00:00
parent e84978f3d8
commit 37c2976511
1 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,19 +147,19 @@ def make_media_stream_constraints(audio, video):
logging.info('Applying media constraints: ' + str(stream_constraints)) logging.info('Applying media constraints: ' + str(stream_constraints))
return stream_constraints return stream_constraints
def make_pc_constraints(compat, dscp): def maybe_add_constraint(constraints, param, constraint):
constraints = { 'optional': [] } if (param.lower() == 'true'):
# For interop with FireFox. Enable DTLS in peerConnection ctor. constraints['optional'].append({constraint: True})
if compat.lower() == 'true': elif (param.lower() == 'false'):
constraints['optional'].append({'DtlsSrtpKeyAgreement': True}) constraints['optional'].append({constraint: False})
# Disable DTLS in peerConnection ctor for loopback call. The value
# of compat is false for loopback mode.
else:
constraints['optional'].append({'DtlsSrtpKeyAgreement': False})
# DSCP for QoS support return constraints
if dscp.lower() == 'true':
constraints['optional'].append({'googDscp': True}) def make_pc_constraints(dtls, dscp, ipv6):
constraints = { 'optional': [] }
maybe_add_constraint(constraints, dtls, 'DtlsSrtpKeyAgreement')
maybe_add_constraint(constraints, dscp, 'googDscp')
maybe_add_constraint(constraints, ipv6, 'googIPv6')
return constraints return constraints
@@ -379,23 +379,20 @@ class MainPage(webapp2.RequestHandler):
if self.request.get('stereo'): if self.request.get('stereo'):
stereo = self.request.get('stereo') stereo = self.request.get('stereo')
# Set compat to true by default. # Options for making pcConstraints
compat = 'true' dtls = self.request.get('dtls')
if self.request.get('compat'): dscp = self.request.get('dscp')
compat = self.request.get('compat') ipv6 = self.request.get('ipv6')
debug = self.request.get('debug') debug = self.request.get('debug')
if debug == 'loopback': if debug == 'loopback':
# Set compat to false as DTLS does not work for loopback. # Set dtls to false as DTLS does not work for loopback.
compat = 'false' dtls = 'false'
# Set DSCP for QoS support in WebRTC # token_timeout for channel creation, default 30min, max 1 days, min 3min.
dscp = self.request.get('dscp')
# 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',
min_value = 3, min_value = 3,
max_value = 3000, max_value = 1440,
default = 30) default = 30)
unittest = self.request.get('unittest') unittest = self.request.get('unittest')
@@ -448,7 +445,7 @@ class MainPage(webapp2.RequestHandler):
room_link = append_url_arguments(self.request, room_link) room_link = append_url_arguments(self.request, room_link)
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(dtls, dscp, ipv6)
offer_constraints = make_offer_constraints() offer_constraints = make_offer_constraints()
media_constraints = make_media_stream_constraints(audio, video) media_constraints = make_media_stream_constraints(audio, video)
template_values = {'error_messages': error_messages, template_values = {'error_messages': error_messages,