Michael Froman
c0c9a0cd01
Upstream commit: https://webrtc.googlesource.com/src/+/3901cac157827a74e6edf140303ea2260519c7bc Stash PacketBuffer::Packet instead of recreating it during unstash To reduce cost of re-trying and re-parsing the same packet multiple times. Bug: b/510362066 Change-Id: Ic1ffe2c2e6466d0c028a9d4dff9b6c656787633e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/496061 Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Åsa Persson <asapersson@webrtc.org> Cr-Commit-Position: refs/heads/main@{#48366}
37 lines
1.9 KiB
Diff
37 lines
1.9 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 | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/video/rtp_video_stream_receiver2.cc b/video/rtp_video_stream_receiver2.cc
|
|
index 42ee2cd9a1..a0108d61cc 100644
|
|
--- a/video/rtp_video_stream_receiver2.cc
|
|
+++ b/video/rtp_video_stream_receiver2.cc
|
|
@@ -820,6 +820,12 @@ void RtpVideoStreamReceiver2::OnRtpPacket(const RtpPacketReceived& packet) {
|
|
|
|
void RtpVideoStreamReceiver2::RequestKeyFrame() {
|
|
RTC_DCHECK_RUN_ON(worker_queue_);
|
|
+ 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.
|
|
@@ -1165,7 +1171,7 @@ std::optional<int64_t> RtpVideoStreamReceiver2::LastReceivedKeyframePacketMs()
|
|
void RtpVideoStreamReceiver2::RemoteRTCPSenderInfo(
|
|
uint32_t* packet_count, uint32_t* octet_count,
|
|
int64_t* ntp_timestamp_ms, int64_t* remote_ntp_timestamp_ms) const {
|
|
- RTC_DCHECK_RUN_ON(&worker_task_checker_);
|
|
+ RTC_DCHECK_RUN_ON(worker_queue_);
|
|
rtp_rtcp_->RemoteRTCPSenderInfo(packet_count, octet_count, ntp_timestamp_ms,
|
|
remote_ntp_timestamp_ms);
|
|
}
|