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

Side by Side Diff: webrtc/pc/channel.h

Issue 2981013002: Introduce RtpTransportInternal and SrtpTransport. (Closed)
Patch Set: Depend on test:test_support for gmock. Created 3 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/pc/BUILD.gn ('k') | webrtc/pc/channel.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 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 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 15 matching lines...) Expand all
26 #include "webrtc/media/base/videosinkinterface.h" 26 #include "webrtc/media/base/videosinkinterface.h"
27 #include "webrtc/media/base/videosourceinterface.h" 27 #include "webrtc/media/base/videosourceinterface.h"
28 #include "webrtc/p2p/base/dtlstransportinternal.h" 28 #include "webrtc/p2p/base/dtlstransportinternal.h"
29 #include "webrtc/p2p/base/packettransportinternal.h" 29 #include "webrtc/p2p/base/packettransportinternal.h"
30 #include "webrtc/p2p/base/transportcontroller.h" 30 #include "webrtc/p2p/base/transportcontroller.h"
31 #include "webrtc/p2p/client/socketmonitor.h" 31 #include "webrtc/p2p/client/socketmonitor.h"
32 #include "webrtc/pc/audiomonitor.h" 32 #include "webrtc/pc/audiomonitor.h"
33 #include "webrtc/pc/mediamonitor.h" 33 #include "webrtc/pc/mediamonitor.h"
34 #include "webrtc/pc/mediasession.h" 34 #include "webrtc/pc/mediasession.h"
35 #include "webrtc/pc/rtcpmuxfilter.h" 35 #include "webrtc/pc/rtcpmuxfilter.h"
36 #include "webrtc/pc/rtptransport.h" 36 #include "webrtc/pc/rtptransportinternal.h"
37 #include "webrtc/pc/srtpfilter.h" 37 #include "webrtc/pc/srtpfilter.h"
38 #include "webrtc/rtc_base/asyncinvoker.h" 38 #include "webrtc/rtc_base/asyncinvoker.h"
39 #include "webrtc/rtc_base/asyncudpsocket.h" 39 #include "webrtc/rtc_base/asyncudpsocket.h"
40 #include "webrtc/rtc_base/criticalsection.h" 40 #include "webrtc/rtc_base/criticalsection.h"
41 #include "webrtc/rtc_base/network.h" 41 #include "webrtc/rtc_base/network.h"
42 #include "webrtc/rtc_base/sigslot.h" 42 #include "webrtc/rtc_base/sigslot.h"
43 #include "webrtc/rtc_base/window.h" 43 #include "webrtc/rtc_base/window.h"
44 44
45 namespace webrtc { 45 namespace webrtc {
46 class AudioSinkInterface; 46 class AudioSinkInterface;
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 // Won't be set when using raw packet transports. SDP-specific thing. 390 // Won't be set when using raw packet transports. SDP-specific thing.
391 std::string transport_name_; 391 std::string transport_name_;
392 392
393 const bool rtcp_mux_required_; 393 const bool rtcp_mux_required_;
394 394
395 // Separate DTLS/non-DTLS pointers to support using BaseChannel without DTLS. 395 // Separate DTLS/non-DTLS pointers to support using BaseChannel without DTLS.
396 // Temporary measure until more refactoring is done. 396 // Temporary measure until more refactoring is done.
397 // If non-null, "X_dtls_transport_" will always equal "X_packet_transport_". 397 // If non-null, "X_dtls_transport_" will always equal "X_packet_transport_".
398 DtlsTransportInternal* rtp_dtls_transport_ = nullptr; 398 DtlsTransportInternal* rtp_dtls_transport_ = nullptr;
399 DtlsTransportInternal* rtcp_dtls_transport_ = nullptr; 399 DtlsTransportInternal* rtcp_dtls_transport_ = nullptr;
400 std::unique_ptr<webrtc::RtpTransport> rtp_transport_; 400 std::unique_ptr<webrtc::RtpTransportInternal> rtp_transport_;
401 std::vector<std::pair<rtc::Socket::Option, int> > socket_options_; 401 std::vector<std::pair<rtc::Socket::Option, int> > socket_options_;
402 std::vector<std::pair<rtc::Socket::Option, int> > rtcp_socket_options_; 402 std::vector<std::pair<rtc::Socket::Option, int> > rtcp_socket_options_;
403 SrtpFilter srtp_filter_; 403 SrtpFilter srtp_filter_;
404 RtcpMuxFilter rtcp_mux_filter_; 404 RtcpMuxFilter rtcp_mux_filter_;
405 bool writable_ = false; 405 bool writable_ = false;
406 bool was_ever_writable_ = false; 406 bool was_ever_writable_ = false;
407 bool has_received_packet_ = false; 407 bool has_received_packet_ = false;
408 bool dtls_keyed_ = false; 408 bool dtls_keyed_ = false;
409 const bool srtp_required_ = true; 409 const bool srtp_required_ = true;
410 int rtp_abs_sendtime_extn_id_ = -1; 410 int rtp_abs_sendtime_extn_id_ = -1;
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 // SetSendParameters. 728 // SetSendParameters.
729 DataSendParameters last_send_params_; 729 DataSendParameters last_send_params_;
730 // Last DataRecvParameters sent down to the media_channel() via 730 // Last DataRecvParameters sent down to the media_channel() via
731 // SetRecvParameters. 731 // SetRecvParameters.
732 DataRecvParameters last_recv_params_; 732 DataRecvParameters last_recv_params_;
733 }; 733 };
734 734
735 } // namespace cricket 735 } // namespace cricket
736 736
737 #endif // WEBRTC_PC_CHANNEL_H_ 737 #endif // WEBRTC_PC_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/pc/BUILD.gn ('k') | webrtc/pc/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698