Index: webrtc/modules/bitrate_controller/bitrate_controller_impl.cc |
diff --git a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc |
index bf608789d5d7462110f9c6e434d4def02a09c79e..8a9ac741f7377ccf09930721d3acdc1c7078dbcb 100644 |
--- a/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc |
+++ b/webrtc/modules/bitrate_controller/bitrate_controller_impl.cc |
@@ -80,15 +80,23 @@ class BitrateControllerImpl::RtcpBandwidthObserverImpl |
BitrateController* BitrateController::CreateBitrateController( |
the sun
2016/03/21 13:03:08
Can you ditch this Create method and just have the
ivoc
2016/03/22 13:44:55
Stefan suggested that I should mark this one as de
|
Clock* clock, |
BitrateObserver* observer) { |
- return new BitrateControllerImpl(clock, observer); |
+ return CreateBitrateController(clock, observer, nullptr); |
+} |
+ |
+BitrateController* BitrateController::CreateBitrateController( |
+ Clock* clock, |
+ BitrateObserver* observer, |
+ RtcEventLog* event_log) { |
+ return new BitrateControllerImpl(clock, observer, event_log); |
} |
BitrateControllerImpl::BitrateControllerImpl(Clock* clock, |
- BitrateObserver* observer) |
+ BitrateObserver* observer, |
+ RtcEventLog* event_log) |
: clock_(clock), |
observer_(observer), |
last_bitrate_update_ms_(clock_->TimeInMilliseconds()), |
- bandwidth_estimation_(), |
+ bandwidth_estimation_(event_log), |
reserved_bitrate_bps_(0), |
last_bitrate_bps_(0), |
last_fraction_loss_(0), |
@@ -130,11 +138,6 @@ void BitrateControllerImpl::SetReservedBitrate(uint32_t reserved_bitrate_bps) { |
MaybeTriggerOnNetworkChanged(); |
} |
-void BitrateControllerImpl::SetEventLog(RtcEventLog* event_log) { |
- rtc::CritScope cs(&critsect_); |
- bandwidth_estimation_.SetEventLog(event_log); |
-} |
- |
void BitrateControllerImpl::OnReceivedEstimatedBitrate(uint32_t bitrate) { |
{ |
rtc::CritScope cs(&critsect_); |