Reland r6707 with the fix for callclient.cc.

TBR=mallinath@webrtc.org
BUG=3310

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6737 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jiayl@webrtc.org
2014-07-18 21:34:11 +00:00
parent f563e85ab0
commit a6e8cf8fb7
16 changed files with 389 additions and 150 deletions

View File

@@ -490,8 +490,10 @@ void CallClient::InitMedia() {
// TODO: Decide if the relay address should be specified here.
talk_base::SocketAddress stun_addr("stun.l.google.com", 19302);
cricket::ServerAddresses stun_servers;
stun_servers.insert(stun_addr);
port_allocator_ = new cricket::BasicPortAllocator(
network_manager_, stun_addr, talk_base::SocketAddress(),
network_manager_, stun_servers, talk_base::SocketAddress(),
talk_base::SocketAddress(), talk_base::SocketAddress());
if (portallocator_flags_ != 0) {