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
47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
From: Andreas Pehrson <apehrson@mozilla.com>
|
|
Date: Thu, 6 Jan 2022 00:16:00 +0000
|
|
Subject: Bug 1748478 - Propagate calculated discarded packets to stats. r=bwc
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D135061
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/56fbf0469e25fa0d589c51ca112ce534a7c0ab91
|
|
---
|
|
video/receive_statistics_proxy.cc | 9 +++++++--
|
|
video/rtp_video_stream_receiver2.cc | 4 +++-
|
|
2 files changed, 10 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/video/receive_statistics_proxy.cc b/video/receive_statistics_proxy.cc
|
|
index 67770da4f0..8fbaf0ac0e 100644
|
|
--- a/video/receive_statistics_proxy.cc
|
|
+++ b/video/receive_statistics_proxy.cc
|
|
@@ -799,8 +799,13 @@ void ReceiveStatisticsProxy::OnDroppedFrames(uint32_t frames_dropped) {
|
|
}
|
|
|
|
void ReceiveStatisticsProxy::OnDiscardedPackets(uint32_t packets_discarded) {
|
|
- RTC_DCHECK_RUN_ON(&main_thread_);
|
|
- stats_.packets_discarded += packets_discarded;
|
|
+ // Can be called on either the decode queue or the worker thread
|
|
+ // See FrameBuffer2 for more details.
|
|
+ worker_thread_->PostTask(
|
|
+ SafeTask(task_safety_.flag(), [packets_discarded, this]() {
|
|
+ RTC_DCHECK_RUN_ON(&main_thread_);
|
|
+ stats_.packets_discarded += packets_discarded;
|
|
+ }));
|
|
}
|
|
|
|
void ReceiveStatisticsProxy::OnPreDecode(VideoCodecType codec_type, int qp) {
|
|
diff --git a/video/rtp_video_stream_receiver2.cc b/video/rtp_video_stream_receiver2.cc
|
|
index d286ed1ca2..73a8da11aa 100644
|
|
--- a/video/rtp_video_stream_receiver2.cc
|
|
+++ b/video/rtp_video_stream_receiver2.cc
|
|
@@ -1324,7 +1324,9 @@ void RtpVideoStreamReceiver2::FrameDecoded(int64_t picture_id) {
|
|
packet_infos_.erase(packet_infos_.begin(),
|
|
packet_infos_.upper_bound(unwrapped_rtp_seq_num));
|
|
uint32_t num_packets_cleared = packet_buffer_.ClearTo(seq_num);
|
|
- vcm_receive_statistics_->OnDiscardedPackets(num_packets_cleared);
|
|
+ if (num_packets_cleared > 0) {
|
|
+ vcm_receive_statistics_->OnDiscardedPackets(num_packets_cleared);
|
|
+ }
|
|
reference_finder_->ClearTo(seq_num);
|
|
}
|
|
}
|