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

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

Issue 2637503003: More minor improvements to BaseChannel/transport code. (Closed)
Patch Set: Merge with master Created 3 years, 11 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/rtcstatscollector_unittest.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 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 546
547 // Gather the usage of IPv4/IPv6 as best connection. 547 // Gather the usage of IPv4/IPv6 as best connection.
548 void ReportBestConnectionState(const cricket::TransportStats& stats); 548 void ReportBestConnectionState(const cricket::TransportStats& stats);
549 549
550 void ReportNegotiatedCiphers(const cricket::TransportStats& stats); 550 void ReportNegotiatedCiphers(const cricket::TransportStats& stats);
551 551
552 void OnSentPacket_w(const rtc::SentPacket& sent_packet); 552 void OnSentPacket_w(const rtc::SentPacket& sent_packet);
553 553
554 const std::string GetTransportName(const std::string& content_name); 554 const std::string GetTransportName(const std::string& content_name);
555 555
556 void DestroyTransport(const std::string& transport_name, int component);
557 void DestroyRtcpTransport_n(const std::string& transport_name); 556 void DestroyRtcpTransport_n(const std::string& transport_name);
558 void DestroyVideoChannel(); 557 void DestroyVideoChannel();
559 void DestroyVoiceChannel(); 558 void DestroyVoiceChannel();
560 void DestroyDataChannel(); 559 void DestroyDataChannel();
561 560
562 rtc::Thread* const network_thread_; 561 rtc::Thread* const network_thread_;
563 rtc::Thread* const worker_thread_; 562 rtc::Thread* const worker_thread_;
564 rtc::Thread* const signaling_thread_; 563 rtc::Thread* const signaling_thread_;
565 564
566 State state_ = STATE_INIT; 565 State state_ = STATE_INIT;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 645
647 #ifdef HAVE_QUIC 646 #ifdef HAVE_QUIC
648 std::unique_ptr<QuicDataTransport> quic_data_transport_; 647 std::unique_ptr<QuicDataTransport> quic_data_transport_;
649 #endif // HAVE_QUIC 648 #endif // HAVE_QUIC
650 649
651 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession); 650 RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
652 }; 651 };
653 } // namespace webrtc 652 } // namespace webrtc
654 653
655 #endif // WEBRTC_API_WEBRTCSESSION_H_ 654 #endif // WEBRTC_API_WEBRTCSESSION_H_
OLDNEW
« no previous file with comments | « webrtc/api/rtcstatscollector_unittest.cc ('k') | webrtc/api/webrtcsession.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698