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

Side by Side Diff: talk/app/webrtc/peerconnection.h

Issue 1361273002: Reland of Adding PeerConnectionInterface::SetConfiguration method. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing patch conflict. Created 5 years, 2 months 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
« no previous file with comments | « talk/app/webrtc/objc/public/RTCPeerConnection.h ('k') | talk/app/webrtc/peerconnection.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 public sigslot::has_slots<> { 58 public sigslot::has_slots<> {
59 public: 59 public:
60 explicit PeerConnection(PeerConnectionFactory* factory); 60 explicit PeerConnection(PeerConnectionFactory* factory);
61 61
62 bool Initialize( 62 bool Initialize(
63 const PeerConnectionInterface::RTCConfiguration& configuration, 63 const PeerConnectionInterface::RTCConfiguration& configuration,
64 const MediaConstraintsInterface* constraints, 64 const MediaConstraintsInterface* constraints,
65 PortAllocatorFactoryInterface* allocator_factory, 65 PortAllocatorFactoryInterface* allocator_factory,
66 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, 66 rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store,
67 PeerConnectionObserver* observer); 67 PeerConnectionObserver* observer);
68 virtual rtc::scoped_refptr<StreamCollectionInterface> local_streams(); 68 rtc::scoped_refptr<StreamCollectionInterface> local_streams() override;
69 virtual rtc::scoped_refptr<StreamCollectionInterface> remote_streams(); 69 rtc::scoped_refptr<StreamCollectionInterface> remote_streams() override;
70 virtual bool AddStream(MediaStreamInterface* local_stream); 70 bool AddStream(MediaStreamInterface* local_stream) override;
71 virtual void RemoveStream(MediaStreamInterface* local_stream); 71 void RemoveStream(MediaStreamInterface* local_stream) override;
72 72
73 virtual rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender( 73 rtc::scoped_refptr<DtmfSenderInterface> CreateDtmfSender(
74 AudioTrackInterface* track); 74 AudioTrackInterface* track) override;
75 75
76 std::vector<rtc::scoped_refptr<RtpSenderInterface>> GetSenders() 76 std::vector<rtc::scoped_refptr<RtpSenderInterface>> GetSenders()
77 const override; 77 const override;
78 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> GetReceivers() 78 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> GetReceivers()
79 const override; 79 const override;
80 80
81 virtual rtc::scoped_refptr<DataChannelInterface> CreateDataChannel( 81 rtc::scoped_refptr<DataChannelInterface> CreateDataChannel(
82 const std::string& label, 82 const std::string& label,
83 const DataChannelInit* config); 83 const DataChannelInit* config) override;
84 virtual bool GetStats(StatsObserver* observer, 84 bool GetStats(StatsObserver* observer,
85 webrtc::MediaStreamTrackInterface* track, 85 webrtc::MediaStreamTrackInterface* track,
86 StatsOutputLevel level); 86 StatsOutputLevel level) override;
87 87
88 virtual SignalingState signaling_state(); 88 SignalingState signaling_state() override;
89 89
90 // TODO(bemasc): Remove ice_state() when callers are removed. 90 // TODO(bemasc): Remove ice_state() when callers are removed.
91 virtual IceState ice_state(); 91 IceState ice_state() override;
92 virtual IceConnectionState ice_connection_state(); 92 IceConnectionState ice_connection_state() override;
93 virtual IceGatheringState ice_gathering_state(); 93 IceGatheringState ice_gathering_state() override;
94 94
95 virtual const SessionDescriptionInterface* local_description() const; 95 const SessionDescriptionInterface* local_description() const override;
96 virtual const SessionDescriptionInterface* remote_description() const; 96 const SessionDescriptionInterface* remote_description() const override;
97 97
98 // JSEP01 98 // JSEP01
99 virtual void CreateOffer(CreateSessionDescriptionObserver* observer, 99 void CreateOffer(CreateSessionDescriptionObserver* observer,
100 const MediaConstraintsInterface* constraints); 100 const MediaConstraintsInterface* constraints) override;
101 virtual void CreateOffer(CreateSessionDescriptionObserver* observer, 101 void CreateOffer(CreateSessionDescriptionObserver* observer,
102 const RTCOfferAnswerOptions& options); 102 const RTCOfferAnswerOptions& options) override;
103 virtual void CreateAnswer(CreateSessionDescriptionObserver* observer, 103 void CreateAnswer(CreateSessionDescriptionObserver* observer,
104 const MediaConstraintsInterface* constraints); 104 const MediaConstraintsInterface* constraints) override;
105 virtual void SetLocalDescription(SetSessionDescriptionObserver* observer, 105 void SetLocalDescription(SetSessionDescriptionObserver* observer,
106 SessionDescriptionInterface* desc); 106 SessionDescriptionInterface* desc) override;
107 virtual void SetRemoteDescription(SetSessionDescriptionObserver* observer, 107 void SetRemoteDescription(SetSessionDescriptionObserver* observer,
108 SessionDescriptionInterface* desc); 108 SessionDescriptionInterface* desc) override;
109 // TODO(mallinath) : Deprecated version, remove after all clients are updated. 109 bool SetConfiguration(
110 virtual bool UpdateIce(const IceServers& configuration, 110 const PeerConnectionInterface::RTCConfiguration& config) override;
111 const MediaConstraintsInterface* constraints); 111 bool AddIceCandidate(const IceCandidateInterface* candidate) override;
112 virtual bool UpdateIce(
113 const PeerConnectionInterface::RTCConfiguration& config);
114 virtual bool AddIceCandidate(const IceCandidateInterface* candidate);
115 112
116 virtual void RegisterUMAObserver(UMAObserver* observer); 113 void RegisterUMAObserver(UMAObserver* observer) override;
117 114
118 virtual void Close(); 115 void Close() override;
119 116
120 protected: 117 protected:
121 virtual ~PeerConnection(); 118 ~PeerConnection() override;
122 119
123 private: 120 private:
124 // Implements MessageHandler. 121 // Implements MessageHandler.
125 virtual void OnMessage(rtc::Message* msg); 122 void OnMessage(rtc::Message* msg) override;
126 123
127 // Implements MediaStreamSignalingObserver. 124 // Implements MediaStreamSignalingObserver.
128 void OnAddRemoteStream(MediaStreamInterface* stream) override; 125 void OnAddRemoteStream(MediaStreamInterface* stream) override;
129 void OnRemoveRemoteStream(MediaStreamInterface* stream) override; 126 void OnRemoveRemoteStream(MediaStreamInterface* stream) override;
130 void OnAddDataChannel(DataChannelInterface* data_channel) override; 127 void OnAddDataChannel(DataChannelInterface* data_channel) override;
131 void OnAddRemoteAudioTrack(MediaStreamInterface* stream, 128 void OnAddRemoteAudioTrack(MediaStreamInterface* stream,
132 AudioTrackInterface* audio_track, 129 AudioTrackInterface* audio_track,
133 uint32 ssrc) override; 130 uint32 ssrc) override;
134 void OnAddRemoteVideoTrack(MediaStreamInterface* stream, 131 void OnAddRemoteVideoTrack(MediaStreamInterface* stream,
135 VideoTrackInterface* video_track, 132 VideoTrackInterface* video_track,
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_; 196 rtc::scoped_ptr<MediaStreamSignaling> mediastream_signaling_;
200 rtc::scoped_ptr<StatsCollector> stats_; 197 rtc::scoped_ptr<StatsCollector> stats_;
201 198
202 std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders_; 199 std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders_;
203 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> receivers_; 200 std::vector<rtc::scoped_refptr<RtpReceiverInterface>> receivers_;
204 }; 201 };
205 202
206 } // namespace webrtc 203 } // namespace webrtc
207 204
208 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_ 205 #endif // TALK_APP_WEBRTC_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/objc/public/RTCPeerConnection.h ('k') | talk/app/webrtc/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698