| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 channel_proxy_->SetLocalSSRC(config.rtp.ssrc); | 68 channel_proxy_->SetLocalSSRC(config.rtp.ssrc); |
| 69 channel_proxy_->SetRTCP_CNAME(config.rtp.c_name); | 69 channel_proxy_->SetRTCP_CNAME(config.rtp.c_name); |
| 70 // TODO(solenberg): Config NACK history window (which is a packet count), | 70 // TODO(solenberg): Config NACK history window (which is a packet count), |
| 71 // using the actual packet size for the configured codec. | 71 // using the actual packet size for the configured codec. |
| 72 channel_proxy_->SetNACKStatus(config_.rtp.nack.rtp_history_ms != 0, | 72 channel_proxy_->SetNACKStatus(config_.rtp.nack.rtp_history_ms != 0, |
| 73 config_.rtp.nack.rtp_history_ms / 20); | 73 config_.rtp.nack.rtp_history_ms / 20); |
| 74 | 74 |
| 75 channel_proxy_->RegisterExternalTransport(config.send_transport); | 75 channel_proxy_->RegisterExternalTransport(config.send_transport); |
| 76 | 76 |
| 77 for (const auto& extension : config.rtp.extensions) { | 77 for (const auto& extension : config.rtp.extensions) { |
| 78 if (extension.uri == RtpExtension::kAbsSendTimeUri) { | 78 if (extension.uri == RtpExtension::kAudioLevelUri) { |
| 79 channel_proxy_->SetSendAbsoluteSenderTimeStatus(true, extension.id); | |
| 80 } else if (extension.uri == RtpExtension::kAudioLevelUri) { | |
| 81 channel_proxy_->SetSendAudioLevelIndicationStatus(true, extension.id); | 79 channel_proxy_->SetSendAudioLevelIndicationStatus(true, extension.id); |
| 82 } else if (extension.uri == RtpExtension::kTransportSequenceNumberUri) { | 80 } else if (extension.uri == RtpExtension::kTransportSequenceNumberUri) { |
| 83 channel_proxy_->EnableSendTransportSequenceNumber(extension.id); | 81 channel_proxy_->EnableSendTransportSequenceNumber(extension.id); |
| 84 } else { | 82 } else { |
| 85 RTC_NOTREACHED() << "Registering unsupported RTP extension."; | 83 RTC_NOTREACHED() << "Registering unsupported RTP extension."; |
| 86 } | 84 } |
| 87 } | 85 } |
| 88 if (!SetupSendCodec()) { | 86 if (!SetupSendCodec()) { |
| 89 LOG(LS_ERROR) << "Failed to set up send codec state."; | 87 LOG(LS_ERROR) << "Failed to set up send codec state."; |
| 90 } | 88 } |
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 LOG(LS_WARNING) << "SetVADStatus() failed: " << base->LastError(); | 383 LOG(LS_WARNING) << "SetVADStatus() failed: " << base->LastError(); |
| 386 return false; | 384 return false; |
| 387 } | 385 } |
| 388 } | 386 } |
| 389 } | 387 } |
| 390 return true; | 388 return true; |
| 391 } | 389 } |
| 392 | 390 |
| 393 } // namespace internal | 391 } // namespace internal |
| 394 } // namespace webrtc | 392 } // namespace webrtc |
| OLD | NEW |