Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(657)

Unified Diff: talk/app/webrtc/webrtcsdp.cc

Issue 1308753003: Revert "Reland "Remove GICE (gone forever!) and PORTALLOCATOR_ENABLE_SHARED_UFRAG (enabled forever)… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: talk/app/webrtc/webrtcsdp.cc
diff --git a/talk/app/webrtc/webrtcsdp.cc b/talk/app/webrtc/webrtcsdp.cc
index 28d4e9e8b156dcf9b71f935df7a0ae2952a9db2d..5518233f2f7da5371992c632df1ed36eb80db7c7 100644
--- a/talk/app/webrtc/webrtcsdp.cc
+++ b/talk/app/webrtc/webrtcsdp.cc
@@ -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,

Powered by Google App Engine
This is Rietveld 408576698