Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: remoting/protocol/webrtc_transport.h

Issue 1500663003: Removing references to webrtc::PortAllocatorFactoryInterface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing merge conflict, and removing some dead code. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_ 5 #ifndef REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
6 #define REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_ 6 #define REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/threading/thread.h" 12 #include "base/threading/thread.h"
13 #include "base/threading/thread_checker.h" 13 #include "base/threading/thread_checker.h"
14 #include "base/timer/timer.h" 14 #include "base/timer/timer.h"
15 #include "remoting/protocol/network_settings.h"
15 #include "remoting/protocol/transport.h" 16 #include "remoting/protocol/transport.h"
16 #include "remoting/protocol/webrtc_data_stream_adapter.h" 17 #include "remoting/protocol/webrtc_data_stream_adapter.h"
17 #include "remoting/signaling/signal_strategy.h" 18 #include "remoting/signaling/signal_strategy.h"
18 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h " 19 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h "
19 20
20 namespace webrtc { 21 namespace webrtc {
21 class FakeAudioDeviceModule; 22 class FakeAudioDeviceModule;
22 } // namespace webrtc 23 } // namespace webrtc
23 24
24 namespace remoting { 25 namespace remoting {
25 namespace protocol { 26 namespace protocol {
26 27
27 class WebrtcTransport : public Transport, 28 class WebrtcTransport : public Transport,
28 public webrtc::PeerConnectionObserver { 29 public webrtc::PeerConnectionObserver {
29 public: 30 public:
30 WebrtcTransport( 31 WebrtcTransport(
31 rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface> 32 const NetworkSettings& network_settings,
32 port_allocator_factory,
33 TransportRole role, 33 TransportRole role,
34 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner); 34 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner);
35 ~WebrtcTransport() override; 35 ~WebrtcTransport() override;
36 36
37 // Transport interface. 37 // Transport interface.
38 void Start(EventHandler* event_handler, 38 void Start(EventHandler* event_handler,
39 Authenticator* authenticator) override; 39 Authenticator* authenticator) override;
40 bool ProcessTransportInfo(buzz::XmlElement* transport_info) override; 40 bool ProcessTransportInfo(buzz::XmlElement* transport_info) override;
41 StreamChannelFactory* GetStreamChannelFactory() override; 41 StreamChannelFactory* GetStreamChannelFactory() override;
42 StreamChannelFactory* GetMultiplexedChannelFactory() override; 42 StreamChannelFactory* GetMultiplexedChannelFactory() override;
(...skipping 20 matching lines...) Expand all
63 void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override; 63 void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override;
64 64
65 void EnsurePendingTransportInfoMessage(); 65 void EnsurePendingTransportInfoMessage();
66 void SendTransportInfo(); 66 void SendTransportInfo();
67 void AddPendingCandidatesIfPossible(); 67 void AddPendingCandidatesIfPossible();
68 68
69 void Close(ErrorCode error); 69 void Close(ErrorCode error);
70 70
71 base::ThreadChecker thread_checker_; 71 base::ThreadChecker thread_checker_;
72 72
73 rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface> 73 NetworkSettings network_settings_;
74 port_allocator_factory_;
75 TransportRole role_; 74 TransportRole role_;
76 EventHandler* event_handler_ = nullptr; 75 EventHandler* event_handler_ = nullptr;
77 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner_; 76 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner_;
78 77
79 scoped_ptr<webrtc::FakeAudioDeviceModule> fake_audio_device_module_; 78 scoped_ptr<webrtc::FakeAudioDeviceModule> fake_audio_device_module_;
80 79
81 rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> 80 rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>
82 peer_connection_factory_; 81 peer_connection_factory_;
83 rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_; 82 rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;
84 83
85 scoped_ptr<buzz::XmlElement> pending_transport_info_message_; 84 scoped_ptr<buzz::XmlElement> pending_transport_info_message_;
86 base::OneShotTimer transport_info_timer_; 85 base::OneShotTimer transport_info_timer_;
87 86
88 ScopedVector<webrtc::IceCandidateInterface> pending_incoming_candidates_; 87 ScopedVector<webrtc::IceCandidateInterface> pending_incoming_candidates_;
89 88
90 std::list<rtc::scoped_refptr<webrtc::MediaStreamInterface>> 89 std::list<rtc::scoped_refptr<webrtc::MediaStreamInterface>>
91 unclaimed_streams_; 90 unclaimed_streams_;
92 91
93 WebrtcDataStreamAdapter data_stream_adapter_; 92 WebrtcDataStreamAdapter data_stream_adapter_;
94 93
95 base::WeakPtrFactory<WebrtcTransport> weak_factory_; 94 base::WeakPtrFactory<WebrtcTransport> weak_factory_;
96 95
97 DISALLOW_COPY_AND_ASSIGN(WebrtcTransport); 96 DISALLOW_COPY_AND_ASSIGN(WebrtcTransport);
98 }; 97 };
99 98
100 class WebrtcTransportFactory : public TransportFactory { 99 class WebrtcTransportFactory : public TransportFactory {
101 public: 100 public:
102 WebrtcTransportFactory( 101 WebrtcTransportFactory(SignalStrategy* signal_strategy,
103 SignalStrategy* signal_strategy, 102 const NetworkSettings& network_settings,
104 rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface> 103 TransportRole role);
105 port_allocator_factory,
106 TransportRole role);
107 ~WebrtcTransportFactory() override; 104 ~WebrtcTransportFactory() override;
108 105
109 // TransportFactory interface. 106 // TransportFactory interface.
110 scoped_ptr<Transport> CreateTransport() override; 107 scoped_ptr<Transport> CreateTransport() override;
111 108
112 private: 109 private:
113 SignalStrategy* signal_strategy_; 110 SignalStrategy* signal_strategy_;
114 rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface> 111 NetworkSettings network_settings_;
115 port_allocator_factory_;
116 TransportRole role_; 112 TransportRole role_;
117 113
118 base::Thread worker_thread_; 114 base::Thread worker_thread_;
119 115
120 DISALLOW_COPY_AND_ASSIGN(WebrtcTransportFactory); 116 DISALLOW_COPY_AND_ASSIGN(WebrtcTransportFactory);
121 }; 117 };
122 118
123 } // namespace protocol 119 } // namespace protocol
124 } // namespace remoting 120 } // namespace remoting
125 121
126 #endif // REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_ 122 #endif // REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698