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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 | 141 |
142 static const int kMaxPacketAgeToNack = 450; | 142 static const int kMaxPacketAgeToNack = 450; |
143 const int max_reordering_threshold = (config_.rtp.nack.rtp_history_ms > 0) | 143 const int max_reordering_threshold = (config_.rtp.nack.rtp_history_ms > 0) |
144 ? kMaxPacketAgeToNack | 144 ? kMaxPacketAgeToNack |
145 : kDefaultMaxReorderingThreshold; | 145 : kDefaultMaxReorderingThreshold; |
146 rtp_receive_statistics_->SetMaxReorderingThreshold(max_reordering_threshold); | 146 rtp_receive_statistics_->SetMaxReorderingThreshold(max_reordering_threshold); |
147 | 147 |
148 if (config_.rtp.rtx_ssrc) { | 148 if (config_.rtp.rtx_ssrc) { |
149 rtp_payload_registry_.SetRtxSsrc(config_.rtp.rtx_ssrc); | 149 rtp_payload_registry_.SetRtxSsrc(config_.rtp.rtx_ssrc); |
150 | 150 |
151 for (const auto& kv : config_.rtp.rtx_payload_types) { | 151 for (const auto& kv : config_.rtp.rtx_associated_payload_types) { |
152 RTC_DCHECK(kv.second != 0); | 152 RTC_DCHECK_NE(kv.first, 0); |
153 rtp_payload_registry_.SetRtxPayloadType(kv.second, kv.first); | 153 rtp_payload_registry_.SetRtxPayloadType(kv.first, kv.second); |
154 } | 154 } |
155 } | 155 } |
156 | 156 |
157 if (IsUlpfecEnabled()) { | 157 if (IsUlpfecEnabled()) { |
158 VideoCodec ulpfec_codec = {}; | 158 VideoCodec ulpfec_codec = {}; |
159 ulpfec_codec.codecType = kVideoCodecULPFEC; | 159 ulpfec_codec.codecType = kVideoCodecULPFEC; |
160 strncpy(ulpfec_codec.plName, "ulpfec", sizeof(ulpfec_codec.plName)); | 160 strncpy(ulpfec_codec.plName, "ulpfec", sizeof(ulpfec_codec.plName)); |
161 ulpfec_codec.plType = config_.rtp.ulpfec.ulpfec_payload_type; | 161 ulpfec_codec.plType = config_.rtp.ulpfec.ulpfec_payload_type; |
162 RTC_CHECK(AddReceiveCodec(ulpfec_codec)); | 162 RTC_CHECK(AddReceiveCodec(ulpfec_codec)); |
163 } | 163 } |
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
708 return; | 708 return; |
709 | 709 |
710 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str())) | 710 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str())) |
711 return; | 711 return; |
712 | 712 |
713 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(), | 713 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(), |
714 sprop_decoder.pps_nalu()); | 714 sprop_decoder.pps_nalu()); |
715 } | 715 } |
716 | 716 |
717 } // namespace webrtc | 717 } // namespace webrtc |
OLD | NEW |