OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 ss << ", render_delay_ms: " << render_delay_ms; | 94 ss << ", render_delay_ms: " << render_delay_ms; |
95 ss << ", target_delay_ms: " << target_delay_ms; | 95 ss << ", target_delay_ms: " << target_delay_ms; |
96 ss << ", suspend_below_min_bitrate: " << (suspend_below_min_bitrate ? "on" | 96 ss << ", suspend_below_min_bitrate: " << (suspend_below_min_bitrate ? "on" |
97 : "off"); | 97 : "off"); |
98 ss << '}'; | 98 ss << '}'; |
99 return ss.str(); | 99 return ss.str(); |
100 } | 100 } |
101 | 101 |
102 namespace internal { | 102 namespace internal { |
103 VideoSendStream::VideoSendStream( | 103 VideoSendStream::VideoSendStream( |
104 newapi::Transport* transport, | |
105 CpuOveruseObserver* overuse_observer, | 104 CpuOveruseObserver* overuse_observer, |
106 int num_cpu_cores, | 105 int num_cpu_cores, |
107 ProcessThread* module_process_thread, | 106 ProcessThread* module_process_thread, |
108 ChannelGroup* channel_group, | 107 ChannelGroup* channel_group, |
109 int channel_id, | 108 int channel_id, |
110 const VideoSendStream::Config& config, | 109 const VideoSendStream::Config& config, |
111 const VideoEncoderConfig& encoder_config, | 110 const VideoEncoderConfig& encoder_config, |
112 const std::map<uint32_t, RtpState>& suspended_ssrcs) | 111 const std::map<uint32_t, RtpState>& suspended_ssrcs) |
113 : transport_adapter_(transport), | 112 : transport_adapter_(config.send_transport), |
114 encoded_frame_proxy_(config.post_encode_callback), | 113 encoded_frame_proxy_(config.post_encode_callback), |
115 config_(config), | 114 config_(config), |
116 suspended_ssrcs_(suspended_ssrcs), | 115 suspended_ssrcs_(suspended_ssrcs), |
117 module_process_thread_(module_process_thread), | 116 module_process_thread_(module_process_thread), |
118 channel_group_(channel_group), | 117 channel_group_(channel_group), |
119 channel_id_(channel_id), | 118 channel_id_(channel_id), |
120 use_config_bitrate_(true), | 119 use_config_bitrate_(true), |
121 stats_proxy_(Clock::GetRealTimeClock(), config) { | 120 stats_proxy_(Clock::GetRealTimeClock(), config) { |
122 DCHECK(!config_.rtp.ssrcs.empty()); | 121 DCHECK(!config_.rtp.ssrcs.empty()); |
123 CHECK(channel_group->CreateSendChannel(channel_id_, 0, &transport_adapter_, | 122 CHECK(channel_group->CreateSendChannel(channel_id_, 0, &transport_adapter_, |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
502 vie_channel_->IsSendingFecEnabled()); | 501 vie_channel_->IsSendingFecEnabled()); |
503 | 502 |
504 // Restart the media flow | 503 // Restart the media flow |
505 vie_encoder_->Restart(); | 504 vie_encoder_->Restart(); |
506 | 505 |
507 return true; | 506 return true; |
508 } | 507 } |
509 | 508 |
510 } // namespace internal | 509 } // namespace internal |
511 } // namespace webrtc | 510 } // namespace webrtc |
OLD | NEW |