OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 const ExtensionIds old_ids = find_extension_ids(old_config.rtp.extensions); | 164 const ExtensionIds old_ids = find_extension_ids(old_config.rtp.extensions); |
165 const ExtensionIds new_ids = find_extension_ids(new_config.rtp.extensions); | 165 const ExtensionIds new_ids = find_extension_ids(new_config.rtp.extensions); |
166 // Audio level indication | 166 // Audio level indication |
167 if (first_time || new_ids.audio_level != old_ids.audio_level) { | 167 if (first_time || new_ids.audio_level != old_ids.audio_level) { |
168 channel_proxy->SetSendAudioLevelIndicationStatus(new_ids.audio_level != 0, | 168 channel_proxy->SetSendAudioLevelIndicationStatus(new_ids.audio_level != 0, |
169 new_ids.audio_level); | 169 new_ids.audio_level); |
170 } | 170 } |
171 // Transport sequence number | 171 // Transport sequence number |
172 if (first_time || | 172 if (first_time || |
173 new_ids.transport_sequence_number != old_ids.transport_sequence_number) { | 173 new_ids.transport_sequence_number != old_ids.transport_sequence_number) { |
174 if (old_ids.transport_sequence_number) { | 174 if (!first_time) { |
175 channel_proxy->ResetSenderCongestionControlObjects(); | 175 channel_proxy->ResetSenderCongestionControlObjects(); |
176 stream->bandwidth_observer_.reset(); | 176 stream->bandwidth_observer_.reset(); |
177 } | 177 } |
178 | 178 |
179 if (new_ids.transport_sequence_number != 0) { | 179 if (new_ids.transport_sequence_number != 0) { |
180 channel_proxy->EnableSendTransportSequenceNumber( | 180 channel_proxy->EnableSendTransportSequenceNumber( |
181 new_ids.transport_sequence_number); | 181 new_ids.transport_sequence_number); |
182 stream->transport_->send_side_cc()->EnablePeriodicAlrProbing(true); | 182 stream->transport_->send_side_cc()->EnablePeriodicAlrProbing(true); |
183 stream->bandwidth_observer_.reset(stream->transport_->send_side_cc() | 183 stream->bandwidth_observer_.reset(stream->transport_->send_side_cc() |
184 ->GetBitrateController() | 184 ->GetBitrateController() |
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
606 if (rtp_rtcp_module_->RegisterSendPayload(codec) != 0) { | 606 if (rtp_rtcp_module_->RegisterSendPayload(codec) != 0) { |
607 LOG(LS_ERROR) << "RegisterCngPayloadType() failed to register CN to " | 607 LOG(LS_ERROR) << "RegisterCngPayloadType() failed to register CN to " |
608 "RTP/RTCP module"; | 608 "RTP/RTCP module"; |
609 } | 609 } |
610 } | 610 } |
611 } | 611 } |
612 | 612 |
613 | 613 |
614 } // namespace internal | 614 } // namespace internal |
615 } // namespace webrtc | 615 } // namespace webrtc |
OLD | NEW |