From ff4ed47d3828bcef3640727a35e0522f3e645763 Mon Sep 17 00:00:00 2001 From: Nico Grunbaum Date: Wed, 13 Feb 2019 16:35:12 +0000 Subject: [PATCH] Bug 1527633 - rename GetRTPStats to something less ambiguous r=dminor rename GetRTPStats to something less ambiguous Differential Revision: https://phabricator.services.mozilla.com/D19670 --HG-- extra : moz-landing-system : lando --- media/webrtc/signaling/src/media-conduit/AudioConduit.cpp | 2 +- media/webrtc/signaling/src/media-conduit/AudioConduit.h | 2 +- .../webrtc/signaling/src/media-conduit/MediaConduitInterface.h | 2 +- media/webrtc/signaling/src/media-conduit/VideoConduit.cpp | 2 +- media/webrtc/signaling/src/media-conduit/VideoConduit.h | 2 +- .../webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp index 9e40af50c6ff..471ed872b4f3 100644 --- a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp +++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp @@ -174,7 +174,7 @@ bool WebrtcAudioConduit::GetRecvPacketTypeStats( return mRecvChannelProxy->GetRTCPPacketTypeCounters(*aPacketCounts); } -bool WebrtcAudioConduit::GetRTPStats(unsigned int* jitterMs, +bool WebrtcAudioConduit::GetRTPReceiverStats(unsigned int* jitterMs, unsigned int* cumulativeLost) { ASSERT_ON_THREAD(mStsThread); *jitterMs = 0; diff --git a/media/webrtc/signaling/src/media-conduit/AudioConduit.h b/media/webrtc/signaling/src/media-conduit/AudioConduit.h index 67560ca927e9..454362726c3c 100644 --- a/media/webrtc/signaling/src/media-conduit/AudioConduit.h +++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.h @@ -236,7 +236,7 @@ class WebrtcAudioConduit : public AudioSessionConduit, uint32_t* framesDecoded) override { return false; } - bool GetRTPStats(unsigned int* jitterMs, + bool GetRTPReceiverStats(unsigned int* jitterMs, unsigned int* cumulativeLost) override; bool GetRTCPReceiverReport(uint32_t* jitterMs, uint32_t* packetsReceived, uint64_t* bytesReceived, uint32_t* cumulativeLost, diff --git a/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h b/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h index 51ca89df671d..907897f32ca5 100644 --- a/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h +++ b/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h @@ -238,7 +238,7 @@ class MediaSessionConduit { double* bitrateMean, double* bitrateStdDev, uint32_t* discardedPackets, uint32_t* framesDecoded) = 0; - virtual bool GetRTPStats(unsigned int* jitterMs, + virtual bool GetRTPReceiverStats(unsigned int* jitterMs, unsigned int* cumulativeLost) = 0; virtual bool GetRTCPReceiverReport(uint32_t* jitterMs, uint32_t* packetsReceived, diff --git a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp index 5fbf0d82e7de..745572fdf683 100644 --- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp +++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp @@ -1171,7 +1171,7 @@ bool WebrtcVideoConduit::GetVideoDecoderStats(double* framerateMean, return true; } -bool WebrtcVideoConduit::GetRTPStats(uint32_t* jitterMs, +bool WebrtcVideoConduit::GetRTPReceiverStats(uint32_t* jitterMs, uint32_t* packetsLost) { ASSERT_ON_THREAD(mStsThread); diff --git a/media/webrtc/signaling/src/media-conduit/VideoConduit.h b/media/webrtc/signaling/src/media-conduit/VideoConduit.h index 07cf5bf95b0f..86c7d83e4472 100644 --- a/media/webrtc/signaling/src/media-conduit/VideoConduit.h +++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.h @@ -262,7 +262,7 @@ class WebrtcVideoConduit double* bitrateMean, double* bitrateStdDev, uint32_t* discardedPackets, uint32_t* framesDecoded) override; - bool GetRTPStats(unsigned int* jitterMs, + bool GetRTPReceiverStats(unsigned int* jitterMs, unsigned int* cumulativeLost) override; bool GetRTCPReceiverReport(uint32_t* jitterMs, uint32_t* packetsReceived, uint64_t* bytesReceived, uint32_t* cumulativeLost, diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp index 5792b801a40c..7627df13026c 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp @@ -2939,7 +2939,7 @@ RefPtr PeerConnectionImpl::ExecuteStatsQuery_s( s.mMediaType.Construct(kind); // mediaType is the old name for kind. s.mKind.Construct(kind); unsigned int jitterMs, packetsLost; - if (mp.Conduit()->GetRTPStats(&jitterMs, &packetsLost)) { + if (mp.Conduit()->GetRTPReceiverStats(&jitterMs, &packetsLost)) { s.mJitter.Construct(double(jitterMs) / 1000); s.mPacketsLost.Construct(packetsLost); }