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 2201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2212 // should not be able to create a sender with the same SSRC as a receiver, but | 2212 // should not be able to create a sender with the same SSRC as a receiver, but |
2213 // right now this can't be done due to unittests depending on receiving what | 2213 // right now this can't be done due to unittests depending on receiving what |
2214 // they are sending from the same MediaChannel. | 2214 // they are sending from the same MediaChannel. |
2215 if (local_ssrc == config_.rtp.remote_ssrc) { | 2215 if (local_ssrc == config_.rtp.remote_ssrc) { |
2216 LOG(LS_INFO) << "Ignoring call to SetLocalSsrc because parameters are " | 2216 LOG(LS_INFO) << "Ignoring call to SetLocalSsrc because parameters are " |
2217 "unchanged; local_ssrc=" << local_ssrc; | 2217 "unchanged; local_ssrc=" << local_ssrc; |
2218 return; | 2218 return; |
2219 } | 2219 } |
2220 | 2220 |
2221 config_.rtp.local_ssrc = local_ssrc; | 2221 config_.rtp.local_ssrc = local_ssrc; |
| 2222 flexfec_config_.local_ssrc = local_ssrc; |
2222 LOG(LS_INFO) | 2223 LOG(LS_INFO) |
2223 << "RecreateWebRtcStream (recv) because of SetLocalSsrc; local_ssrc=" | 2224 << "RecreateWebRtcStream (recv) because of SetLocalSsrc; local_ssrc=" |
2224 << local_ssrc; | 2225 << local_ssrc; |
2225 RecreateWebRtcStream(); | 2226 RecreateWebRtcStream(); |
2226 } | 2227 } |
2227 | 2228 |
2228 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetFeedbackParameters( | 2229 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetFeedbackParameters( |
2229 bool nack_enabled, | 2230 bool nack_enabled, |
2230 bool remb_enabled, | 2231 bool remb_enabled, |
2231 bool transport_cc_enabled, | 2232 bool transport_cc_enabled, |
2232 webrtc::RtcpMode rtcp_mode) { | 2233 webrtc::RtcpMode rtcp_mode) { |
2233 int nack_history_ms = nack_enabled ? kNackHistoryMs : 0; | 2234 int nack_history_ms = nack_enabled ? kNackHistoryMs : 0; |
2234 if (config_.rtp.nack.rtp_history_ms == nack_history_ms && | 2235 if (config_.rtp.nack.rtp_history_ms == nack_history_ms && |
2235 config_.rtp.remb == remb_enabled && | 2236 config_.rtp.remb == remb_enabled && |
2236 config_.rtp.transport_cc == transport_cc_enabled && | 2237 config_.rtp.transport_cc == transport_cc_enabled && |
2237 config_.rtp.rtcp_mode == rtcp_mode) { | 2238 config_.rtp.rtcp_mode == rtcp_mode) { |
2238 LOG(LS_INFO) | 2239 LOG(LS_INFO) |
2239 << "Ignoring call to SetFeedbackParameters because parameters are " | 2240 << "Ignoring call to SetFeedbackParameters because parameters are " |
2240 "unchanged; nack=" | 2241 "unchanged; nack=" |
2241 << nack_enabled << ", remb=" << remb_enabled | 2242 << nack_enabled << ", remb=" << remb_enabled |
2242 << ", transport_cc=" << transport_cc_enabled; | 2243 << ", transport_cc=" << transport_cc_enabled; |
2243 return; | 2244 return; |
2244 } | 2245 } |
2245 config_.rtp.remb = remb_enabled; | 2246 config_.rtp.remb = remb_enabled; |
2246 config_.rtp.nack.rtp_history_ms = nack_history_ms; | 2247 config_.rtp.nack.rtp_history_ms = nack_history_ms; |
2247 config_.rtp.transport_cc = transport_cc_enabled; | 2248 config_.rtp.transport_cc = transport_cc_enabled; |
2248 config_.rtp.rtcp_mode = rtcp_mode; | 2249 config_.rtp.rtcp_mode = rtcp_mode; |
| 2250 flexfec_config_.rtcp_mode = rtcp_mode; |
2249 LOG(LS_INFO) | 2251 LOG(LS_INFO) |
2250 << "RecreateWebRtcStream (recv) because of SetFeedbackParameters; nack=" | 2252 << "RecreateWebRtcStream (recv) because of SetFeedbackParameters; nack=" |
2251 << nack_enabled << ", remb=" << remb_enabled | 2253 << nack_enabled << ", remb=" << remb_enabled |
2252 << ", transport_cc=" << transport_cc_enabled; | 2254 << ", transport_cc=" << transport_cc_enabled; |
2253 RecreateWebRtcStream(); | 2255 RecreateWebRtcStream(); |
2254 } | 2256 } |
2255 | 2257 |
2256 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetRecvParameters( | 2258 void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetRecvParameters( |
2257 const ChangedRecvParameters& params) { | 2259 const ChangedRecvParameters& params) { |
2258 bool needs_recreation = false; | 2260 bool needs_recreation = false; |
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2508 rtx_mapping[video_codecs[i].codec.id] != | 2510 rtx_mapping[video_codecs[i].codec.id] != |
2509 ulpfec_config.red_payload_type) { | 2511 ulpfec_config.red_payload_type) { |
2510 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2512 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2511 } | 2513 } |
2512 } | 2514 } |
2513 | 2515 |
2514 return video_codecs; | 2516 return video_codecs; |
2515 } | 2517 } |
2516 | 2518 |
2517 } // namespace cricket | 2519 } // namespace cricket |
OLD | NEW |