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
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 5bf7f51c8e..f99e0d4b45 100644
|
|
--- a/video/rtp_video_stream_receiver2.cc
|
|
+++ b/video/rtp_video_stream_receiver2.cc
|
|
@@ -785,6 +785,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.
|