Skip to content

Commit

Permalink
Bug 1897501 - Vendor libwebrtc from 89e26b7249
Browse files Browse the repository at this point in the history
Upstream commit: https://webrtc.googlesource.com/src/+/89e26b72494b97b1a50e5c960147550896ed14af
    [m125] webrtc stats: fix video remote-outbound-rtp timestamp

    which had a 70 year offset (i.e. 2094 instead of 2024) which broke
    the webrtc-internal stats graphs. A similar adjustment is done
    for audio in audio/channel_receive.cc

    BUG=webrtc:12529,chromium:336222282

    (cherry picked from commit 77313800c72fa1e33c30e952800e4157e9ad44a4)

    Change-Id: I0ce43cc8b451185bc056cf9e54757ef22d006c99
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/347780
    Reviewed-by: Florent Castelli <[email protected]>
    Commit-Queue: Philipp Hancke <[email protected]>
    Reviewed-by: Harald Alvestrand <[email protected]>
    Cr-Original-Commit-Position: refs/heads/main@{#42114}
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/348702
    Commit-Queue: Harald Alvestrand <[email protected]>
    Cr-Commit-Position: refs/branch-heads/6422@{#1}
    Cr-Branched-From: b831eb816ef847d09d446ef4168e36b13af163f8-refs/heads/main@{#42072}
  • Loading branch information
mfromanmoz committed May 18, 2024
1 parent afc5110 commit e2577ef
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
3 changes: 3 additions & 0 deletions third_party/libwebrtc/README.moz-ff-commit
Original file line number Diff line number Diff line change
Expand Up @@ -29982,3 +29982,6 @@ a01300a684
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
b831eb816e
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
89e26b7249
2 changes: 2 additions & 0 deletions third_party/libwebrtc/README.mozilla
Original file line number Diff line number Diff line change
Expand Up @@ -20012,3 +20012,5 @@ libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-l
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2024-05-18T05:36:43.819678.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2024-05-18T05:37:31.155075.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2024-05-18T05:38:18.254889.
4 changes: 2 additions & 2 deletions third_party/libwebrtc/moz-patch-stack/0044.patch
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ index 8ea3ffd310..34f10334ba 100644
// Implements RtpVideoFrameReceiver.
void ManageFrame(std::unique_ptr<RtpFrameObject> frame) override;
diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc
index 6f63f760c0..1270d5dba1 100644
index f3a7c329a6..507dd3a04c 100644
--- a/video/video_receive_stream2.cc
+++ b/video/video_receive_stream2.cc
@@ -580,6 +580,14 @@ VideoReceiveStreamInterface::Stats VideoReceiveStream2::GetStats() const {
@@ -581,6 +581,14 @@ VideoReceiveStreamInterface::Stats VideoReceiveStream2::GetStats() const {
stats.sender_reports_bytes_sent = rtcp_sr_stats->bytes_sent;
stats.sender_reports_reports_count = rtcp_sr_stats->reports_count;
}
Expand Down
4 changes: 2 additions & 2 deletions third_party/libwebrtc/moz-patch-stack/0050.patch
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ index 34f10334ba..1355352cf6 100644
private:
// Implements RtpVideoFrameReceiver.
diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc
index 1270d5dba1..64fec5cf87 100644
index 507dd3a04c..69943d11ee 100644
--- a/video/video_receive_stream2.cc
+++ b/video/video_receive_stream2.cc
@@ -586,7 +586,8 @@ VideoReceiveStreamInterface::Stats VideoReceiveStream2::GetStats() const {
@@ -587,7 +587,8 @@ VideoReceiveStreamInterface::Stats VideoReceiveStream2::GetStats() const {
// seem to be any support for these stats right now. So, we hack this in.
rtp_video_stream_receiver_.RemoteRTCPSenderInfo(
&stats.rtcp_sender_packets_sent, &stats.rtcp_sender_octets_sent,
Expand Down
2 changes: 1 addition & 1 deletion third_party/libwebrtc/moz-patch-stack/0068.patch
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ index 1355352cf6..8f9f9db6db 100644
RTC_GUARDED_BY(packet_sequence_checker_);
// h26x_packet_buffer_ is nullptr if codec list doens't contain H.264 or
diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc
index 64fec5cf87..ec36865d46 100644
index 69943d11ee..23d8c17094 100644
--- a/video/video_receive_stream2.cc
+++ b/video/video_receive_stream2.cc
@@ -209,6 +209,7 @@ VideoReceiveStream2::VideoReceiveStream2(
Expand Down
5 changes: 3 additions & 2 deletions third_party/libwebrtc/video/video_receive_stream2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -574,9 +574,10 @@ VideoReceiveStreamInterface::Stats VideoReceiveStream2::GetStats() const {
rtp_video_stream_receiver_.GetSenderReportStats();
if (rtcp_sr_stats) {
stats.last_sender_report_timestamp_ms =
rtcp_sr_stats->last_arrival_timestamp.ToMs();
rtcp_sr_stats->last_arrival_timestamp.ToMs() -
rtc::kNtpJan1970Millisecs;
stats.last_sender_report_remote_timestamp_ms =
rtcp_sr_stats->last_remote_timestamp.ToMs();
rtcp_sr_stats->last_remote_timestamp.ToMs() - rtc::kNtpJan1970Millisecs;
stats.sender_reports_packets_sent = rtcp_sr_stats->packets_sent;
stats.sender_reports_bytes_sent = rtcp_sr_stats->bytes_sent;
stats.sender_reports_reports_count = rtcp_sr_stats->reports_count;
Expand Down

0 comments on commit e2577ef

Please sign in to comment.