1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
From: Michael Froman <mjfroman@mac.com>
Date: Mon, 15 Sep 2025 14:53:58 -0500
Subject: Bug 1973648 - move applicable libwebrtc changes to our new
libwebrtc_overrides location. r=ng
Differential Revision: https://phabricator.services.mozilla.com/D258499
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/19164e58323d59c1f66f7fcf671b8d0b6366f708
---
call/call.cc | 13 -------------
call/call.h | 14 ++------------
modules/desktop_capture/BUILD.gn | 5 +++++
3 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/call/call.cc b/call/call.cc
index 716da8b65a..39c7cb79af 100644
--- a/call/call.cc
+++ b/call/call.cc
@@ -513,19 +513,6 @@ class Call final : public webrtc::Call,
};
} // namespace internal
-std::string Call::Stats::ToString(int64_t time_ms) const {
- char buf[1024];
- SimpleStringBuilder ss(buf);
- ss << "Call stats: " << time_ms << ", {";
- ss << "send_bw_bps: " << send_bandwidth_bps << ", ";
- ss << "recv_bw_bps: " << recv_bandwidth_bps << ", ";
- ss << "max_pad_bps: " << max_padding_bitrate_bps << ", ";
- ss << "pacer_delay_ms: " << pacer_delay_ms << ", ";
- ss << "rtt_ms: " << rtt_ms;
- ss << '}';
- return ss.str();
-}
-
std::unique_ptr<Call> Call::Create(CallConfig config) {
auto transport_send = std::make_unique<RtpTransportControllerSend>(
config.ExtractTransportConfig());
diff --git a/call/call.h b/call/call.h
index d626f5c8b2..fb92bc49fa 100644
--- a/call/call.h
+++ b/call/call.h
@@ -26,6 +26,7 @@
#include "api/transport/bitrate_settings.h"
#include "call/audio_receive_stream.h"
#include "call/audio_send_stream.h"
+#include "call/call_basic_stats.h"
#include "call/call_config.h"
#include "call/flexfec_receive_stream.h"
#include "call/packet_receiver.h"
@@ -53,18 +54,7 @@ namespace webrtc {
class Call {
public:
- struct Stats {
- std::string ToString(int64_t time_ms) const;
-
- int send_bandwidth_bps = 0; // Estimated available send bandwidth.
- int max_padding_bitrate_bps = 0; // Cumulative configured max padding.
- int recv_bandwidth_bps = 0; // Estimated available receive bandwidth.
- int64_t pacer_delay_ms = 0;
- int64_t rtt_ms = -1;
- std::optional<int64_t> ccfb_messages_received = std::nullopt;
- flat_map<uint32_t, SentCongestionControllerFeedbackStats>
- sent_ccfb_stats_per_ssrc;
- };
+ using Stats = CallBasicStats;
static std::unique_ptr<Call> Create(CallConfig config);
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index 0a6ccf4011..aa174d524f 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -394,6 +394,11 @@ rtc_library("desktop_capture") {
]
if (build_with_mozilla) {
libs -= [ "Xtst" ]
+ # Mozilla provides custom impl of x_error_trap.*
+ sources -= [
+ "linux/x11/x_error_trap.cc",
+ "linux/x11/x_error_trap.h",
+ ]
}
}
|
