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

Side by Side Diff: webrtc/api/rtcstatscollector.cc

Issue 2614813003: Revert of Separating SCTP code from BaseChannel/MediaChannel. (Closed)
Patch Set: Also reverting https://codereview.webrtc.org/2612963002 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/peerconnectioninterface_unittest.cc ('k') | webrtc/api/test/mock_webrtcsession.h » ('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 2016 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2016 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 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 if (pc_->session()->voice_channel()) { 456 if (pc_->session()->voice_channel()) {
457 channel_name_pairs_->voice = rtc::Optional<ChannelNamePair>( 457 channel_name_pairs_->voice = rtc::Optional<ChannelNamePair>(
458 ChannelNamePair(pc_->session()->voice_channel()->content_name(), 458 ChannelNamePair(pc_->session()->voice_channel()->content_name(),
459 pc_->session()->voice_channel()->transport_name())); 459 pc_->session()->voice_channel()->transport_name()));
460 } 460 }
461 if (pc_->session()->video_channel()) { 461 if (pc_->session()->video_channel()) {
462 channel_name_pairs_->video = rtc::Optional<ChannelNamePair>( 462 channel_name_pairs_->video = rtc::Optional<ChannelNamePair>(
463 ChannelNamePair(pc_->session()->video_channel()->content_name(), 463 ChannelNamePair(pc_->session()->video_channel()->content_name(),
464 pc_->session()->video_channel()->transport_name())); 464 pc_->session()->video_channel()->transport_name()));
465 } 465 }
466 if (pc_->session()->rtp_data_channel()) { 466 if (pc_->session()->data_channel()) {
467 channel_name_pairs_->data =
468 rtc::Optional<ChannelNamePair>(ChannelNamePair(
469 pc_->session()->rtp_data_channel()->content_name(),
470 pc_->session()->rtp_data_channel()->transport_name()));
471 }
472 if (pc_->session()->sctp_content_name()) {
473 channel_name_pairs_->data = rtc::Optional<ChannelNamePair>( 467 channel_name_pairs_->data = rtc::Optional<ChannelNamePair>(
474 ChannelNamePair(*pc_->session()->sctp_content_name(), 468 ChannelNamePair(pc_->session()->data_channel()->content_name(),
475 *pc_->session()->sctp_transport_name())); 469 pc_->session()->data_channel()->transport_name()));
476 } 470 }
477 media_info_.reset(PrepareMediaInfo_s().release()); 471 media_info_.reset(PrepareMediaInfo_s().release());
478 472
479 invoker_.AsyncInvoke<void>(RTC_FROM_HERE, network_thread_, 473 invoker_.AsyncInvoke<void>(RTC_FROM_HERE, network_thread_,
480 rtc::Bind(&RTCStatsCollector::ProducePartialResultsOnNetworkThread, 474 rtc::Bind(&RTCStatsCollector::ProducePartialResultsOnNetworkThread,
481 rtc::scoped_refptr<RTCStatsCollector>(this), timestamp_us)); 475 rtc::scoped_refptr<RTCStatsCollector>(this), timestamp_us));
482 ProducePartialResultsOnSignalingThread(timestamp_us); 476 ProducePartialResultsOnSignalingThread(timestamp_us);
483 } 477 }
484 } 478 }
485 479
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 const std::string& type) { 971 const std::string& type) {
978 return CandidateTypeToRTCIceCandidateType(type); 972 return CandidateTypeToRTCIceCandidateType(type);
979 } 973 }
980 974
981 const char* DataStateToRTCDataChannelStateForTesting( 975 const char* DataStateToRTCDataChannelStateForTesting(
982 DataChannelInterface::DataState state) { 976 DataChannelInterface::DataState state) {
983 return DataStateToRTCDataChannelState(state); 977 return DataStateToRTCDataChannelState(state);
984 } 978 }
985 979
986 } // namespace webrtc 980 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/peerconnectioninterface_unittest.cc ('k') | webrtc/api/test/mock_webrtcsession.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698