Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(896)

Unified Diff: webrtc/voice_engine/channel.cc

Issue 1535963002: Wire-up BWE feedback for audio receive streams. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix audio receive stream test expectation. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/voice_engine/channel.cc
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index 48111dbb670fab6724bb99c7cef1c2492e662438..d16a595a2d512974078d3f7a3bf1833235c22963 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -2927,14 +2927,18 @@ void Channel::SetCongestionControlObjects(
RtpPacketSender* rtp_packet_sender,
TransportFeedbackObserver* transport_feedback_observer,
PacketRouter* packet_router) {
- RTC_DCHECK(feedback_observer_proxy_.get());
- RTC_DCHECK(seq_num_allocator_proxy_.get());
- RTC_DCHECK(rtp_packet_sender_proxy_.get());
RTC_DCHECK(packet_router != nullptr || packet_router_ != nullptr);
- feedback_observer_proxy_->SetTransportFeedbackObserver(
- transport_feedback_observer);
- seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router);
- rtp_packet_sender_proxy_->SetPacketSender(rtp_packet_sender);
+ if (transport_feedback_observer) {
+ RTC_DCHECK(feedback_observer_proxy_.get());
+ feedback_observer_proxy_->SetTransportFeedbackObserver(
+ transport_feedback_observer);
+ }
+ if (rtp_packet_sender) {
+ RTC_DCHECK(rtp_packet_sender_proxy_.get());
+ rtp_packet_sender_proxy_->SetPacketSender(rtp_packet_sender);
+ }
+ if (seq_num_allocator_proxy_.get())
+ seq_num_allocator_proxy_->SetSequenceNumberAllocator(packet_router);
_rtpRtcpModule->SetStorePacketsStatus(rtp_packet_sender != nullptr, 600);
if (packet_router != nullptr) {
packet_router->AddRtpModule(_rtpRtcpModule.get());

Powered by Google App Engine
This is Rietveld 408576698