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

Count key protocol for all media sections

Browse Source 
This will give accurate stats for the number of calls
that use video that are using SDES.

Bug: chromium:804275
Change-Id: I35b045a2301fb5267b656b424b9b3482b1b72f9a
Reviewed-on: https://webrtc-review.googlesource.com/60481
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22324}
This commit is contained in:
Harald Alvestrand
2018-03-07 10:56:14 +01:00
committed by Commit Bot
parent db4fa4b944
commit 2e18061033
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pc/peerconnection.cc
View File

@ -430,6 +430,11 @@ RTCError VerifyCrypto(const SessionDescription* desc,
if (content_info.rejected) { if (content_info.rejected) {
continue; continue;
} }
// Note what media is used with each crypto protocol, for all sections.
NoteKeyProtocolAndMedia(dtls_enabled ? webrtc::kEnumCounterKeyProtocolDtls
: webrtc::kEnumCounterKeyProtocolSdes,
content_info.media_description()->type(),
uma_observer);
const std::string& mid = content_info.name; const std::string& mid = content_info.name;
if (bundle && bundle->HasContentName(mid) && if (bundle && bundle->HasContentName(mid) &&
mid != *(bundle->FirstContentName())) { mid != *(bundle->FirstContentName())) {
@ -455,16 +460,12 @@ RTCError VerifyCrypto(const SessionDescription* desc,
return RTCError(RTCErrorType::INVALID_PARAMETER, return RTCError(RTCErrorType::INVALID_PARAMETER,
kSdpWithoutDtlsFingerprint); kSdpWithoutDtlsFingerprint);
} }
NoteKeyProtocolAndMedia(webrtc::kEnumCounterKeyProtocolDtls,
media->type(), uma_observer);
} else { } else {
if (media->cryptos().empty()) { if (media->cryptos().empty()) {
RTC_LOG(LS_WARNING) RTC_LOG(LS_WARNING)
<< "Session description must have SDES when DTLS disabled."; << "Session description must have SDES when DTLS disabled.";
return RTCError(RTCErrorType::INVALID_PARAMETER, kSdpWithoutSdesCrypto); return RTCError(RTCErrorType::INVALID_PARAMETER, kSdpWithoutSdesCrypto);
} }
NoteKeyProtocolAndMedia(webrtc::kEnumCounterKeyProtocolSdes,
media->type(), uma_observer);
} }
} }
return RTCError::OK(); return RTCError::OK();