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.2 KiB
Diff
30 lines
1.2 KiB
Diff
From: "Byron Campen [:bwc]" <docfaraday@gmail.com>
|
|
Date: Fri, 12 Mar 2021 08:53:00 -0600
|
|
Subject: Bug 1654112 - libwebrtc modification: Init some stats that were being
|
|
passed to us uninitialized. r=ng
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D108673
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/c385bb870413b925af48df97aa1f2b80a26e78d2
|
|
---
|
|
call/video_receive_stream.h | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/call/video_receive_stream.h b/call/video_receive_stream.h
|
|
index dd1220e787..574bf3166b 100644
|
|
--- a/call/video_receive_stream.h
|
|
+++ b/call/video_receive_stream.h
|
|
@@ -170,9 +170,10 @@ class VideoReceiveStreamInterface : public MediaReceiveStreamInterface {
|
|
RtcpPacketTypeCounter rtcp_packet_type_counts;
|
|
std::optional<RtpReceiveStats> rtx_rtp_stats;
|
|
|
|
- uint32_t rtcp_sender_packets_sent;
|
|
- uint32_t rtcp_sender_octets_sent;
|
|
- int64_t rtcp_sender_ntp_timestamp_ms;
|
|
+ // Mozilla modification: Init these three.
|
|
+ uint32_t rtcp_sender_packets_sent = 0;
|
|
+ uint32_t rtcp_sender_octets_sent = 0;
|
|
+ int64_t rtcp_sender_ntp_timestamp_ms = 0;
|
|
|
|
// Timing frame info: all important timestamps for a full lifetime of a
|
|
// single 'timing frame'.
|