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

Side by Side Diff: webrtc/call/call.cc

Issue 2098703004: Revert of Revert "Revert of Update the BWE when the network route changes. (patchset #5 id:180001 of https://… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 4 years, 5 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/base/networkroute.h ('k') | webrtc/modules/bitrate_controller/bitrate_controller_impl.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 (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 auto kv = result.first; 629 auto kv = result.first;
630 bool inserted = result.second; 630 bool inserted = result.second;
631 if (inserted) { 631 if (inserted) {
632 // No need to reset BWE if this is the first time the network connects. 632 // No need to reset BWE if this is the first time the network connects.
633 return; 633 return;
634 } 634 }
635 if (kv->second != network_route) { 635 if (kv->second != network_route) {
636 kv->second = network_route; 636 kv->second = network_route;
637 LOG(LS_INFO) << "Network route changed on transport " << transport_name 637 LOG(LS_INFO) << "Network route changed on transport " << transport_name
638 << ": new local network id " << network_route.local_network_id 638 << ": new local network id " << network_route.local_network_id
639 << " new remote network id " << network_route.remote_network_id 639 << " new remote network id "
640 << " Reset bitrate to " 640 << network_route.remote_network_id;
641 << config_.bitrate_config.start_bitrate_bps << "bps"; 641 // TODO(holmer): Update the BWE bitrates.
642 congestion_controller_->ResetBweAndBitrates(
643 config_.bitrate_config.start_bitrate_bps,
644 config_.bitrate_config.min_bitrate_bps,
645 config_.bitrate_config.max_bitrate_bps);
646 } 642 }
647 } 643 }
648 644
649 void Call::UpdateAggregateNetworkState() { 645 void Call::UpdateAggregateNetworkState() {
650 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); 646 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread());
651 647
652 bool have_audio = false; 648 bool have_audio = false;
653 bool have_video = false; 649 bool have_video = false;
654 { 650 {
655 ReadLockScoped read_lock(*send_crit_); 651 ReadLockScoped read_lock(*send_crit_);
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 // thread. Then this check can be enabled. 853 // thread. Then this check can be enabled.
858 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); 854 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread());
859 if (RtpHeaderParser::IsRtcp(packet, length)) 855 if (RtpHeaderParser::IsRtcp(packet, length))
860 return DeliverRtcp(media_type, packet, length); 856 return DeliverRtcp(media_type, packet, length);
861 857
862 return DeliverRtp(media_type, packet, length, packet_time); 858 return DeliverRtp(media_type, packet, length, packet_time);
863 } 859 }
864 860
865 } // namespace internal 861 } // namespace internal
866 } // namespace webrtc 862 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/base/networkroute.h ('k') | webrtc/modules/bitrate_controller/bitrate_controller_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698