OLD | NEW |
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 12 matching lines...) Expand all Loading... |
23 #include "webrtc/base/asyncudpsocket.h" | 23 #include "webrtc/base/asyncudpsocket.h" |
24 #include "webrtc/base/criticalsection.h" | 24 #include "webrtc/base/criticalsection.h" |
25 #include "webrtc/base/network.h" | 25 #include "webrtc/base/network.h" |
26 #include "webrtc/base/sigslot.h" | 26 #include "webrtc/base/sigslot.h" |
27 #include "webrtc/base/window.h" | 27 #include "webrtc/base/window.h" |
28 #include "webrtc/media/base/mediachannel.h" | 28 #include "webrtc/media/base/mediachannel.h" |
29 #include "webrtc/media/base/mediaengine.h" | 29 #include "webrtc/media/base/mediaengine.h" |
30 #include "webrtc/media/base/streamparams.h" | 30 #include "webrtc/media/base/streamparams.h" |
31 #include "webrtc/media/base/videosinkinterface.h" | 31 #include "webrtc/media/base/videosinkinterface.h" |
32 #include "webrtc/media/base/videosourceinterface.h" | 32 #include "webrtc/media/base/videosourceinterface.h" |
| 33 #include "webrtc/p2p/base/candidatepair.h" |
33 #include "webrtc/p2p/base/transportcontroller.h" | 34 #include "webrtc/p2p/base/transportcontroller.h" |
34 #include "webrtc/p2p/client/socketmonitor.h" | 35 #include "webrtc/p2p/client/socketmonitor.h" |
35 #include "webrtc/pc/audiomonitor.h" | 36 #include "webrtc/pc/audiomonitor.h" |
36 #include "webrtc/pc/bundlefilter.h" | 37 #include "webrtc/pc/bundlefilter.h" |
37 #include "webrtc/pc/mediamonitor.h" | 38 #include "webrtc/pc/mediamonitor.h" |
38 #include "webrtc/pc/mediasession.h" | 39 #include "webrtc/pc/mediasession.h" |
39 #include "webrtc/pc/rtcpmuxfilter.h" | 40 #include "webrtc/pc/rtcpmuxfilter.h" |
40 #include "webrtc/pc/srtpfilter.h" | 41 #include "webrtc/pc/srtpfilter.h" |
41 | 42 |
42 namespace webrtc { | 43 namespace webrtc { |
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 | 355 |
355 private: | 356 private: |
356 bool InitNetwork_n(const std::string* bundle_transport_name); | 357 bool InitNetwork_n(const std::string* bundle_transport_name); |
357 void DisconnectTransportChannels_n(); | 358 void DisconnectTransportChannels_n(); |
358 void DestroyTransportChannels_n(); | 359 void DestroyTransportChannels_n(); |
359 void SignalSentPacket_n(TransportChannel* channel, | 360 void SignalSentPacket_n(TransportChannel* channel, |
360 const rtc::SentPacket& sent_packet); | 361 const rtc::SentPacket& sent_packet); |
361 void SignalSentPacket_w(const rtc::SentPacket& sent_packet); | 362 void SignalSentPacket_w(const rtc::SentPacket& sent_packet); |
362 bool IsReadyToSendMedia_n() const; | 363 bool IsReadyToSendMedia_n() const; |
363 void CacheRtpAbsSendTimeHeaderExtension_n(int rtp_abs_sendtime_extn_id); | 364 void CacheRtpAbsSendTimeHeaderExtension_n(int rtp_abs_sendtime_extn_id); |
| 365 int GetTransportOverheadPerPacket(); |
364 | 366 |
365 rtc::Thread* const worker_thread_; | 367 rtc::Thread* const worker_thread_; |
366 rtc::Thread* const network_thread_; | 368 rtc::Thread* const network_thread_; |
367 rtc::AsyncInvoker invoker_; | 369 rtc::AsyncInvoker invoker_; |
368 | 370 |
369 const std::string content_name_; | 371 const std::string content_name_; |
370 std::unique_ptr<ConnectionMonitor> connection_monitor_; | 372 std::unique_ptr<ConnectionMonitor> connection_monitor_; |
371 | 373 |
372 // Transport related members that should be accessed from network thread. | 374 // Transport related members that should be accessed from network thread. |
373 TransportController* const transport_controller_; | 375 TransportController* const transport_controller_; |
(...skipping 23 matching lines...) Expand all Loading... |
397 // thread. | 399 // thread. |
398 MediaChannel* const media_channel_; | 400 MediaChannel* const media_channel_; |
399 // Currently the |enabled_| flag is accessed from the signaling thread as | 401 // Currently the |enabled_| flag is accessed from the signaling thread as |
400 // well, but it can be changed only when signaling thread does a synchronous | 402 // well, but it can be changed only when signaling thread does a synchronous |
401 // call to the worker thread, so it should be safe. | 403 // call to the worker thread, so it should be safe. |
402 bool enabled_ = false; | 404 bool enabled_ = false; |
403 std::vector<StreamParams> local_streams_; | 405 std::vector<StreamParams> local_streams_; |
404 std::vector<StreamParams> remote_streams_; | 406 std::vector<StreamParams> remote_streams_; |
405 MediaContentDirection local_content_direction_ = MD_INACTIVE; | 407 MediaContentDirection local_content_direction_ = MD_INACTIVE; |
406 MediaContentDirection remote_content_direction_ = MD_INACTIVE; | 408 MediaContentDirection remote_content_direction_ = MD_INACTIVE; |
| 409 rtc::Optional<CandidatePair> selected_candidate_pair_; |
407 }; | 410 }; |
408 | 411 |
409 // VoiceChannel is a specialization that adds support for early media, DTMF, | 412 // VoiceChannel is a specialization that adds support for early media, DTMF, |
410 // and input/output level monitoring. | 413 // and input/output level monitoring. |
411 class VoiceChannel : public BaseChannel { | 414 class VoiceChannel : public BaseChannel { |
412 public: | 415 public: |
413 VoiceChannel(rtc::Thread* worker_thread, | 416 VoiceChannel(rtc::Thread* worker_thread, |
414 rtc::Thread* network_thread, | 417 rtc::Thread* network_thread, |
415 MediaEngineInterface* media_engine, | 418 MediaEngineInterface* media_engine, |
416 VoiceMediaChannel* channel, | 419 VoiceMediaChannel* channel, |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
721 // SetSendParameters. | 724 // SetSendParameters. |
722 DataSendParameters last_send_params_; | 725 DataSendParameters last_send_params_; |
723 // Last DataRecvParameters sent down to the media_channel() via | 726 // Last DataRecvParameters sent down to the media_channel() via |
724 // SetRecvParameters. | 727 // SetRecvParameters. |
725 DataRecvParameters last_recv_params_; | 728 DataRecvParameters last_recv_params_; |
726 }; | 729 }; |
727 | 730 |
728 } // namespace cricket | 731 } // namespace cricket |
729 | 732 |
730 #endif // WEBRTC_PC_CHANNEL_H_ | 733 #endif // WEBRTC_PC_CHANNEL_H_ |
OLD | NEW |