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