summaryrefslogtreecommitdiffstats
path: root/third_party/libwebrtc/moz-patch-stack/0045.patch
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/libwebrtc/moz-patch-stack/0045.patch')
-rw-r--r--third_party/libwebrtc/moz-patch-stack/0045.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/third_party/libwebrtc/moz-patch-stack/0045.patch b/third_party/libwebrtc/moz-patch-stack/0045.patch
new file mode 100644
index 0000000000..c9e890c35a
--- /dev/null
+++ b/third_party/libwebrtc/moz-patch-stack/0045.patch
@@ -0,0 +1,35 @@
+From: Nico Grunbaum <na-g@nostrum.com>
+Date: Mon, 26 Jul 2021 22:51:00 -0700
+Subject: Bug 1654112 - fix timestamp issues with RTP sources; r=mjf
+
+Differential Revision: https://phabricator.services.mozilla.com/D120930
+Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/de8c14e4972f717bf937b6f2fffcd08c35e21ced
+---
+ modules/rtp_rtcp/source/source_tracker.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/modules/rtp_rtcp/source/source_tracker.cc b/modules/rtp_rtcp/source/source_tracker.cc
+index 51e8f1cd38..b54f6cacf8 100644
+--- a/modules/rtp_rtcp/source/source_tracker.cc
++++ b/modules/rtp_rtcp/source/source_tracker.cc
+@@ -47,7 +47,8 @@ void SourceTracker::OnFrameDeliveredInternal(
+ SourceKey key(RtpSourceType::CSRC, csrc);
+ SourceEntry& entry = UpdateEntry(key);
+
+- entry.timestamp = now;
++ const auto packet_time = packet_info.receive_time();
++ entry.timestamp = packet_time.ms() ? packet_time : now;
+ entry.audio_level = packet_info.audio_level();
+ entry.absolute_capture_time = packet_info.absolute_capture_time();
+ entry.local_capture_clock_offset =
+@@ -86,6 +87,10 @@ std::vector<RtpSource> SourceTracker::GetSources() const {
+ .local_capture_clock_offset = entry.local_capture_clock_offset});
+ }
+
++ std::sort(sources.begin(), sources.end(), [](const auto &a, const auto &b){
++ return a.timestamp().ms() > b.timestamp().ms();
++ });
++
+ return sources;
+ }
+