zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert change which removes GICE.

Browse Source 
There are still dependencies on this functionality.

TBR=pthatcher@webrtc.org

BUG=526399

Review URL: https://codereview.webrtc.org/1336553003

Cr-Commit-Position: refs/heads/master@{#9920}
This commit is contained in:
guoweis
2015-09-10 13:32:11 -07:00
committed by Commit bot
parent fab882b193
commit d12140a68e
42 changed files with 1777 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
talk/app/webrtc/webrtcsdp.cc
View File

@ -77,6 +77,7 @@ using cricket::kCodecParamMaxPlaybackRate;
using cricket::kCodecParamAssociatedPayloadType;
using cricket::MediaContentDescription;
using cricket::MediaType;
using cricket::NS_JINGLE_ICE_UDP;
using cricket::RtpHeaderExtension;
using cricket::SsrcGroup;
using cricket::StreamParams;
@ -891,7 +892,8 @@ bool SdpDeserialize(const std::string& message,
SdpParseError* error) {
std::string session_id;
std::string session_version;
TransportDescription session_td("", "");
TransportDescription session_td(NS_JINGLE_ICE_UDP,
std::string(), std::string());
RtpHeaderExtensions session_extmaps;
cricket::SessionDescription* desc = new cricket::SessionDescription();
std::vector<JsepIceCandidate*> candidates;
@ -2193,7 +2195,8 @@ bool ParseMediaDescription(const std::string& message,
// Make a temporary TransportDescription based on |session_td|.
// Some of this gets overwritten by ParseContent.
TransportDescription transport(session_td.transport_options,
TransportDescription transport(NS_JINGLE_ICE_UDP,
session_td.transport_options,
session_td.ice_ufrag,
session_td.ice_pwd,
session_td.ice_mode,