OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
171 VideoCodec red_codec = {}; | 171 VideoCodec red_codec = {}; |
172 red_codec.codecType = kVideoCodecRED; | 172 red_codec.codecType = kVideoCodecRED; |
173 strncpy(red_codec.plName, "red", sizeof(red_codec.plName)); | 173 strncpy(red_codec.plName, "red", sizeof(red_codec.plName)); |
174 red_codec.plType = config_.rtp.ulpfec.red_payload_type; | 174 red_codec.plType = config_.rtp.ulpfec.red_payload_type; |
175 RTC_CHECK(SetReceiveCodec(red_codec)); | 175 RTC_CHECK(SetReceiveCodec(red_codec)); |
176 if (config_.rtp.ulpfec.red_rtx_payload_type != -1) { | 176 if (config_.rtp.ulpfec.red_rtx_payload_type != -1) { |
177 rtp_payload_registry_.SetRtxPayloadType( | 177 rtp_payload_registry_.SetRtxPayloadType( |
178 config_.rtp.ulpfec.red_rtx_payload_type, | 178 config_.rtp.ulpfec.red_rtx_payload_type, |
179 config_.rtp.ulpfec.red_payload_type); | 179 config_.rtp.ulpfec.red_payload_type); |
180 } | 180 } |
181 | 181 // TODO(brandtr): Investigate whether the call below can be removed. |
stefan-webrtc
2016/10/31 09:41:02
Could you comment on why it might be possible to r
brandtr
2016/10/31 12:05:17
Done.
| |
182 rtp_rtcp_->SetUlpfecConfig(true, config_.rtp.ulpfec.red_payload_type, | 182 rtp_rtcp_->SetUlpfecConfig(config_.rtp.ulpfec.red_payload_type, |
183 config_.rtp.ulpfec.ulpfec_payload_type); | 183 config_.rtp.ulpfec.ulpfec_payload_type); |
184 } | 184 } |
185 | 185 |
186 if (config_.rtp.rtcp_xr.receiver_reference_time_report) | 186 if (config_.rtp.rtcp_xr.receiver_reference_time_report) |
187 rtp_rtcp_->SetRtcpXrRrtrStatus(true); | 187 rtp_rtcp_->SetRtcpXrRrtrStatus(true); |
188 | 188 |
189 // Stats callback for CNAME changes. | 189 // Stats callback for CNAME changes. |
190 rtp_rtcp_->RegisterRtcpStatisticsCallback(receive_stats_proxy); | 190 rtp_rtcp_->RegisterRtcpStatisticsCallback(receive_stats_proxy); |
191 | 191 |
192 process_thread_->RegisterModule(rtp_rtcp_.get()); | 192 process_thread_->RegisterModule(rtp_rtcp_.get()); |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
536 const std::string& extension, int id) { | 536 const std::string& extension, int id) { |
537 // One-byte-extension local identifiers are in the range 1-14 inclusive. | 537 // One-byte-extension local identifiers are in the range 1-14 inclusive. |
538 RTC_DCHECK_GE(id, 1); | 538 RTC_DCHECK_GE(id, 1); |
539 RTC_DCHECK_LE(id, 14); | 539 RTC_DCHECK_LE(id, 14); |
540 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); | 540 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); |
541 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( | 541 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( |
542 StringToRtpExtensionType(extension), id)); | 542 StringToRtpExtensionType(extension), id)); |
543 } | 543 } |
544 | 544 |
545 } // namespace webrtc | 545 } // namespace webrtc |
OLD | NEW |