diff options
Diffstat (limited to 'third_party/libwebrtc/moz-patch-stack/0051.patch')
-rw-r--r-- | third_party/libwebrtc/moz-patch-stack/0051.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/third_party/libwebrtc/moz-patch-stack/0051.patch b/third_party/libwebrtc/moz-patch-stack/0051.patch new file mode 100644 index 0000000000..5a487f124f --- /dev/null +++ b/third_party/libwebrtc/moz-patch-stack/0051.patch @@ -0,0 +1,38 @@ +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 7a5cbac77d..65f21700d0 100644 +--- a/modules/rtp_rtcp/source/source_tracker.cc ++++ b/modules/rtp_rtcp/source/source_tracker.cc +@@ -36,7 +36,8 @@ void SourceTracker::OnFrameDelivered(const RtpPacketInfos& packet_infos) { + SourceKey key(RtpSourceType::CSRC, csrc); + SourceEntry& entry = UpdateEntry(key); + +- entry.timestamp_ms = now_ms; ++ const auto packet_time = packet_info.receive_time().ms(); ++ entry.timestamp_ms = packet_time ? packet_time : now_ms; + entry.audio_level = packet_info.audio_level(); + entry.absolute_capture_time = packet_info.absolute_capture_time(); + entry.local_capture_clock_offset = +@@ -77,6 +78,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; + } + +-- +2.34.1 + |