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

Unified Diff: talk/examples/peerconnection/client/conductor.cc

Issue 1237613003: Remove deprecated functions. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Call new function from objc. Created 5 years, 5 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
« no previous file with comments | « talk/app/webrtc/webrtcsession_unittest.cc ('k') | talk/media/base/streamparams.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/examples/peerconnection/client/conductor.cc
diff --git a/talk/examples/peerconnection/client/conductor.cc b/talk/examples/peerconnection/client/conductor.cc
index f30516fc74bb3a6799799412313198bb91fbbfb3..72629cebfc68c495b1e7bcd287597de7c21ca45d 100644
--- a/talk/examples/peerconnection/client/conductor.cc
+++ b/talk/examples/peerconnection/client/conductor.cc
@@ -302,10 +302,12 @@ void Conductor::OnMessageFromPeer(int peer_id, const std::string& message) {
LOG(WARNING) << "Can't parse received session description message.";
return;
}
+ webrtc::SdpParseError error;
webrtc::SessionDescriptionInterface* session_description(
- webrtc::CreateSessionDescription(type, sdp));
+ webrtc::CreateSessionDescription(type, sdp, &error));
if (!session_description) {
- LOG(WARNING) << "Can't parse received session description message.";
+ LOG(WARNING) << "Can't parse received session description message. "
+ << "SdpParseError was: " << error.description;
return;
}
LOG(INFO) << " Received session description :" << message;
@@ -328,10 +330,12 @@ void Conductor::OnMessageFromPeer(int peer_id, const std::string& message) {
LOG(WARNING) << "Can't parse received message.";
return;
}
+ webrtc::SdpParseError error;
rtc::scoped_ptr<webrtc::IceCandidateInterface> candidate(
- webrtc::CreateIceCandidate(sdp_mid, sdp_mlineindex, sdp));
+ webrtc::CreateIceCandidate(sdp_mid, sdp_mlineindex, sdp, &error));
if (!candidate.get()) {
- LOG(WARNING) << "Can't parse received candidate message.";
+ LOG(WARNING) << "Can't parse received candidate message. "
+ << "SdpParseError was: " << error.description;
return;
}
if (!peer_connection_->AddIceCandidate(candidate.get())) {
@@ -536,7 +540,7 @@ void Conductor::OnSuccess(webrtc::SessionDescriptionInterface* desc) {
if (loopback_) {
// Replace message type from "offer" to "answer"
webrtc::SessionDescriptionInterface* session_description(
- webrtc::CreateSessionDescription("answer", sdp));
+ webrtc::CreateSessionDescription("answer", sdp, nullptr));
peer_connection_->SetRemoteDescription(
DummySetSessionDescriptionObserver::Create(), session_description);
return;
« no previous file with comments | « talk/app/webrtc/webrtcsession_unittest.cc ('k') | talk/media/base/streamparams.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698