| 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 2228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2239 LOG(LS_WARNING) << "RTX SSRCs configured but there's no configured RTX " | 2239 LOG(LS_WARNING) << "RTX SSRCs configured but there's no configured RTX " |
| 2240 "payload type the set codec. Ignoring RTX."; | 2240 "payload type the set codec. Ignoring RTX."; |
| 2241 config.rtp.rtx.ssrcs.clear(); | 2241 config.rtp.rtx.ssrcs.clear(); |
| 2242 } | 2242 } |
| 2243 stream_ = call_->CreateVideoSendStream(std::move(config), | 2243 stream_ = call_->CreateVideoSendStream(std::move(config), |
| 2244 parameters_.encoder_config.Copy()); | 2244 parameters_.encoder_config.Copy()); |
| 2245 | 2245 |
| 2246 parameters_.encoder_config.encoder_specific_settings = NULL; | 2246 parameters_.encoder_config.encoder_specific_settings = NULL; |
| 2247 pending_encoder_reconfiguration_ = false; | 2247 pending_encoder_reconfiguration_ = false; |
| 2248 | 2248 |
| 2249 if (sending_) { | 2249 // Call stream_->Start() if necessary conditions are met. |
| 2250 stream_->Start(); | 2250 UpdateSendState(); |
| 2251 } | |
| 2252 } | 2251 } |
| 2253 | 2252 |
| 2254 WebRtcVideoChannel2::WebRtcVideoReceiveStream::WebRtcVideoReceiveStream( | 2253 WebRtcVideoChannel2::WebRtcVideoReceiveStream::WebRtcVideoReceiveStream( |
| 2255 webrtc::Call* call, | 2254 webrtc::Call* call, |
| 2256 const StreamParams& sp, | 2255 const StreamParams& sp, |
| 2257 webrtc::VideoReceiveStream::Config config, | 2256 webrtc::VideoReceiveStream::Config config, |
| 2258 WebRtcVideoDecoderFactory* external_decoder_factory, | 2257 WebRtcVideoDecoderFactory* external_decoder_factory, |
| 2259 bool default_stream, | 2258 bool default_stream, |
| 2260 const std::vector<VideoCodecSettings>& recv_codecs, | 2259 const std::vector<VideoCodecSettings>& recv_codecs, |
| 2261 bool red_disabled_by_remote_side) | 2260 bool red_disabled_by_remote_side) |
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2694 rtx_mapping[video_codecs[i].codec.id] != | 2693 rtx_mapping[video_codecs[i].codec.id] != |
| 2695 fec_settings.red_payload_type) { | 2694 fec_settings.red_payload_type) { |
| 2696 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2695 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
| 2697 } | 2696 } |
| 2698 } | 2697 } |
| 2699 | 2698 |
| 2700 return video_codecs; | 2699 return video_codecs; |
| 2701 } | 2700 } |
| 2702 | 2701 |
| 2703 } // namespace cricket | 2702 } // namespace cricket |
| OLD | NEW |