Chromium Code Reviews| Index: webrtc/audio/audio_receive_stream.cc |
| diff --git a/webrtc/audio/audio_receive_stream.cc b/webrtc/audio/audio_receive_stream.cc |
| index cb90a68a0f72e6898fe11726d31d2b99c9770c98..ac1f3038ae068bdced1410030fd224031049c1b6 100644 |
| --- a/webrtc/audio/audio_receive_stream.cc |
| +++ b/webrtc/audio/audio_receive_stream.cc |
| @@ -20,6 +20,7 @@ |
| #include "webrtc/base/checks.h" |
| #include "webrtc/base/logging.h" |
| #include "webrtc/base/timeutils.h" |
| +#include "webrtc/call/rtp_stream_receiver_controller_interface.h" |
| #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" |
| #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" |
| #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" |
| @@ -62,12 +63,12 @@ std::string AudioReceiveStream::Config::ToString() const { |
| namespace internal { |
| AudioReceiveStream::AudioReceiveStream( |
| + RtpStreamReceiverControllerInterface* receiver_controller, |
| PacketRouter* packet_router, |
| const webrtc::AudioReceiveStream::Config& config, |
| const rtc::scoped_refptr<webrtc::AudioState>& audio_state, |
| webrtc::RtcEventLog* event_log) |
| - : config_(config), |
| - audio_state_(audio_state) { |
| + : config_(config), audio_state_(audio_state) { |
| LOG(LS_INFO) << "AudioReceiveStream: " << config_.ToString(); |
| RTC_DCHECK_NE(config_.voe_channel_id, -1); |
| RTC_DCHECK(audio_state_.get()); |
| @@ -107,6 +108,10 @@ AudioReceiveStream::AudioReceiveStream( |
| } |
| // Configure bandwidth estimation. |
| channel_proxy_->RegisterReceiverCongestionControlObjects(packet_router); |
| + |
| + // Register with transport. |
| + rtp_stream_receiver_ = |
|
the sun
2017/06/16 13:37:39
Exposing the controller to the stream so that it c
nisse-webrtc
2017/06/16 14:33:25
The point is that the controller should own media-
the sun
2017/06/16 15:00:13
That sgtm.
nisse-webrtc
2017/06/19 07:21:01
I did that change in ps#18. Please have a look, an
the sun
2017/06/20 07:11:36
The problem is that it muddies the image of what C
|
| + receiver_controller->CreateReceiver(config_.rtp.remote_ssrc, this); |
| } |
| AudioReceiveStream::~AudioReceiveStream() { |