06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
From: Jan-Ivar Bruaroey <jib@mozilla.com>
|
|
Date: Wed, 28 Jun 2023 20:45:00 -0400
|
|
Subject: Bug 1839451 - (fix-0f43da2248) Keep mozilla's
|
|
RTCPReceiver::RemoteRTCPSenderInfo function working.
|
|
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/154c9cdb386d0f50c5e1549270e1af6ab4969602
|
|
---
|
|
modules/rtp_rtcp/source/rtcp_receiver.cc | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/modules/rtp_rtcp/source/rtcp_receiver.cc b/modules/rtp_rtcp/source/rtcp_receiver.cc
|
|
index 7cab66042b..e740d786fb 100644
|
|
--- a/modules/rtp_rtcp/source/rtcp_receiver.cc
|
|
+++ b/modules/rtp_rtcp/source/rtcp_receiver.cc
|
|
@@ -391,10 +391,10 @@ void RTCPReceiver::RemoteRTCPSenderInfo(uint32_t* packet_count,
|
|
int64_t* ntp_timestamp_ms,
|
|
int64_t* remote_ntp_timestamp_ms) const {
|
|
MutexLock lock(&rtcp_receiver_lock_);
|
|
- *packet_count = remote_sender_packet_count_;
|
|
- *octet_count = remote_sender_octet_count_;
|
|
- *ntp_timestamp_ms = last_received_sr_ntp_.ToMs();
|
|
- *remote_ntp_timestamp_ms = remote_sender_ntp_time_.ToMs();
|
|
+ *packet_count = remote_sender_.packets_sent;
|
|
+ *octet_count = remote_sender_.bytes_sent;
|
|
+ *ntp_timestamp_ms = remote_sender_.last_arrival_timestamp.ToMs();
|
|
+ *remote_ntp_timestamp_ms = remote_sender_.last_remote_timestamp.ToMs();
|
|
}
|
|
|
|
std::vector<ReportBlockData> RTCPReceiver::GetLatestReportBlockData() const {
|