Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit 471485e

Browse files
committed
Remove NetworkMonitorIos.
Network monitor for iOS is implemented in libwebrtc. https://webrtc.googlesource.com/src/+/ea7fbfb9665bfa5e01ea375df94cc4421c8655ef
1 parent 197a6c9 commit 471485e

File tree

7 files changed

+1
-171
lines changed

7 files changed

+1
-171
lines changed

talk/owt/BUILD.gn

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,18 +178,14 @@ static_library("owt_sdk_base") {
178178
include_dirs += [ owt_quic_header_root ]
179179
}
180180
}
181-
181+
182182
if (is_win || is_linux) {
183183
# Custom audio/video input and output.
184184
# When rebasing libwebrtc to a new version, custom audio/video input/output
185185
# usually need some changes to fit the latest API.
186186
defines += [ "OWT_CUSTOM_AVIO" ]
187187
}
188188
if (is_ios) {
189-
sources += [
190-
"sdk/base/ios/networkmonitorios.cc",
191-
"sdk/base/ios/networkmonitorios.h",
192-
]
193189
public_deps += [ "//third_party/webrtc/sdk:framework_objc+link" ]
194190
}
195191
if (is_win) {

talk/owt/sdk/base/ios/networkmonitorios.cc

Lines changed: 0 additions & 82 deletions
This file was deleted.

talk/owt/sdk/base/ios/networkmonitorios.h

Lines changed: 0 additions & 48 deletions
This file was deleted.

talk/owt/sdk/base/ios/readme.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

talk/owt/sdk/base/peerconnectionchannel.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ bool PeerConnectionChannel::InitializePeerConnection() {
3737
return false;
3838
}
3939
RTC_CHECK(peer_connection_);
40-
rtc::NetworkMonitorInterface* network_monitor = factory_->NetworkMonitor();
41-
if (network_monitor) {
42-
network_monitor->SignalNetworksChanged.connect(
43-
this, &PeerConnectionChannel::OnNetworksChanged);
44-
}
4540
return true;
4641
}
4742
void PeerConnectionChannel::ApplyBitrateSettings() {

talk/owt/sdk/base/peerconnectiondependencyfactory.cc

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#elif defined(WEBRTC_LINUX)
2828
#include "talk/owt/sdk/base/linux/msdkvideodecoderfactory.h"
2929
#elif defined(WEBRTC_IOS)
30-
#include "talk/owt/sdk/base/ios/networkmonitorios.h"
3130
#include "talk/owt/sdk/base/objc/ObjcVideoCodecFactory.h"
3231
#endif
3332
#if defined(WEBRTC_LINUX) || defined(WEBRTC_WIN)
@@ -58,9 +57,6 @@ PeerConnectionDependencyFactory::PeerConnectionDependencyFactory()
5857
} else {
5958
render_hardware_acceleration_enabled_ = false;
6059
}
61-
#endif
62-
#if defined(WEBRTC_IOS)
63-
network_monitor_ = nullptr;
6460
#endif
6561
encoded_frame_ = GlobalConfiguration::GetEncodedVideoFrameEnabled();
6662
pc_thread_->SetName("peerconnection_dependency_factory_thread", nullptr);
@@ -290,27 +286,6 @@ rtc::scoped_refptr<PeerConnectionFactoryInterface>
290286
PeerConnectionDependencyFactory::PeerConnectionFactory() const {
291287
return pc_factory_;
292288
}
293-
rtc::NetworkMonitorInterface*
294-
PeerConnectionDependencyFactory::NetworkMonitor() {
295-
#if defined(WEBRTC_IOS)
296-
pc_thread_->Invoke<void>(
297-
RTC_FROM_HERE,
298-
Bind(
299-
&PeerConnectionDependencyFactory::CreateNetworkMonitorOnCurrentThread,
300-
this));
301-
return network_monitor_;
302-
#else
303-
return nullptr;
304-
#endif
305-
}
306-
void PeerConnectionDependencyFactory::CreateNetworkMonitorOnCurrentThread() {
307-
#if defined(WEBRTC_IOS)
308-
if (!network_monitor_) {
309-
network_monitor_ = new NetworkMonitorIos();
310-
network_monitor_->Start();
311-
}
312-
#endif
313-
}
314289

315290
#if defined(WEBRTC_WIN) || defined(WEBRTC_LINUX)
316291
scoped_refptr<webrtc::AudioDeviceModule> PeerConnectionDependencyFactory::

talk/owt/sdk/base/peerconnectiondependencyfactory.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ class PeerConnectionDependencyFactory : public rtc::RefCountInterface {
5454
webrtc::VideoTrackSourceInterface* video_source);
5555
rtc::scoped_refptr<AudioSourceInterface> CreateAudioSource(
5656
const cricket::AudioOptions& options);
57-
rtc::NetworkMonitorInterface* NetworkMonitor();
5857
// Returns current |pc_factory_|.
5958
rtc::scoped_refptr<PeerConnectionFactoryInterface> PeerConnectionFactory()
6059
const;
@@ -72,7 +71,6 @@ class PeerConnectionDependencyFactory : public rtc::RefCountInterface {
7271
CreatePeerConnectionOnCurrentThread(
7372
const webrtc::PeerConnectionInterface::RTCConfiguration& config,
7473
webrtc::PeerConnectionObserver* observer);
75-
void CreateNetworkMonitorOnCurrentThread();
7674
#if defined(WEBRTC_WIN) || defined(WEBRTC_LINUX)
7775
rtc::scoped_refptr<webrtc::AudioDeviceModule> CreateCustomizedAudioDeviceModuleOnCurrentThread();
7876
#endif
@@ -91,9 +89,6 @@ class PeerConnectionDependencyFactory : public rtc::RefCountInterface {
9189
// VP8, H.264 & HEVC enc/dec
9290
#endif
9391
bool encoded_frame_;
94-
#if defined(WEBRTC_IOS)
95-
rtc::NetworkMonitorInterface* network_monitor_;
96-
#endif
9792
std::string field_trial_;
9893
#if defined(WEBRTC_WIN)
9994
std::unique_ptr<webrtc::ScopedCOMInitializer> com_initializer_;

0 commit comments

Comments
 (0)