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/remote_estimator_proxy.h" |
22 #include "webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h" | 22 #include "webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h" |
23 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" | 23 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" |
24 #include "webrtc/modules/utility/interface/process_thread.h" | 24 #include "webrtc/modules/utility/interface/process_thread.h" |
25 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" | 25 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" |
26 #include "webrtc/system_wrappers/interface/logging.h" | 26 #include "webrtc/system_wrappers/interface/logging.h" |
27 #include "webrtc/video_engine/call_stats.h" | 27 #include "webrtc/video_engine/call_stats.h" |
28 #include "webrtc/video_engine/encoder_state_feedback.h" | |
29 #include "webrtc/video_engine/payload_router.h" | 28 #include "webrtc/video_engine/payload_router.h" |
30 #include "webrtc/video_engine/vie_channel.h" | |
31 #include "webrtc/video_engine/vie_encoder.h" | 29 #include "webrtc/video_engine/vie_encoder.h" |
32 #include "webrtc/video_engine/vie_remb.h" | 30 #include "webrtc/video_engine/vie_remb.h" |
33 #include "webrtc/voice_engine/include/voe_video_sync.h" | 31 #include "webrtc/voice_engine/include/voe_video_sync.h" |
34 | 32 |
35 namespace webrtc { | 33 namespace webrtc { |
36 namespace { | 34 namespace { |
37 | 35 |
38 static const uint32_t kTimeOffsetSwitchThreshold = 30; | 36 static const uint32_t kTimeOffsetSwitchThreshold = 30; |
39 | 37 |
40 class WrappingBitrateEstimator : public RemoteBitrateEstimator { | 38 class WrappingBitrateEstimator : public RemoteBitrateEstimator { |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 rtc::scoped_ptr<RemoteBitrateEstimator> rbe_; | 136 rtc::scoped_ptr<RemoteBitrateEstimator> rbe_; |
139 bool using_absolute_send_time_; | 137 bool using_absolute_send_time_; |
140 uint32_t packets_since_absolute_send_time_; | 138 uint32_t packets_since_absolute_send_time_; |
141 int min_bitrate_bps_; | 139 int min_bitrate_bps_; |
142 | 140 |
143 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WrappingBitrateEstimator); | 141 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(WrappingBitrateEstimator); |
144 }; | 142 }; |
145 | 143 |
146 } // namespace | 144 } // namespace |
147 | 145 |
148 ChannelGroup::ChannelGroup(ProcessThread* process_thread) | 146 ChannelGroup::ChannelGroup(ProcessThread* process_thread, |
| 147 CallStats* call_stats) |
149 : remb_(new VieRemb()), | 148 : remb_(new VieRemb()), |
150 bitrate_allocator_(new BitrateAllocator()), | 149 bitrate_allocator_(new BitrateAllocator()), |
151 call_stats_(new CallStats()), | |
152 packet_router_(new PacketRouter()), | 150 packet_router_(new PacketRouter()), |
153 pacer_(new PacedSender(Clock::GetRealTimeClock(), | 151 pacer_(new PacedSender(Clock::GetRealTimeClock(), |
154 packet_router_.get(), | 152 packet_router_.get(), |
155 BitrateController::kDefaultStartBitrateKbps, | 153 BitrateController::kDefaultStartBitrateKbps, |
156 PacedSender::kDefaultPaceMultiplier * | 154 PacedSender::kDefaultPaceMultiplier * |
157 BitrateController::kDefaultStartBitrateKbps, | 155 BitrateController::kDefaultStartBitrateKbps, |
158 0)), | 156 0)), |
159 remote_bitrate_estimator_( | 157 remote_bitrate_estimator_( |
160 new WrappingBitrateEstimator(remb_.get(), Clock::GetRealTimeClock())), | 158 new WrappingBitrateEstimator(remb_.get(), Clock::GetRealTimeClock())), |
161 remote_estimator_proxy_( | 159 remote_estimator_proxy_( |
162 new RemoteEstimatorProxy(Clock::GetRealTimeClock(), | 160 new RemoteEstimatorProxy(Clock::GetRealTimeClock(), |
163 packet_router_.get())), | 161 packet_router_.get())), |
164 encoder_state_feedback_(new EncoderStateFeedback()), | |
165 process_thread_(process_thread), | 162 process_thread_(process_thread), |
| 163 call_stats_(call_stats), |
166 pacer_thread_(ProcessThread::Create("PacerThread")), | 164 pacer_thread_(ProcessThread::Create("PacerThread")), |
167 // Constructed last as this object calls the provided callback on | 165 // Constructed last as this object calls the provided callback on |
168 // construction. | 166 // construction. |
169 bitrate_controller_( | 167 bitrate_controller_( |
170 BitrateController::CreateBitrateController(Clock::GetRealTimeClock(), | 168 BitrateController::CreateBitrateController(Clock::GetRealTimeClock(), |
171 this)), | 169 this)), |
172 min_bitrate_bps_(RemoteBitrateEstimator::kDefaultMinBitrateBps) { | 170 min_bitrate_bps_(RemoteBitrateEstimator::kDefaultMinBitrateBps) { |
173 call_stats_->RegisterStatsObserver(remote_bitrate_estimator_.get()); | 171 call_stats_->RegisterStatsObserver(remote_bitrate_estimator_.get()); |
174 | 172 |
175 pacer_thread_->RegisterModule(pacer_.get()); | 173 pacer_thread_->RegisterModule(pacer_.get()); |
176 pacer_thread_->Start(); | 174 pacer_thread_->Start(); |
177 | 175 |
178 process_thread->RegisterModule(remote_estimator_proxy_.get()); | 176 process_thread->RegisterModule(remote_estimator_proxy_.get()); |
179 process_thread->RegisterModule(remote_bitrate_estimator_.get()); | 177 process_thread->RegisterModule(remote_bitrate_estimator_.get()); |
180 process_thread->RegisterModule(call_stats_.get()); | |
181 process_thread->RegisterModule(bitrate_controller_.get()); | 178 process_thread->RegisterModule(bitrate_controller_.get()); |
182 } | 179 } |
183 | 180 |
184 ChannelGroup::~ChannelGroup() { | 181 ChannelGroup::~ChannelGroup() { |
185 pacer_thread_->Stop(); | 182 pacer_thread_->Stop(); |
186 pacer_thread_->DeRegisterModule(pacer_.get()); | 183 pacer_thread_->DeRegisterModule(pacer_.get()); |
187 process_thread_->DeRegisterModule(bitrate_controller_.get()); | 184 process_thread_->DeRegisterModule(bitrate_controller_.get()); |
188 process_thread_->DeRegisterModule(call_stats_.get()); | |
189 process_thread_->DeRegisterModule(remote_bitrate_estimator_.get()); | 185 process_thread_->DeRegisterModule(remote_bitrate_estimator_.get()); |
190 process_thread_->DeRegisterModule(remote_estimator_proxy_.get()); | 186 process_thread_->DeRegisterModule(remote_estimator_proxy_.get()); |
191 call_stats_->DeregisterStatsObserver(remote_bitrate_estimator_.get()); | 187 call_stats_->DeregisterStatsObserver(remote_bitrate_estimator_.get()); |
192 if (transport_feedback_adapter_.get()) | 188 if (transport_feedback_adapter_.get()) |
193 call_stats_->DeregisterStatsObserver(transport_feedback_adapter_.get()); | 189 call_stats_->DeregisterStatsObserver(transport_feedback_adapter_.get()); |
194 RTC_DCHECK(!remb_->InUse()); | 190 RTC_DCHECK(!remb_->InUse()); |
195 RTC_DCHECK(encoders_.empty()); | 191 RTC_DCHECK(encoders_.empty()); |
196 } | 192 } |
197 | 193 |
198 void ChannelGroup::AddEncoder(const std::vector<uint32_t>& ssrcs, | 194 void ChannelGroup::AddEncoder(ViEEncoder* encoder) { |
199 ViEEncoder* encoder) { | |
200 encoder_state_feedback_->AddEncoder(ssrcs, encoder); | |
201 rtc::CritScope lock(&encoder_crit_); | 195 rtc::CritScope lock(&encoder_crit_); |
202 encoders_.push_back(encoder); | 196 encoders_.push_back(encoder); |
203 } | 197 } |
204 | 198 |
205 void ChannelGroup::RemoveEncoder(ViEEncoder* encoder) { | 199 void ChannelGroup::RemoveEncoder(ViEEncoder* encoder) { |
206 encoder_state_feedback_->RemoveEncoder(encoder); | |
207 rtc::CritScope lock(&encoder_crit_); | 200 rtc::CritScope lock(&encoder_crit_); |
208 for (auto it = encoders_.begin(); it != encoders_.end(); ++it) { | 201 for (auto it = encoders_.begin(); it != encoders_.end(); ++it) { |
209 if (*it == encoder) { | 202 if (*it == encoder) { |
210 encoders_.erase(it); | 203 encoders_.erase(it); |
211 return; | 204 return; |
212 } | 205 } |
213 } | 206 } |
214 } | 207 } |
215 | 208 |
216 void ChannelGroup::SetBweBitrates(int min_bitrate_bps, | 209 void ChannelGroup::SetBweBitrates(int min_bitrate_bps, |
(...skipping 16 matching lines...) Expand all Loading... |
233 | 226 |
234 RemoteBitrateEstimator* ChannelGroup::GetRemoteBitrateEstimator( | 227 RemoteBitrateEstimator* ChannelGroup::GetRemoteBitrateEstimator( |
235 bool send_side_bwe) const { | 228 bool send_side_bwe) const { |
236 | 229 |
237 if (send_side_bwe) | 230 if (send_side_bwe) |
238 return remote_estimator_proxy_.get(); | 231 return remote_estimator_proxy_.get(); |
239 else | 232 else |
240 return remote_bitrate_estimator_.get(); | 233 return remote_bitrate_estimator_.get(); |
241 } | 234 } |
242 | 235 |
243 CallStats* ChannelGroup::GetCallStats() const { | |
244 return call_stats_.get(); | |
245 } | |
246 | |
247 TransportFeedbackObserver* ChannelGroup::GetTransportFeedbackObserver() { | 236 TransportFeedbackObserver* ChannelGroup::GetTransportFeedbackObserver() { |
248 if (transport_feedback_adapter_.get() == nullptr) { | 237 if (transport_feedback_adapter_.get() == nullptr) { |
249 transport_feedback_adapter_.reset(new TransportFeedbackAdapter( | 238 transport_feedback_adapter_.reset(new TransportFeedbackAdapter( |
250 bitrate_controller_->CreateRtcpBandwidthObserver(), | 239 bitrate_controller_->CreateRtcpBandwidthObserver(), |
251 Clock::GetRealTimeClock(), process_thread_)); | 240 Clock::GetRealTimeClock(), process_thread_)); |
252 transport_feedback_adapter_->SetBitrateEstimator( | 241 transport_feedback_adapter_->SetBitrateEstimator( |
253 new RemoteBitrateEstimatorAbsSendTime( | 242 new RemoteBitrateEstimatorAbsSendTime( |
254 transport_feedback_adapter_.get(), Clock::GetRealTimeClock())); | 243 transport_feedback_adapter_.get(), Clock::GetRealTimeClock())); |
255 transport_feedback_adapter_->GetBitrateEstimator()->SetMinBitrate( | 244 transport_feedback_adapter_->GetBitrateEstimator()->SetMinBitrate( |
256 min_bitrate_bps_); | 245 min_bitrate_bps_); |
257 call_stats_->RegisterStatsObserver(transport_feedback_adapter_.get()); | 246 call_stats_->RegisterStatsObserver(transport_feedback_adapter_.get()); |
258 } | 247 } |
259 return transport_feedback_adapter_.get(); | 248 return transport_feedback_adapter_.get(); |
260 } | 249 } |
261 | 250 |
262 RtcpIntraFrameObserver* ChannelGroup::GetRtcpIntraFrameObserver() const { | |
263 return encoder_state_feedback_->GetRtcpIntraFrameObserver(); | |
264 } | |
265 | |
266 int64_t ChannelGroup::GetPacerQueuingDelayMs() const { | 251 int64_t ChannelGroup::GetPacerQueuingDelayMs() const { |
267 return pacer_->QueueInMs(); | 252 return pacer_->QueueInMs(); |
268 } | 253 } |
269 | 254 |
| 255 // TODO(mflodman): Move out of this class. |
270 void ChannelGroup::SetChannelRembStatus(bool sender, | 256 void ChannelGroup::SetChannelRembStatus(bool sender, |
271 bool receiver, | 257 bool receiver, |
272 ViEChannel* channel) { | 258 RtpRtcp* rtp_module) { |
273 // Update the channel state. | 259 rtp_module->SetREMBStatus(sender || receiver); |
274 channel->EnableRemb(sender || receiver); | |
275 // Update the REMB instance with necessary RTP modules. | |
276 RtpRtcp* rtp_module = channel->rtp_rtcp(); | |
277 if (sender) { | 260 if (sender) { |
278 remb_->AddRembSender(rtp_module); | 261 remb_->AddRembSender(rtp_module); |
279 } else { | 262 } else { |
280 remb_->RemoveRembSender(rtp_module); | 263 remb_->RemoveRembSender(rtp_module); |
281 } | 264 } |
282 if (receiver) { | 265 if (receiver) { |
283 remb_->AddReceiveChannel(rtp_module); | 266 remb_->AddReceiveChannel(rtp_module); |
284 } else { | 267 } else { |
285 remb_->RemoveReceiveChannel(rtp_module); | 268 remb_->RemoveReceiveChannel(rtp_module); |
286 } | 269 } |
(...skipping 24 matching lines...) Expand all Loading... |
311 pad_up_to_bitrate_bps / 1000); | 294 pad_up_to_bitrate_bps / 1000); |
312 } | 295 } |
313 | 296 |
314 void ChannelGroup::OnSentPacket(const rtc::SentPacket& sent_packet) { | 297 void ChannelGroup::OnSentPacket(const rtc::SentPacket& sent_packet) { |
315 if (transport_feedback_adapter_) { | 298 if (transport_feedback_adapter_) { |
316 transport_feedback_adapter_->UpdateSendTime(sent_packet.packet_id, | 299 transport_feedback_adapter_->UpdateSendTime(sent_packet.packet_id, |
317 sent_packet.send_time_ms); | 300 sent_packet.send_time_ms); |
318 } | 301 } |
319 } | 302 } |
320 } // namespace webrtc | 303 } // namespace webrtc |
OLD | NEW |