diff options
author | Basilisk-Dev <basiliskdev@protonmail.com> | 2023-10-18 16:30:27 -0400 |
---|---|---|
committer | Basilisk-Dev <basiliskdev@protonmail.com> | 2023-10-18 16:30:27 -0400 |
commit | 5b5672fd5601074dbd06fc077b57879f534b82b6 (patch) | |
tree | 81eac0c2148f5cf401ee470f3d3f954164c82b15 /media | |
parent | 087febcc4b017a0af4ec82b1283341c8d979a17e (diff) | |
download | uxp-5b5672fd5601074dbd06fc077b57879f534b82b6.tar.gz |
Issue #2332 - Hyphenate rtc stats type as per spec
Backport of https://bugzilla.mozilla.org/show_bug.cgi?id=1322503
Diffstat (limited to 'media')
-rw-r--r-- | media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp | 16 | ||||
-rw-r--r-- | media/webrtc/signaling/src/peerconnection/WebrtcGlobalInformation.cpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp index ad87fa1f91..894a3a9a2d 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp @@ -3602,7 +3602,7 @@ static void ToRTCIceCandidateStats( cand.mPortNumber.Construct(c->cand_addr.port); cand.mTransport.Construct( NS_ConvertASCIItoUTF16(c->cand_addr.transport.c_str())); - if (candidateType == RTCStatsType::Localcandidate) { + if (candidateType == RTCStatsType::Local_candidate) { cand.mMozLocalTransport.Construct( NS_ConvertASCIItoUTF16(c->local_addr.transport.c_str())); } @@ -3636,7 +3636,7 @@ static void RecordIceStats_s( s.mId.Construct(codeword); s.mComponentId.Construct(componentId); s.mTimestamp.Construct(now); - s.mType.Construct(RTCStatsType::Candidatepair); + s.mType.Construct(RTCStatsType::Candidate_pair); s.mLocalCandidateId.Construct(localCodeword); s.mRemoteCandidateId.Construct(remoteCodeword); s.mNominated.Construct(p->nominated); @@ -3649,7 +3649,7 @@ static void RecordIceStats_s( std::vector<NrIceCandidate> candidates; if (NS_SUCCEEDED(mediaStream.GetLocalCandidates(&candidates))) { ToRTCIceCandidateStats(candidates, - RTCStatsType::Localcandidate, + RTCStatsType::Local_candidate, componentId, now, report); @@ -3658,7 +3658,7 @@ static void RecordIceStats_s( if (NS_SUCCEEDED(mediaStream.GetRemoteCandidates(&candidates))) { ToRTCIceCandidateStats(candidates, - RTCStatsType::Remotecandidate, + RTCStatsType::Remote_candidate, componentId, now, report); @@ -3710,7 +3710,7 @@ PeerConnectionImpl::ExecuteStatsQuery_s(RTCStatsQuery *query) { RTCInboundRTPStreamStats s; s.mTimestamp.Construct(timestamp); s.mId.Construct(remoteId); - s.mType.Construct(RTCStatsType::Inboundrtp); + s.mType.Construct(RTCStatsType::Inbound_rtp); if (ssrc.Length()) { s.mSsrc.Construct(ssrc); } @@ -3731,7 +3731,7 @@ PeerConnectionImpl::ExecuteStatsQuery_s(RTCStatsQuery *query) { RTCOutboundRTPStreamStats s; s.mTimestamp.Construct(query->now); s.mId.Construct(localId); - s.mType.Construct(RTCStatsType::Outboundrtp); + s.mType.Construct(RTCStatsType::Outbound_rtp); if (ssrc.Length()) { s.mSsrc.Construct(ssrc); } @@ -3784,7 +3784,7 @@ PeerConnectionImpl::ExecuteStatsQuery_s(RTCStatsQuery *query) { RTCOutboundRTPStreamStats s; s.mTimestamp.Construct(timestamp); s.mId.Construct(remoteId); - s.mType.Construct(RTCStatsType::Outboundrtp); + s.mType.Construct(RTCStatsType::Outbound_rtp); if (ssrc.Length()) { s.mSsrc.Construct(ssrc); } @@ -3801,7 +3801,7 @@ PeerConnectionImpl::ExecuteStatsQuery_s(RTCStatsQuery *query) { RTCInboundRTPStreamStats s; s.mTimestamp.Construct(query->now); s.mId.Construct(localId); - s.mType.Construct(RTCStatsType::Inboundrtp); + s.mType.Construct(RTCStatsType::Inbound_rtp); if (ssrc.Length()) { s.mSsrc.Construct(ssrc); } diff --git a/media/webrtc/signaling/src/peerconnection/WebrtcGlobalInformation.cpp b/media/webrtc/signaling/src/peerconnection/WebrtcGlobalInformation.cpp index 2f860cac60..8f3c29f116 100644 --- a/media/webrtc/signaling/src/peerconnection/WebrtcGlobalInformation.cpp +++ b/media/webrtc/signaling/src/peerconnection/WebrtcGlobalInformation.cpp @@ -1066,7 +1066,7 @@ static void StoreLongTermICEStatisticsImpl_m( uint32_t candBitmask = GetCandidateIpAndTransportMask(&cand); // Note: shift values need to result in the above enum table - if (cand.mType.Value() == RTCStatsType::Localcandidate) { + if (cand.mType.Value() == RTCStatsType::Local_candidate) { candBitmask <<= kLocalShift; } |