| Index: remoting/protocol/webrtc_transport.h
|
| diff --git a/remoting/protocol/webrtc_transport.h b/remoting/protocol/webrtc_transport.h
|
| index f3d2cefa52bd7911a426dc0a2505c29684d00355..c118edf6bb956801e784ac1ef240431fadd34139 100644
|
| --- a/remoting/protocol/webrtc_transport.h
|
| +++ b/remoting/protocol/webrtc_transport.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
|
| #define REMOTING_PROTOCOL_WEBRTC_TRANSPORT_H_
|
|
|
| +#include <string>
|
| +
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -13,6 +15,7 @@
|
| #include "base/threading/thread_checker.h"
|
| #include "base/timer/timer.h"
|
| #include "crypto/hmac.h"
|
| +#include "remoting/codec/webrtc_video_encoder.h"
|
| #include "remoting/protocol/transport.h"
|
| #include "remoting/protocol/webrtc_data_stream_adapter.h"
|
| #include "remoting/signaling/signal_strategy.h"
|
| @@ -65,6 +68,9 @@ class WebrtcTransport : public Transport,
|
| webrtc::PeerConnectionFactoryInterface* peer_connection_factory() {
|
| return peer_connection_factory_;
|
| }
|
| + remoting::WebRtcVideoEncoderFactory* video_encoder_factory() {
|
| + return video_encoder_factory_;
|
| + }
|
|
|
| // Factories for outgoing and incoming data channels. Must be used only after
|
| // the transport is connected.
|
| @@ -79,6 +85,7 @@ class WebrtcTransport : public Transport,
|
| void Start(Authenticator* authenticator,
|
| SendTransportInfoCallback send_transport_info_callback) override;
|
| bool ProcessTransportInfo(buzz::XmlElement* transport_info) override;
|
| + void Close(ErrorCode error);
|
|
|
| private:
|
| void OnLocalSessionDescriptionCreated(
|
| @@ -108,8 +115,6 @@ class WebrtcTransport : public Transport,
|
| void SendTransportInfo();
|
| void AddPendingCandidatesIfPossible();
|
|
|
| - void Close(ErrorCode error);
|
| -
|
| base::ThreadChecker thread_checker_;
|
|
|
| rtc::Thread* worker_thread_;
|
| @@ -125,6 +130,8 @@ class WebrtcTransport : public Transport,
|
| peer_connection_factory_;
|
| rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;
|
|
|
| + remoting::WebRtcVideoEncoderFactory* video_encoder_factory_;
|
| +
|
| bool negotiation_pending_ = false;
|
|
|
| bool connected_ = false;
|
|
|