OLD | NEW |
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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
173 const uint8_t* packet, | 173 const uint8_t* packet, |
174 size_t length, | 174 size_t length, |
175 const PacketTime& packet_time) override; | 175 const PacketTime& packet_time) override; |
176 | 176 |
177 // Implements RecoveredPacketReceiver. | 177 // Implements RecoveredPacketReceiver. |
178 bool OnRecoveredPacket(const uint8_t* packet, size_t length) override; | 178 bool OnRecoveredPacket(const uint8_t* packet, size_t length) override; |
179 | 179 |
180 void SetBitrateConfig( | 180 void SetBitrateConfig( |
181 const webrtc::Call::Config::BitrateConfig& bitrate_config) override; | 181 const webrtc::Call::Config::BitrateConfig& bitrate_config) override; |
182 | 182 |
| 183 void UpdateBitrateConfig( |
| 184 const webrtc::Call::Config::BitrateConfigMask& bitrate_config) override; |
| 185 |
183 void SignalChannelNetworkState(MediaType media, NetworkState state) override; | 186 void SignalChannelNetworkState(MediaType media, NetworkState state) override; |
184 | 187 |
185 void OnTransportOverheadChanged(MediaType media, | 188 void OnTransportOverheadChanged(MediaType media, |
186 int transport_overhead_per_packet) override; | 189 int transport_overhead_per_packet) override; |
187 | 190 |
188 void OnNetworkRouteChanged(const std::string& transport_name, | 191 void OnNetworkRouteChanged(const std::string& transport_name, |
189 const rtc::NetworkRoute& network_route) override; | 192 const rtc::NetworkRoute& network_route) override; |
190 | 193 |
191 void OnSentPacket(const rtc::SentPacket& sent_packet) override; | 194 void OnSentPacket(const rtc::SentPacket& sent_packet) override; |
192 | 195 |
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
915 // no point in remembering for the future. | 918 // no point in remembering for the future. |
916 if (bitrate_config.start_bitrate_bps > 0) | 919 if (bitrate_config.start_bitrate_bps > 0) |
917 config_.bitrate_config.start_bitrate_bps = bitrate_config.start_bitrate_bps; | 920 config_.bitrate_config.start_bitrate_bps = bitrate_config.start_bitrate_bps; |
918 config_.bitrate_config.max_bitrate_bps = bitrate_config.max_bitrate_bps; | 921 config_.bitrate_config.max_bitrate_bps = bitrate_config.max_bitrate_bps; |
919 RTC_DCHECK_NE(bitrate_config.start_bitrate_bps, 0); | 922 RTC_DCHECK_NE(bitrate_config.start_bitrate_bps, 0); |
920 transport_send_->send_side_cc()->SetBweBitrates( | 923 transport_send_->send_side_cc()->SetBweBitrates( |
921 bitrate_config.min_bitrate_bps, bitrate_config.start_bitrate_bps, | 924 bitrate_config.min_bitrate_bps, bitrate_config.start_bitrate_bps, |
922 bitrate_config.max_bitrate_bps); | 925 bitrate_config.max_bitrate_bps); |
923 } | 926 } |
924 | 927 |
| 928 void Call::UpdateBitrateConfig( |
| 929 const webrtc::Call::Config::BitrateConfigMask& mask) { |
| 930 TRACE_EVENT0("webrtc", "Call::UpdateBitrateConfig"); |
| 931 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); |
| 932 |
| 933 const Config::BitrateConfig& current_config = config_.bitrate_config; |
| 934 Config::BitrateConfig new_config; |
| 935 new_config.min_bitrate_bps = |
| 936 mask.min_bitrate_bps.value_or(current_config.min_bitrate_bps); |
| 937 new_config.start_bitrate_bps = |
| 938 mask.start_bitrate_bps.value_or(current_config.start_bitrate_bps); |
| 939 new_config.max_bitrate_bps = |
| 940 mask.max_bitrate_bps.value_or(current_config.max_bitrate_bps); |
| 941 |
| 942 SetBitrateConfig(new_config); |
| 943 } |
| 944 |
925 void Call::SignalChannelNetworkState(MediaType media, NetworkState state) { | 945 void Call::SignalChannelNetworkState(MediaType media, NetworkState state) { |
926 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); | 946 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); |
927 switch (media) { | 947 switch (media) { |
928 case MediaType::AUDIO: | 948 case MediaType::AUDIO: |
929 audio_network_state_ = state; | 949 audio_network_state_ = state; |
930 break; | 950 break; |
931 case MediaType::VIDEO: | 951 case MediaType::VIDEO: |
932 video_network_state_ = state; | 952 video_network_state_ = state; |
933 break; | 953 break; |
934 case MediaType::ANY: | 954 case MediaType::ANY: |
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1325 (use_send_side_bwe && header.extension.hasTransportSequenceNumber)) { | 1345 (use_send_side_bwe && header.extension.hasTransportSequenceNumber)) { |
1326 receive_side_cc_.OnReceivedPacket( | 1346 receive_side_cc_.OnReceivedPacket( |
1327 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(), | 1347 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(), |
1328 header); | 1348 header); |
1329 } | 1349 } |
1330 } | 1350 } |
1331 | 1351 |
1332 } // namespace internal | 1352 } // namespace internal |
1333 | 1353 |
1334 } // namespace webrtc | 1354 } // namespace webrtc |
OLD | NEW |