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

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

Issue 1842093002: Add the last_sent_packet_id to the candidate pair change signal (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Merge with head Created 4 years, 8 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/channel.h ('k') | webrtc/pc/channel_unittest.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 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 // cover other scenarios like the whole channel is writable (not just this 502 // cover other scenarios like the whole channel is writable (not just this
503 // TransportChannel) or when TransportChannel is attached after DTLS is 503 // TransportChannel) or when TransportChannel is attached after DTLS is
504 // negotiated. 504 // negotiated.
505 if (state != DTLS_TRANSPORT_CONNECTED) { 505 if (state != DTLS_TRANSPORT_CONNECTED) {
506 srtp_filter_.ResetParams(); 506 srtp_filter_.ResetParams();
507 } 507 }
508 } 508 }
509 509
510 void BaseChannel::OnSelectedCandidatePairChanged( 510 void BaseChannel::OnSelectedCandidatePairChanged(
511 TransportChannel* channel, 511 TransportChannel* channel,
512 CandidatePairInterface* selected_candidate_pair) { 512 CandidatePairInterface* selected_candidate_pair,
513 int last_sent_packet_id) {
513 ASSERT(channel == transport_channel_ || channel == rtcp_transport_channel_); 514 ASSERT(channel == transport_channel_ || channel == rtcp_transport_channel_);
514 NetworkRoute network_route; 515 NetworkRoute network_route;
515 if (selected_candidate_pair) { 516 if (selected_candidate_pair) {
516 network_route = 517 network_route =
517 NetworkRoute(selected_candidate_pair->local_candidate().network_id(), 518 NetworkRoute(selected_candidate_pair->local_candidate().network_id(),
518 selected_candidate_pair->remote_candidate().network_id()); 519 selected_candidate_pair->remote_candidate().network_id(),
520 last_sent_packet_id);
519 } 521 }
520 media_channel()->OnNetworkRouteChanged(channel->transport_name(), 522 media_channel()->OnNetworkRouteChanged(channel->transport_name(),
521 network_route); 523 network_route);
522 } 524 }
523 525
524 void BaseChannel::SetReadyToSend(bool rtcp, bool ready) { 526 void BaseChannel::SetReadyToSend(bool rtcp, bool ready) {
525 if (rtcp) { 527 if (rtcp) {
526 rtcp_ready_to_send_ = ready; 528 rtcp_ready_to_send_ = ready;
527 } else { 529 } else {
528 rtp_ready_to_send_ = ready; 530 rtp_ready_to_send_ = ready;
(...skipping 1674 matching lines...) Expand 10 before | Expand all | Expand 10 after
2203 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp(); 2205 return (data_channel_type_ == DCT_RTP) && BaseChannel::ShouldSetupDtlsSrtp();
2204 } 2206 }
2205 2207
2206 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { 2208 void DataChannel::OnStreamClosedRemotely(uint32_t sid) {
2207 rtc::TypedMessageData<uint32_t>* message = 2209 rtc::TypedMessageData<uint32_t>* message =
2208 new rtc::TypedMessageData<uint32_t>(sid); 2210 new rtc::TypedMessageData<uint32_t>(sid);
2209 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message); 2211 signaling_thread()->Post(this, MSG_STREAMCLOSEDREMOTELY, message);
2210 } 2212 }
2211 2213
2212 } // namespace cricket 2214 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/pc/channel.h ('k') | webrtc/pc/channel_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698