Upstream commit: https://webrtc.googlesource.com/src/+/c1612b421bc3784e831224de78f36ffd0d0f2d71 Configure RTCP mode during RTP/RTCP module construction Pass the RTCP mode and remote SSRC directly (for receive) to the configuration and constructors of the RTP/RTCP modules, rather than relying on post-construction setters. Bug: webrtc:42222117 Change-Id: I7235a0089ca71f249dba6d79bad8901e0466ff0c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/471680 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47688}
28 lines
1.4 KiB
Diff
28 lines
1.4 KiB
Diff
From: Andreas Pehrson <apehrson@mozilla.com>
|
|
Date: Thu, 6 Jan 2022 00:16:00 +0000
|
|
Subject: Bug 1748458 - Add TRACE_EVENT for keyframe requests. r=bwc
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D135113
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/5b2a7894ef1cf096d0e8977754507c0820e757fc
|
|
---
|
|
video/rtp_video_stream_receiver2.cc | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/video/rtp_video_stream_receiver2.cc b/video/rtp_video_stream_receiver2.cc
|
|
index dcbd3de10f..f2048a2f45 100644
|
|
--- a/video/rtp_video_stream_receiver2.cc
|
|
+++ b/video/rtp_video_stream_receiver2.cc
|
|
@@ -795,6 +795,12 @@ void RtpVideoStreamReceiver2::OnRtpPacket(const RtpPacketReceived& packet) {
|
|
|
|
void RtpVideoStreamReceiver2::RequestKeyFrame() {
|
|
RTC_DCHECK_RUN_ON(&worker_task_checker_);
|
|
+ TRACE_EVENT2("webrtc", "RtpVideoStreamReceiver2::RequestKeyFrame",
|
|
+ "remote_ssrc", config_.rtp.remote_ssrc, "method",
|
|
+ keyframe_request_method_ == KeyFrameReqMethod::kPliRtcp ? "PLI"
|
|
+ : keyframe_request_method_ == KeyFrameReqMethod::kFirRtcp ? "FIR"
|
|
+ : keyframe_request_method_ == KeyFrameReqMethod::kNone ? "None"
|
|
+ : "Other");
|
|
// TODO(bugs.webrtc.org/10336): Allow the sender to ignore key frame requests
|
|
// issued by anything other than the LossNotificationController if it (the
|
|
// sender) is relying on LNTF alone.
|