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

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

Issue 1844803002: Modify PeerConnection for end-to-end QuicDataChannel usage (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Sync to upstream after landing QUIC data channel and QUIC transport CLs Created 4 years, 7 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/test/peerconnectiontestwrapper.cc ('k') | webrtc/api/webrtcsession.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 21 matching lines...) Expand all
32 #include "webrtc/pc/mediasession.h" 32 #include "webrtc/pc/mediasession.h"
33 33
34 namespace cricket { 34 namespace cricket {
35 35
36 class ChannelManager; 36 class ChannelManager;
37 class DataChannel; 37 class DataChannel;
38 class StatsReport; 38 class StatsReport;
39 class VideoChannel; 39 class VideoChannel;
40 class VoiceChannel; 40 class VoiceChannel;
41 41
42 #ifdef HAVE_QUIC
43 class QuicTransportChannel;
44 #endif // HAVE_QUIC
45
42 } // namespace cricket 46 } // namespace cricket
43 47
44 namespace webrtc { 48 namespace webrtc {
45 49
46 class IceRestartAnswerLatch; 50 class IceRestartAnswerLatch;
47 class JsepIceCandidate; 51 class JsepIceCandidate;
48 class MediaStreamSignaling; 52 class MediaStreamSignaling;
49 class WebRtcSessionDescriptionFactory; 53 class WebRtcSessionDescriptionFactory;
50 54
51 extern const char kBundleWithoutRtcpMux[]; 55 extern const char kBundleWithoutRtcpMux[];
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 sigslot::signal0<> SignalVideoChannelDestroyed; 329 sigslot::signal0<> SignalVideoChannelDestroyed;
326 sigslot::signal0<> SignalDataChannelCreated; 330 sigslot::signal0<> SignalDataChannelCreated;
327 sigslot::signal0<> SignalDataChannelDestroyed; 331 sigslot::signal0<> SignalDataChannelDestroyed;
328 // Called when the whole session is destroyed. 332 // Called when the whole session is destroyed.
329 sigslot::signal0<> SignalDestroyed; 333 sigslot::signal0<> SignalDestroyed;
330 334
331 // Called when a valid data channel OPEN message is received. 335 // Called when a valid data channel OPEN message is received.
332 // std::string represents the data channel label. 336 // std::string represents the data channel label.
333 sigslot::signal2<const std::string&, const InternalDataChannelInit&> 337 sigslot::signal2<const std::string&, const InternalDataChannelInit&>
334 SignalDataChannelOpenMessage; 338 SignalDataChannelOpenMessage;
339 #ifdef HAVE_QUIC
340 sigslot::signal1<cricket::QuicTransportChannel*>
341 SignalQuicTransportChannelCreated;
342 #endif // HAVE_QUIC
335 343
336 private: 344 private:
337 // Indicates the type of SessionDescription in a call to SetLocalDescription 345 // Indicates the type of SessionDescription in a call to SetLocalDescription
338 // and SetRemoteDescription. 346 // and SetRemoteDescription.
339 enum Action { 347 enum Action {
340 kOffer, 348 kOffer,
341 kPrAnswer, 349 kPrAnswer,
342 kAnswer, 350 kAnswer,
343 }; 351 };
344 352
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 cricket::AudioOptions audio_options_; 518 cricket::AudioOptions audio_options_;
511 cricket::VideoOptions video_options_; 519 cricket::VideoOptions video_options_;
512 MetricsObserverInterface* metrics_observer_; 520 MetricsObserverInterface* metrics_observer_;
513 521
514 // Declares the bundle policy for the WebRTCSession. 522 // Declares the bundle policy for the WebRTCSession.
515 PeerConnectionInterface::BundlePolicy bundle_policy_; 523 PeerConnectionInterface::BundlePolicy bundle_policy_;
516 524
517 // Declares the RTCP mux policy for the WebRTCSession. 525 // Declares the RTCP mux policy for the WebRTCSession.
518 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_; 526 PeerConnectionInterface::RtcpMuxPolicy rtcp_mux_policy_;
519 527
528 #ifdef HAVE_QUIC
529 cricket::QuicTransportChannel* quic_transport_channel_ = nullptr;
530 #endif // HAVE_QUIC
531
520 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 532 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
521 }; 533 };
522 } // namespace webrtc 534 } // namespace webrtc
523 535
524 #endif // WEBRTC_API_WEBRTCSESSION_H_ 536 #endif // WEBRTC_API_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « webrtc/api/test/peerconnectiontestwrapper.cc ('k') | webrtc/api/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698