OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 2169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2180 decoder.codec_params = recv_codec.codec.params; | 2180 decoder.codec_params = recv_codec.codec.params; |
2181 config_.decoders.push_back(decoder); | 2181 config_.decoders.push_back(decoder); |
2182 config_.rtp.rtx_associated_payload_types[recv_codec.rtx_payload_type] = | 2182 config_.rtp.rtx_associated_payload_types[recv_codec.rtx_payload_type] = |
2183 recv_codec.codec.id; | 2183 recv_codec.codec.id; |
2184 } | 2184 } |
2185 | 2185 |
2186 config_.rtp.ulpfec = recv_codecs.front().ulpfec; | 2186 config_.rtp.ulpfec = recv_codecs.front().ulpfec; |
2187 | 2187 |
2188 config_.rtp.nack.rtp_history_ms = | 2188 config_.rtp.nack.rtp_history_ms = |
2189 HasNack(recv_codecs.begin()->codec) ? kNackHistoryMs : 0; | 2189 HasNack(recv_codecs.begin()->codec) ? kNackHistoryMs : 0; |
| 2190 if (config_.rtp.ulpfec.red_rtx_payload_type != -1) { |
| 2191 config_.rtp |
| 2192 .rtx_associated_payload_types[config_.rtp.ulpfec.red_rtx_payload_type] = |
| 2193 config_.rtp.ulpfec.red_payload_type; |
| 2194 } |
2190 } | 2195 } |
2191 | 2196 |
2192 void WebRtcVideoChannel::WebRtcVideoReceiveStream::ConfigureFlexfecCodec( | 2197 void WebRtcVideoChannel::WebRtcVideoReceiveStream::ConfigureFlexfecCodec( |
2193 int flexfec_payload_type) { | 2198 int flexfec_payload_type) { |
2194 flexfec_config_.payload_type = flexfec_payload_type; | 2199 flexfec_config_.payload_type = flexfec_payload_type; |
2195 } | 2200 } |
2196 | 2201 |
2197 void WebRtcVideoChannel::WebRtcVideoReceiveStream::SetLocalSsrc( | 2202 void WebRtcVideoChannel::WebRtcVideoReceiveStream::SetLocalSsrc( |
2198 uint32_t local_ssrc) { | 2203 uint32_t local_ssrc) { |
2199 // TODO(pbos): Consider turning this sanity check into a RTC_DCHECK. You | 2204 // TODO(pbos): Consider turning this sanity check into a RTC_DCHECK. You |
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2607 stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() - | 2612 stream.temporal_layer_thresholds_bps.resize(GetDefaultVp9TemporalLayers() - |
2608 1); | 2613 1); |
2609 } | 2614 } |
2610 | 2615 |
2611 std::vector<webrtc::VideoStream> streams; | 2616 std::vector<webrtc::VideoStream> streams; |
2612 streams.push_back(stream); | 2617 streams.push_back(stream); |
2613 return streams; | 2618 return streams; |
2614 } | 2619 } |
2615 | 2620 |
2616 } // namespace cricket | 2621 } // namespace cricket |
OLD | NEW |