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

Side by Side Diff: webrtc/api/peerconnection.h

Issue 2099843003: Revert of Use VoiceChannel/VideoChannel directly from RtpSender/RtpReceiver. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 5 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 | « webrtc/api/mediastreamprovider.h ('k') | webrtc/api/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 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 // Implements MessageHandler. 167 // Implements MessageHandler.
168 void OnMessage(rtc::Message* msg) override; 168 void OnMessage(rtc::Message* msg) override;
169 169
170 void CreateAudioReceiver(MediaStreamInterface* stream, 170 void CreateAudioReceiver(MediaStreamInterface* stream,
171 const std::string& track_id, 171 const std::string& track_id,
172 uint32_t ssrc); 172 uint32_t ssrc);
173 173
174 void CreateVideoReceiver(MediaStreamInterface* stream, 174 void CreateVideoReceiver(MediaStreamInterface* stream,
175 const std::string& track_id, 175 const std::string& track_id,
176 uint32_t ssrc); 176 uint32_t ssrc);
177 void StopReceivers(cricket::MediaType media_type);
177 void DestroyReceiver(const std::string& track_id); 178 void DestroyReceiver(const std::string& track_id);
178 void DestroyAudioSender(MediaStreamInterface* stream, 179 void DestroyAudioSender(MediaStreamInterface* stream,
179 AudioTrackInterface* audio_track, 180 AudioTrackInterface* audio_track,
180 uint32_t ssrc); 181 uint32_t ssrc);
181 void DestroyVideoSender(MediaStreamInterface* stream, 182 void DestroyVideoSender(MediaStreamInterface* stream,
182 VideoTrackInterface* video_track); 183 VideoTrackInterface* video_track);
183 184
184 // Implements IceObserver 185 // Implements IceObserver
185 void OnIceConnectionChange(IceConnectionState new_state) override; 186 void OnIceConnectionChange(IceConnectionState new_state) override;
186 void OnIceGatheringChange(IceGatheringState new_state) override; 187 void OnIceGatheringChange(IceGatheringState new_state) override;
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 const std::string& label, 318 const std::string& label,
318 const InternalDataChannelInit* config); 319 const InternalDataChannelInit* config);
319 320
320 // Checks if any data channel has been added. 321 // Checks if any data channel has been added.
321 bool HasDataChannels() const; 322 bool HasDataChannels() const;
322 323
323 void AllocateSctpSids(rtc::SSLRole role); 324 void AllocateSctpSids(rtc::SSLRole role);
324 void OnSctpDataChannelClosed(DataChannel* channel); 325 void OnSctpDataChannelClosed(DataChannel* channel);
325 326
326 // Notifications from WebRtcSession relating to BaseChannels. 327 // Notifications from WebRtcSession relating to BaseChannels.
327 void OnVoiceChannelCreated();
328 void OnVoiceChannelDestroyed(); 328 void OnVoiceChannelDestroyed();
329 void OnVideoChannelCreated();
330 void OnVideoChannelDestroyed(); 329 void OnVideoChannelDestroyed();
331 void OnDataChannelCreated(); 330 void OnDataChannelCreated();
332 void OnDataChannelDestroyed(); 331 void OnDataChannelDestroyed();
333 // Called when the cricket::DataChannel receives a message indicating that a 332 // Called when the cricket::DataChannel receives a message indicating that a
334 // webrtc::DataChannel should be opened. 333 // webrtc::DataChannel should be opened.
335 void OnDataChannelOpenMessage(const std::string& label, 334 void OnDataChannelOpenMessage(const std::string& label,
336 const InternalDataChannelInit& config); 335 const InternalDataChannelInit& config);
337 336
338 RtpSenderInternal* FindSenderById(const std::string& id); 337 RtpSenderInternal* FindSenderById(const std::string& id);
339 338
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>> 408 rtc::scoped_refptr<RtpReceiverProxyWithInternal<RtpReceiverInternal>>>
410 receivers_; 409 receivers_;
411 410
412 std::unique_ptr<WebRtcSession> session_; 411 std::unique_ptr<WebRtcSession> session_;
413 std::unique_ptr<StatsCollector> stats_; 412 std::unique_ptr<StatsCollector> stats_;
414 }; 413 };
415 414
416 } // namespace webrtc 415 } // namespace webrtc
417 416
418 #endif // WEBRTC_API_PEERCONNECTION_H_ 417 #endif // WEBRTC_API_PEERCONNECTION_H_
OLDNEW
« no previous file with comments | « webrtc/api/mediastreamprovider.h ('k') | webrtc/api/peerconnection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698