OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 |
11 #include "webrtc/video_engine/vie_channel_group.h" | 11 #include "webrtc/video_engine/vie_channel_group.h" |
12 | 12 |
13 #include "webrtc/base/checks.h" | 13 #include "webrtc/base/checks.h" |
14 #include "webrtc/base/thread_annotations.h" | 14 #include "webrtc/base/thread_annotations.h" |
15 #include "webrtc/common.h" | 15 #include "webrtc/common.h" |
16 #include "webrtc/modules/pacing/include/paced_sender.h" | 16 #include "webrtc/modules/pacing/include/paced_sender.h" |
17 #include "webrtc/modules/pacing/include/packet_router.h" | 17 #include "webrtc/modules/pacing/include/packet_router.h" |
18 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" | 18 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" |
19 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_s
end_time.h" | 19 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_s
end_time.h" |
20 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_singl
e_stream.h" | 20 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_singl
e_stream.h" |
| 21 #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" |
21 #include "webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h" | 22 #include "webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h" |
22 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" | 23 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" |
23 #include "webrtc/modules/utility/interface/process_thread.h" | 24 #include "webrtc/modules/utility/interface/process_thread.h" |
24 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" | 25 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" |
25 #include "webrtc/system_wrappers/interface/logging.h" | 26 #include "webrtc/system_wrappers/interface/logging.h" |
26 #include "webrtc/video_engine/call_stats.h" | 27 #include "webrtc/video_engine/call_stats.h" |
27 #include "webrtc/video_engine/encoder_state_feedback.h" | 28 #include "webrtc/video_engine/encoder_state_feedback.h" |
28 #include "webrtc/video_engine/payload_router.h" | 29 #include "webrtc/video_engine/payload_router.h" |
29 #include "webrtc/video_engine/vie_channel.h" | 30 #include "webrtc/video_engine/vie_channel.h" |
30 #include "webrtc/video_engine/vie_encoder.h" | 31 #include "webrtc/video_engine/vie_encoder.h" |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 | 139 |
139 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WrappingBitrateEstimator); | 140 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WrappingBitrateEstimator); |
140 }; | 141 }; |
141 | 142 |
142 } // namespace | 143 } // namespace |
143 | 144 |
144 ChannelGroup::ChannelGroup(ProcessThread* process_thread) | 145 ChannelGroup::ChannelGroup(ProcessThread* process_thread) |
145 : remb_(new VieRemb()), | 146 : remb_(new VieRemb()), |
146 bitrate_allocator_(new BitrateAllocator()), | 147 bitrate_allocator_(new BitrateAllocator()), |
147 call_stats_(new CallStats()), | 148 call_stats_(new CallStats()), |
148 encoder_state_feedback_(new EncoderStateFeedback()), | |
149 packet_router_(new PacketRouter()), | 149 packet_router_(new PacketRouter()), |
150 pacer_(new PacedSender(Clock::GetRealTimeClock(), | 150 pacer_(new PacedSender(Clock::GetRealTimeClock(), |
151 packet_router_.get(), | 151 packet_router_.get(), |
152 BitrateController::kDefaultStartBitrateKbps, | 152 BitrateController::kDefaultStartBitrateKbps, |
153 PacedSender::kDefaultPaceMultiplier * | 153 PacedSender::kDefaultPaceMultiplier * |
154 BitrateController::kDefaultStartBitrateKbps, | 154 BitrateController::kDefaultStartBitrateKbps, |
155 0)), | 155 0)), |
| 156 remote_bitrate_estimator_( |
| 157 new WrappingBitrateEstimator(remb_.get(), Clock::GetRealTimeClock())), |
| 158 remote_estimator_proxy_( |
| 159 new RemoteEstimatorProxy(Clock::GetRealTimeClock(), |
| 160 packet_router_.get())), |
| 161 encoder_state_feedback_(new EncoderStateFeedback()), |
156 process_thread_(process_thread), | 162 process_thread_(process_thread), |
157 pacer_thread_(ProcessThread::Create("PacerThread")), | 163 pacer_thread_(ProcessThread::Create("PacerThread")), |
158 // Constructed last as this object calls the provided callback on | 164 // Constructed last as this object calls the provided callback on |
159 // construction. | 165 // construction. |
160 bitrate_controller_( | 166 bitrate_controller_( |
161 BitrateController::CreateBitrateController(Clock::GetRealTimeClock(), | 167 BitrateController::CreateBitrateController(Clock::GetRealTimeClock(), |
162 this)) { | 168 this)) { |
163 remote_bitrate_estimator_.reset(new WrappingBitrateEstimator( | |
164 remb_.get(), Clock::GetRealTimeClock())); | |
165 | |
166 call_stats_->RegisterStatsObserver(remote_bitrate_estimator_.get()); | 169 call_stats_->RegisterStatsObserver(remote_bitrate_estimator_.get()); |
167 | 170 |
168 pacer_thread_->RegisterModule(pacer_.get()); | 171 pacer_thread_->RegisterModule(pacer_.get()); |
169 pacer_thread_->Start(); | 172 pacer_thread_->Start(); |
170 | 173 |
| 174 process_thread->RegisterModule(remote_estimator_proxy_.get()); |
171 process_thread->RegisterModule(remote_bitrate_estimator_.get()); | 175 process_thread->RegisterModule(remote_bitrate_estimator_.get()); |
172 process_thread->RegisterModule(call_stats_.get()); | 176 process_thread->RegisterModule(call_stats_.get()); |
173 process_thread->RegisterModule(bitrate_controller_.get()); | 177 process_thread->RegisterModule(bitrate_controller_.get()); |
174 } | 178 } |
175 | 179 |
176 ChannelGroup::~ChannelGroup() { | 180 ChannelGroup::~ChannelGroup() { |
177 pacer_thread_->Stop(); | 181 pacer_thread_->Stop(); |
178 pacer_thread_->DeRegisterModule(pacer_.get()); | 182 pacer_thread_->DeRegisterModule(pacer_.get()); |
179 process_thread_->DeRegisterModule(bitrate_controller_.get()); | 183 process_thread_->DeRegisterModule(bitrate_controller_.get()); |
180 process_thread_->DeRegisterModule(call_stats_.get()); | 184 process_thread_->DeRegisterModule(call_stats_.get()); |
181 process_thread_->DeRegisterModule(remote_bitrate_estimator_.get()); | 185 process_thread_->DeRegisterModule(remote_bitrate_estimator_.get()); |
| 186 process_thread_->DeRegisterModule(remote_estimator_proxy_.get()); |
182 call_stats_->DeregisterStatsObserver(remote_bitrate_estimator_.get()); | 187 call_stats_->DeregisterStatsObserver(remote_bitrate_estimator_.get()); |
| 188 if (transport_feedback_adapter_.get()) |
| 189 call_stats_->DeregisterStatsObserver(transport_feedback_adapter_.get()); |
183 RTC_DCHECK(channel_map_.empty()); | 190 RTC_DCHECK(channel_map_.empty()); |
184 RTC_DCHECK(!remb_->InUse()); | 191 RTC_DCHECK(!remb_->InUse()); |
185 RTC_DCHECK(vie_encoder_map_.empty()); | 192 RTC_DCHECK(vie_encoder_map_.empty()); |
186 } | 193 } |
187 | 194 |
188 bool ChannelGroup::CreateSendChannel(int channel_id, | 195 bool ChannelGroup::CreateSendChannel(int channel_id, |
189 Transport* transport, | 196 Transport* transport, |
190 SendStatisticsProxy* stats_proxy, | 197 SendStatisticsProxy* stats_proxy, |
191 I420FrameCallback* pre_encode_callback, | 198 I420FrameCallback* pre_encode_callback, |
192 int number_of_cores, | 199 int number_of_cores, |
193 const std::vector<uint32_t>& ssrcs) { | 200 const VideoSendStream::Config& config) { |
| 201 TransportFeedbackObserver* transport_feedback_observer = nullptr; |
| 202 bool transport_seq_enabled = false; |
| 203 for (const RtpExtension& extension : config.rtp.extensions) { |
| 204 if (extension.name == RtpExtension::kTransportSequenceNumber) { |
| 205 transport_seq_enabled = true; |
| 206 break; |
| 207 } |
| 208 } |
| 209 if (transport_seq_enabled) { |
| 210 if (transport_feedback_adapter_.get() == nullptr) { |
| 211 transport_feedback_adapter_.reset(new TransportFeedbackAdapter( |
| 212 bitrate_controller_->CreateRtcpBandwidthObserver(), |
| 213 Clock::GetRealTimeClock(), process_thread_)); |
| 214 transport_feedback_adapter_->SetBitrateEstimator( |
| 215 new RemoteBitrateEstimatorAbsSendTime( |
| 216 transport_feedback_adapter_.get(), Clock::GetRealTimeClock(), |
| 217 RemoteBitrateEstimator::kDefaultMinBitrateBps)); |
| 218 call_stats_->RegisterStatsObserver(transport_feedback_adapter_.get()); |
| 219 } |
| 220 transport_feedback_observer = transport_feedback_adapter_.get(); |
| 221 } |
| 222 |
| 223 const std::vector<uint32_t>& ssrcs = config.rtp.ssrcs; |
194 RTC_DCHECK(!ssrcs.empty()); | 224 RTC_DCHECK(!ssrcs.empty()); |
195 rtc::scoped_ptr<ViEEncoder> vie_encoder(new ViEEncoder( | 225 rtc::scoped_ptr<ViEEncoder> vie_encoder(new ViEEncoder( |
196 channel_id, number_of_cores, process_thread_, stats_proxy, | 226 channel_id, number_of_cores, process_thread_, stats_proxy, |
197 pre_encode_callback, pacer_.get(), bitrate_allocator_.get())); | 227 pre_encode_callback, pacer_.get(), bitrate_allocator_.get())); |
198 if (!vie_encoder->Init()) { | 228 if (!vie_encoder->Init()) { |
199 return false; | 229 return false; |
200 } | 230 } |
201 ViEEncoder* encoder = vie_encoder.get(); | 231 ViEEncoder* encoder = vie_encoder.get(); |
202 if (!CreateChannel(channel_id, transport, number_of_cores, | 232 if (!CreateChannel(channel_id, transport, number_of_cores, |
203 vie_encoder.release(), ssrcs.size(), true)) { | 233 vie_encoder.release(), ssrcs.size(), true, |
| 234 remote_bitrate_estimator_.get(), |
| 235 transport_feedback_observer)) { |
204 return false; | 236 return false; |
205 } | 237 } |
206 ViEChannel* channel = channel_map_[channel_id]; | 238 ViEChannel* channel = channel_map_[channel_id]; |
207 // Connect the encoder with the send packet router, to enable sending. | 239 // Connect the encoder with the send packet router, to enable sending. |
208 encoder->StartThreadsAndSetSharedMembers(channel->send_payload_router(), | 240 encoder->StartThreadsAndSetSharedMembers(channel->send_payload_router(), |
209 channel->vcm_protection_callback()); | 241 channel->vcm_protection_callback()); |
210 | 242 |
211 encoder_state_feedback_->AddEncoder(ssrcs, encoder); | 243 encoder_state_feedback_->AddEncoder(ssrcs, encoder); |
212 std::vector<uint32_t> first_ssrc(1, ssrcs[0]); | 244 std::vector<uint32_t> first_ssrc(1, ssrcs[0]); |
213 encoder->SetSsrcs(first_ssrc); | 245 encoder->SetSsrcs(first_ssrc); |
214 return true; | 246 return true; |
215 } | 247 } |
216 | 248 |
217 bool ChannelGroup::CreateReceiveChannel(int channel_id, | 249 bool ChannelGroup::CreateReceiveChannel( |
218 Transport* transport, | 250 int channel_id, |
219 int number_of_cores) { | 251 Transport* transport, |
220 return CreateChannel(channel_id, transport, number_of_cores, | 252 int number_of_cores, |
221 nullptr, 1, false); | 253 const VideoReceiveStream::Config& config) { |
| 254 bool send_side_bwe = false; |
| 255 for (const RtpExtension& extension : config.rtp.extensions) { |
| 256 if (extension.name == RtpExtension::kTransportSequenceNumber) { |
| 257 send_side_bwe = true; |
| 258 break; |
| 259 } |
| 260 } |
| 261 |
| 262 RemoteBitrateEstimator* bitrate_estimator; |
| 263 if (send_side_bwe) { |
| 264 bitrate_estimator = remote_estimator_proxy_.get(); |
| 265 } else { |
| 266 bitrate_estimator = remote_bitrate_estimator_.get(); |
| 267 } |
| 268 return CreateChannel(channel_id, transport, number_of_cores, nullptr, 1, |
| 269 false, bitrate_estimator, nullptr); |
222 } | 270 } |
223 | 271 |
224 bool ChannelGroup::CreateChannel(int channel_id, | 272 bool ChannelGroup::CreateChannel(int channel_id, |
225 Transport* transport, | 273 Transport* transport, |
226 int number_of_cores, | 274 int number_of_cores, |
227 ViEEncoder* vie_encoder, | 275 ViEEncoder* vie_encoder, |
228 size_t max_rtp_streams, | 276 size_t max_rtp_streams, |
229 bool sender) { | 277 bool sender, |
| 278 RemoteBitrateEstimator* bitrate_estimator, |
| 279 TransportFeedbackObserver* feedback_observer) { |
230 rtc::scoped_ptr<ViEChannel> channel(new ViEChannel( | 280 rtc::scoped_ptr<ViEChannel> channel(new ViEChannel( |
231 number_of_cores, transport, process_thread_, | 281 number_of_cores, transport, process_thread_, |
232 encoder_state_feedback_->GetRtcpIntraFrameObserver(), | 282 encoder_state_feedback_->GetRtcpIntraFrameObserver(), |
233 bitrate_controller_->CreateRtcpBandwidthObserver(), nullptr, | 283 bitrate_controller_->CreateRtcpBandwidthObserver(), feedback_observer, |
234 remote_bitrate_estimator_.get(), call_stats_->rtcp_rtt_stats(), | 284 bitrate_estimator, call_stats_->rtcp_rtt_stats(), pacer_.get(), |
235 pacer_.get(), packet_router_.get(), max_rtp_streams, sender)); | 285 packet_router_.get(), max_rtp_streams, sender)); |
236 if (channel->Init() != 0) { | 286 if (channel->Init() != 0) { |
237 return false; | 287 return false; |
238 } | 288 } |
239 | 289 |
240 // Register the channel to receive stats updates. | 290 // Register the channel to receive stats updates. |
241 call_stats_->RegisterStatsObserver(channel->GetStatsObserver()); | 291 call_stats_->RegisterStatsObserver(channel->GetStatsObserver()); |
242 | 292 |
243 // Store the channel, add it to the channel group and save the vie_encoder. | 293 // Store the channel, add it to the channel group and save the vie_encoder. |
244 channel_map_[channel_id] = channel.release(); | 294 channel_map_[channel_id] = channel.release(); |
245 if (vie_encoder) { | 295 if (vie_encoder) { |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
362 rtc::CritScope lock(&encoder_map_crit_); | 412 rtc::CritScope lock(&encoder_map_crit_); |
363 for (const auto& encoder : vie_encoder_map_) | 413 for (const auto& encoder : vie_encoder_map_) |
364 pad_up_to_bitrate_bps += encoder.second->GetPaddingNeededBps(); | 414 pad_up_to_bitrate_bps += encoder.second->GetPaddingNeededBps(); |
365 } | 415 } |
366 pacer_->UpdateBitrate( | 416 pacer_->UpdateBitrate( |
367 target_bitrate_bps / 1000, | 417 target_bitrate_bps / 1000, |
368 PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000, | 418 PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000, |
369 pad_up_to_bitrate_bps / 1000); | 419 pad_up_to_bitrate_bps / 1000); |
370 } | 420 } |
371 } // namespace webrtc | 421 } // namespace webrtc |
OLD | NEW |