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

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

Issue 1416673006: Convert internal representation of Srtp cryptos from string to int. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Add back an old function name to prevent build break in chromium. Created 5 years, 2 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/webrtcsession.cc
diff --git a/talk/app/webrtc/webrtcsession.cc b/talk/app/webrtc/webrtcsession.cc
index 95abeab77a9c9e6dc6e1a1033b083d9f41535e7a..95c42eda22f327b9b66ff58849ac728c3cb3785b 100644
--- a/talk/app/webrtc/webrtcsession.cc
+++ b/talk/app/webrtc/webrtcsession.cc
@@ -2164,9 +2164,9 @@ void WebRtcSession::ReportNegotiatedCiphers(
return;
}
- const std::string& srtp_cipher = stats.channel_stats[0].srtp_cipher;
+ int srtp_cipher = stats.channel_stats[0].srtp_cipher;
int ssl_cipher = stats.channel_stats[0].ssl_cipher;
pthatcher1 2015/11/11 19:59:40 And here to?
guoweis_webrtc 2015/11/17 01:21:15 Done.
- if (srtp_cipher.empty() && !ssl_cipher) {
+ if (!srtp_cipher && !ssl_cipher) {
return;
}
@@ -2186,9 +2186,9 @@ void WebRtcSession::ReportNegotiatedCiphers(
return;
}
- if (!srtp_cipher.empty()) {
- metrics_observer_->IncrementSparseEnumCounter(
- srtp_counter_type, rtc::GetSrtpCryptoSuiteFromName(srtp_cipher));
+ if (srtp_cipher) {
+ metrics_observer_->IncrementSparseEnumCounter(srtp_counter_type,
+ srtp_cipher);
}
if (ssl_cipher) {
metrics_observer_->IncrementSparseEnumCounter(ssl_counter_type, ssl_cipher);

Powered by Google App Engine
This is Rietveld 408576698