Remove unused private data member engine_id_
BUG=chromium:447445
R=tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/39459004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8088 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/video_engine/vie_channel_group.cc b/webrtc/video_engine/vie_channel_group.cc
index 16e25d3..9e79b29 100644
--- a/webrtc/video_engine/vie_channel_group.cc
+++ b/webrtc/video_engine/vie_channel_group.cc
@@ -32,14 +32,12 @@
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<RemoteBitrateEstimatorMinRate>().min_rate),
rate_control_type_(kAimdControl),
rbe_(RemoteBitrateEstimatorFactory().Create(observer_,
@@ -142,7 +140,6 @@
RemoteBitrateObserver* observer_;
Clock* clock_;
scoped_ptr<CriticalSectionWrapper> crit_sect_;
- const int engine_id_;
const uint32_t min_bitrate_bps_;
RateControlType rate_control_type_;
scoped_ptr<RemoteBitrateEstimator> rbe_;
@@ -153,8 +150,7 @@
};
} // 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 @@
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 3321450..9593ec5 100644
--- a/webrtc/video_engine/vie_channel_group.h
+++ b/webrtc/video_engine/vie_channel_group.h
@@ -31,8 +31,7 @@
// 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 dc3f916..aef167f 100644
--- a/webrtc/video_engine/vie_channel_manager.cc
+++ b/webrtc/video_engine/vie_channel_manager.cc
@@ -85,7 +85,7 @@
}
// 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,
