diff --git a/webrtc/video_engine/vie_channel_group.cc b/webrtc/video_engine/vie_channel_group.cc index 16e25d3b8b..9e79b29d33 100644 --- a/webrtc/video_engine/vie_channel_group.cc +++ b/webrtc/video_engine/vie_channel_group.cc @@ -32,14 +32,12 @@ static const uint32_t kTimeOffsetSwitchThreshold = 30; class WrappingBitrateEstimator : public RemoteBitrateEstimator { public: - WrappingBitrateEstimator(int engine_id, - RemoteBitrateObserver* observer, + WrappingBitrateEstimator(RemoteBitrateObserver* observer, Clock* clock, const Config& config) : observer_(observer), clock_(clock), crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), - engine_id_(engine_id), min_bitrate_bps_(config.Get().min_rate), rate_control_type_(kAimdControl), rbe_(RemoteBitrateEstimatorFactory().Create(observer_, @@ -142,7 +140,6 @@ class WrappingBitrateEstimator : public RemoteBitrateEstimator { RemoteBitrateObserver* observer_; Clock* clock_; scoped_ptr crit_sect_; - const int engine_id_; const uint32_t min_bitrate_bps_; RateControlType rate_control_type_; scoped_ptr rbe_; @@ -153,8 +150,7 @@ class WrappingBitrateEstimator : public RemoteBitrateEstimator { }; } // namespace -ChannelGroup::ChannelGroup(int engine_id, - ProcessThread* process_thread, +ChannelGroup::ChannelGroup(ProcessThread* process_thread, const Config* config) : remb_(new VieRemb()), bitrate_controller_( @@ -172,8 +168,7 @@ ChannelGroup::ChannelGroup(int engine_id, assert(config_); // Must have a valid config pointer here. remote_bitrate_estimator_.reset( - new WrappingBitrateEstimator(engine_id, - remb_.get(), + new WrappingBitrateEstimator(remb_.get(), Clock::GetRealTimeClock(), *config_)); diff --git a/webrtc/video_engine/vie_channel_group.h b/webrtc/video_engine/vie_channel_group.h index 33214508d1..9593ec52cb 100644 --- a/webrtc/video_engine/vie_channel_group.h +++ b/webrtc/video_engine/vie_channel_group.h @@ -31,8 +31,7 @@ class VieRemb; // group are assumed to send/receive data to the same end-point. class ChannelGroup { public: - ChannelGroup(int engine_id, ProcessThread* process_thread, - const Config* config); + ChannelGroup(ProcessThread* process_thread, const Config* config); ~ChannelGroup(); void AddChannel(int channel_id); diff --git a/webrtc/video_engine/vie_channel_manager.cc b/webrtc/video_engine/vie_channel_manager.cc index dc3f916605..aef167fafe 100644 --- a/webrtc/video_engine/vie_channel_manager.cc +++ b/webrtc/video_engine/vie_channel_manager.cc @@ -85,7 +85,7 @@ int ViEChannelManager::CreateChannel(int* channel_id, } // Create a new channel group and add this channel. - ChannelGroup* group = new ChannelGroup(engine_id_, module_process_thread_, + ChannelGroup* group = new ChannelGroup(module_process_thread_, channel_group_config); BitrateController* bitrate_controller = group->GetBitrateController(); ViEEncoder* vie_encoder = new ViEEncoder(engine_id_, new_channel_id,