Nico Grunbaum
e2323bb70c
Upstream commit: https://webrtc.googlesource.com/src/+/d83af386124cb2cebe0039fe0b84cee2f44c059c Make some VideoReceiveStream2 and RtpVideoStreamReceiver2 members const Make a few existing member variables const where possible. Also moving max_wait_for_keyframe_ and max_wait_for_frame_ members to match initialization and the internal dependency structure. Bug: webrtc:42222117 Change-Id: I4e9584d0ff9efc1047e4df4debabc2221eaa7a1f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/471780 Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47695}
74 lines
3.3 KiB
Diff
74 lines
3.3 KiB
Diff
From: "Byron Campen [:bwc]" <docfaraday@gmail.com>
|
|
Date: Fri, 12 Mar 2021 08:55:00 -0600
|
|
Subject: Bug 1654112 - libwebrtc modification: Surface video RTCP SR stats
|
|
again. r=ng
|
|
|
|
libwebrtc has stopped surfacing these, and Chromium does not support
|
|
these stats at all.
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D108674
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/edac9d01a9ac7594f4b22708a4690753638ca32c
|
|
---
|
|
video/rtp_video_stream_receiver2.cc | 10 ++++++++++
|
|
video/rtp_video_stream_receiver2.h | 6 ++++++
|
|
video/video_receive_stream2.cc | 8 ++++++++
|
|
3 files changed, 24 insertions(+)
|
|
|
|
diff --git a/video/rtp_video_stream_receiver2.cc b/video/rtp_video_stream_receiver2.cc
|
|
index fa911ac815..d0054d3a70 100644
|
|
--- a/video/rtp_video_stream_receiver2.cc
|
|
+++ b/video/rtp_video_stream_receiver2.cc
|
|
@@ -1138,6 +1138,16 @@ std::optional<int64_t> RtpVideoStreamReceiver2::LastReceivedKeyframePacketMs()
|
|
return std::nullopt;
|
|
}
|
|
|
|
+// Mozilla modification: VideoReceiveStream2 and friends do not surface RTCP
|
|
+// stats at all, and even on the most recent libwebrtc code there does not
|
|
+// seem to be any support for these stats right now. So, we hack this in.
|
|
+void RtpVideoStreamReceiver2::RemoteRTCPSenderInfo(
|
|
+ uint32_t* packet_count, uint32_t* octet_count,
|
|
+ int64_t* ntp_timestamp_ms) const {
|
|
+ RTC_DCHECK_RUN_ON(&worker_task_checker_);
|
|
+ rtp_rtcp_->RemoteRTCPSenderInfo(packet_count, octet_count, ntp_timestamp_ms);
|
|
+}
|
|
+
|
|
std::optional<RtpRtcpInterface::SenderReportStats>
|
|
RtpVideoStreamReceiver2::GetSenderReportStats() const {
|
|
RTC_DCHECK_RUN_ON(&packet_sequence_checker_);
|
|
diff --git a/video/rtp_video_stream_receiver2.h b/video/rtp_video_stream_receiver2.h
|
|
index 5e38a221b7..9f74357d02 100644
|
|
--- a/video/rtp_video_stream_receiver2.h
|
|
+++ b/video/rtp_video_stream_receiver2.h
|
|
@@ -228,6 +228,12 @@ class RtpVideoStreamReceiver2 : public LossNotificationSender,
|
|
std::optional<RtpRtcpInterface::SenderReportStats> GetSenderReportStats()
|
|
const;
|
|
|
|
+ // Mozilla modification: VideoReceiveStream2 and friends do not surface RTCP
|
|
+ // stats at all, and even on the most recent libwebrtc code there does not
|
|
+ // seem to be any support for these stats right now. So, we hack this in.
|
|
+ void RemoteRTCPSenderInfo(uint32_t* packet_count, uint32_t* octet_count,
|
|
+ int64_t* ntp_timestamp_ms) const;
|
|
+
|
|
private:
|
|
// Implements RtpVideoFrameReceiver.
|
|
void ManageFrame(std::unique_ptr<RtpFrameObject> frame) override;
|
|
diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc
|
|
index bd1770456e..9f9d4ab838 100644
|
|
--- a/video/video_receive_stream2.cc
|
|
+++ b/video/video_receive_stream2.cc
|
|
@@ -614,6 +614,14 @@ VideoReceiveStreamInterface::Stats VideoReceiveStream2::GetStats() const {
|
|
stats.sender_reports_bytes_sent = rtcp_sr_stats->bytes_sent;
|
|
stats.sender_reports_reports_count = rtcp_sr_stats->reports_count;
|
|
}
|
|
+
|
|
+ // Mozilla modification: VideoReceiveStream2 and friends do not surface RTCP
|
|
+ // stats at all, and even on the most recent libwebrtc code there does not
|
|
+ // seem to be any support for these stats right now. So, we hack this in.
|
|
+ rtp_video_stream_receiver_.RemoteRTCPSenderInfo(
|
|
+ &stats.rtcp_sender_packets_sent, &stats.rtcp_sender_octets_sent,
|
|
+ &stats.rtcp_sender_ntp_timestamp_ms);
|
|
+
|
|
return stats;
|
|
}
|
|
|