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

Unified Diff: content/renderer/media/rtc_peer_connection_handler.cc

Issue 468393003: Add the addIceCandidate failure case to webrtc-internals. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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: content/renderer/media/rtc_peer_connection_handler.cc
diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc
index ddb07ac54ae9f21786e7153740b094bd646b72c6..7a7ff617d6ba5503964c4be490a98b75560400f0 100644
--- a/content/renderer/media/rtc_peer_connection_handler.cc
+++ b/content/renderer/media/rtc_peer_connection_handler.cc
@@ -640,19 +640,20 @@ bool RTCPeerConnectionHandler::addICECandidate(
base::UTF16ToUTF8(candidate.sdpMid()),
candidate.sdpMLineIndex(),
base::UTF16ToUTF8(candidate.candidate())));
- if (!native_candidate) {
+ bool return_value = false;
+
+ if (native_candidate) {
+ return_value =
+ native_peer_connection_->AddIceCandidate(native_candidate.get());
+ LOG_IF(ERROR, !return_value) << "Error processing ICE candidate.";
+ } else {
LOG(ERROR) << "Could not create native ICE candidate.";
- return false;
}
- bool return_value =
- native_peer_connection_->AddIceCandidate(native_candidate.get());
- LOG_IF(ERROR, !return_value) << "Error processing ICE candidate.";
-
- if (peer_connection_tracker_)
+ if (peer_connection_tracker_) {
peer_connection_tracker_->TrackAddIceCandidate(
- this, candidate, PeerConnectionTracker::SOURCE_REMOTE);
-
+ this, candidate, PeerConnectionTracker::SOURCE_REMOTE, return_value);
+ }
return return_value;
}
@@ -962,7 +963,7 @@ void RTCPeerConnectionHandler::OnIceCandidate(
candidate->sdp_mline_index());
if (peer_connection_tracker_)
peer_connection_tracker_->TrackAddIceCandidate(
- this, web_candidate, PeerConnectionTracker::SOURCE_LOCAL);
+ this, web_candidate, PeerConnectionTracker::SOURCE_LOCAL, true);
client_->didGenerateICECandidate(web_candidate);
}

Powered by Google App Engine
This is Rietveld 408576698