diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /third_party/libwebrtc/pc/peer_connection_factory.h | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | third_party/libwebrtc/pc/peer_connection_factory.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/third_party/libwebrtc/pc/peer_connection_factory.h b/third_party/libwebrtc/pc/peer_connection_factory.h index c3760c02c9..a8af9f5efa 100644 --- a/third_party/libwebrtc/pc/peer_connection_factory.h +++ b/third_party/libwebrtc/pc/peer_connection_factory.h @@ -109,7 +109,7 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { } const FieldTrialsView& field_trials() const { - return context_->field_trials(); + return context_->env().field_trials(); } cricket::MediaEngineInterface* media_engine() const; @@ -147,7 +147,8 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { std::unique_ptr<NetEqFactory> neteq_factory_; const std::unique_ptr<RtpTransportControllerSendFactoryInterface> transport_controller_send_factory_; - std::unique_ptr<Metronome> metronome_ RTC_GUARDED_BY(worker_thread()); + std::unique_ptr<Metronome> decode_metronome_ RTC_GUARDED_BY(worker_thread()); + std::unique_ptr<Metronome> encode_metronome_ RTC_GUARDED_BY(worker_thread()); }; } // namespace webrtc |