| 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 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 601 void BaseChannel::OnSelectedCandidatePairChanged( | 601 void BaseChannel::OnSelectedCandidatePairChanged( |
| 602 TransportChannel* channel, | 602 TransportChannel* channel, |
| 603 CandidatePairInterface* selected_candidate_pair, | 603 CandidatePairInterface* selected_candidate_pair, |
| 604 int last_sent_packet_id) { | 604 int last_sent_packet_id) { |
| 605 ASSERT(channel == transport_channel_ || channel == rtcp_transport_channel_); | 605 ASSERT(channel == transport_channel_ || channel == rtcp_transport_channel_); |
| 606 RTC_DCHECK(network_thread_->IsCurrent()); | 606 RTC_DCHECK(network_thread_->IsCurrent()); |
| 607 std::string transport_name = channel->transport_name(); | 607 std::string transport_name = channel->transport_name(); |
| 608 rtc::NetworkRoute network_route; | 608 rtc::NetworkRoute network_route; |
| 609 if (selected_candidate_pair) { | 609 if (selected_candidate_pair) { |
| 610 network_route = rtc::NetworkRoute( | 610 network_route = rtc::NetworkRoute( |
| 611 selected_candidate_pair->ReadyToSendMedia(), |
| 611 selected_candidate_pair->local_candidate().network_id(), | 612 selected_candidate_pair->local_candidate().network_id(), |
| 612 selected_candidate_pair->remote_candidate().network_id(), | 613 selected_candidate_pair->remote_candidate().network_id(), |
| 613 last_sent_packet_id); | 614 last_sent_packet_id); |
| 614 } | 615 } |
| 615 invoker_.AsyncInvoke<void>( | 616 invoker_.AsyncInvoke<void>( |
| 616 RTC_FROM_HERE, worker_thread_, | 617 RTC_FROM_HERE, worker_thread_, |
| 617 Bind(&MediaChannel::OnNetworkRouteChanged, media_channel_, transport_name, | 618 Bind(&MediaChannel::OnNetworkRouteChanged, media_channel_, transport_name, |
| 618 network_route)); | 619 network_route)); |
| 619 } | 620 } |
| 620 | 621 |
| (...skipping 1806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2427 } | 2428 } |
| 2428 | 2429 |
| 2429 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { | 2430 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { |
| 2430 rtc::TypedMessageData<uint32_t>* message = | 2431 rtc::TypedMessageData<uint32_t>* message = |
| 2431 new rtc::TypedMessageData<uint32_t>(sid); | 2432 new rtc::TypedMessageData<uint32_t>(sid); |
| 2432 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_STREAMCLOSEDREMOTELY, | 2433 signaling_thread()->Post(RTC_FROM_HERE, this, MSG_STREAMCLOSEDREMOTELY, |
| 2433 message); | 2434 message); |
| 2434 } | 2435 } |
| 2435 | 2436 |
| 2436 } // namespace cricket | 2437 } // namespace cricket |
| OLD | NEW |